the class "CodeMirror-activeline-background".
-
-(function(mod) {
- if (typeof exports == "object" && typeof module == "object") // CommonJS
- mod(require("../../lib/codemirror"));
- else if (typeof define == "function" && define.amd) // AMD
- define(["../../lib/codemirror"], mod);
- else // Plain browser env
- mod(CodeMirror);
-})(function(CodeMirror) {
- "use strict";
- var WRAP_CLASS = "CodeMirror-activeline";
- var BACK_CLASS = "CodeMirror-activeline-background";
- var GUTT_CLASS = "CodeMirror-activeline-gutter";
-
- CodeMirror.defineOption("styleActiveLine", false, function(cm, val, old) {
- var prev = old && old != CodeMirror.Init;
- if (val && !prev) {
- cm.state.activeLines = [];
- updateActiveLines(cm, cm.listSelections());
- cm.on("beforeSelectionChange", selectionChange);
- } else if (!val && prev) {
- cm.off("beforeSelectionChange", selectionChange);
- clearActiveLines(cm);
- delete cm.state.activeLines;
- }
- });
-
- function clearActiveLines(cm) {
- for (var i = 0; i < cm.state.activeLines.length; i++) {
- cm.removeLineClass(cm.state.activeLines[i], "wrap", WRAP_CLASS);
- cm.removeLineClass(cm.state.activeLines[i], "background", BACK_CLASS);
- cm.removeLineClass(cm.state.activeLines[i], "gutter", GUTT_CLASS);
- }
- }
-
- function sameArray(a, b) {
- if (a.length != b.length) return false;
- for (var i = 0; i < a.length; i++)
- if (a[i] != b[i]) return false;
- return true;
- }
-
- function updateActiveLines(cm, ranges) {
- var active = [];
- for (var i = 0; i < ranges.length; i++) {
- var range = ranges[i];
- if (!range.empty()) continue;
- var line = cm.getLineHandleVisualStart(range.head.line);
- if (active[active.length - 1] != line) active.push(line);
- }
- if (sameArray(cm.state.activeLines, active)) return;
- cm.operation(function() {
- clearActiveLines(cm);
- for (var i = 0; i < active.length; i++) {
- cm.addLineClass(active[i], "wrap", WRAP_CLASS);
- cm.addLineClass(active[i], "background", BACK_CLASS);
- cm.addLineClass(active[i], "gutter", GUTT_CLASS);
- }
- cm.state.activeLines = active;
- });
- }
-
- function selectionChange(cm, sel) {
- updateActiveLines(cm, sel.ranges);
- }
-});
diff --git a/WebContent/addon/codemirror/addon/selection/mark-selection.js b/WebContent/addon/codemirror/addon/selection/mark-selection.js
deleted file mode 100644
index 5c42d21..0000000
--- a/WebContent/addon/codemirror/addon/selection/mark-selection.js
+++ /dev/null
@@ -1,118 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// Because sometimes you need to mark the selected *text*.
-//
-// Adds an option 'styleSelectedText' which, when enabled, gives
-// selected text the CSS class given as option value, or
-// "CodeMirror-selectedtext" when the value is not a string.
-
-(function(mod) {
- if (typeof exports == "object" && typeof module == "object") // CommonJS
- mod(require("../../lib/codemirror"));
- else if (typeof define == "function" && define.amd) // AMD
- define(["../../lib/codemirror"], mod);
- else // Plain browser env
- mod(CodeMirror);
-})(function(CodeMirror) {
- "use strict";
-
- CodeMirror.defineOption("styleSelectedText", false, function(cm, val, old) {
- var prev = old && old != CodeMirror.Init;
- if (val && !prev) {
- cm.state.markedSelection = [];
- cm.state.markedSelectionStyle = typeof val == "string" ? val : "CodeMirror-selectedtext";
- reset(cm);
- cm.on("cursorActivity", onCursorActivity);
- cm.on("change", onChange);
- } else if (!val && prev) {
- cm.off("cursorActivity", onCursorActivity);
- cm.off("change", onChange);
- clear(cm);
- cm.state.markedSelection = cm.state.markedSelectionStyle = null;
- }
- });
-
- function onCursorActivity(cm) {
- cm.operation(function() { update(cm); });
- }
-
- function onChange(cm) {
- if (cm.state.markedSelection.length)
- cm.operation(function() { clear(cm); });
- }
-
- var CHUNK_SIZE = 8;
- var Pos = CodeMirror.Pos;
- var cmp = CodeMirror.cmpPos;
-
- function coverRange(cm, from, to, addAt) {
- if (cmp(from, to) == 0) return;
- var array = cm.state.markedSelection;
- var cls = cm.state.markedSelectionStyle;
- for (var line = from.line;;) {
- var start = line == from.line ? from : Pos(line, 0);
- var endLine = line + CHUNK_SIZE, atEnd = endLine >= to.line;
- var end = atEnd ? to : Pos(endLine, 0);
- var mark = cm.markText(start, end, {className: cls});
- if (addAt == null) array.push(mark);
- else array.splice(addAt++, 0, mark);
- if (atEnd) break;
- line = endLine;
- }
- }
-
- function clear(cm) {
- var array = cm.state.markedSelection;
- for (var i = 0; i < array.length; ++i) array[i].clear();
- array.length = 0;
- }
-
- function reset(cm) {
- clear(cm);
- var ranges = cm.listSelections();
- for (var i = 0; i < ranges.length; i++)
- coverRange(cm, ranges[i].from(), ranges[i].to());
- }
-
- function update(cm) {
- if (!cm.somethingSelected()) return clear(cm);
- if (cm.listSelections().length > 1) return reset(cm);
-
- var from = cm.getCursor("start"), to = cm.getCursor("end");
-
- var array = cm.state.markedSelection;
- if (!array.length) return coverRange(cm, from, to);
-
- var coverStart = array[0].find(), coverEnd = array[array.length - 1].find();
- if (!coverStart || !coverEnd || to.line - from.line < CHUNK_SIZE ||
- cmp(from, coverEnd.to) >= 0 || cmp(to, coverStart.from) <= 0)
- return reset(cm);
-
- while (cmp(from, coverStart.from) > 0) {
- array.shift().clear();
- coverStart = array[0].find();
- }
- if (cmp(from, coverStart.from) < 0) {
- if (coverStart.to.line - from.line < CHUNK_SIZE) {
- array.shift().clear();
- coverRange(cm, from, coverStart.to, 0);
- } else {
- coverRange(cm, from, coverStart.from, 0);
- }
- }
-
- while (cmp(to, coverEnd.to) < 0) {
- array.pop().clear();
- coverEnd = array[array.length - 1].find();
- }
- if (cmp(to, coverEnd.to) > 0) {
- if (to.line - coverEnd.from.line < CHUNK_SIZE) {
- array.pop().clear();
- coverRange(cm, coverEnd.from, to);
- } else {
- coverRange(cm, coverEnd.to, to);
- }
- }
- }
-});
diff --git a/WebContent/addon/codemirror/addon/selection/selection-pointer.js b/WebContent/addon/codemirror/addon/selection/selection-pointer.js
deleted file mode 100644
index ef5e404..0000000
--- a/WebContent/addon/codemirror/addon/selection/selection-pointer.js
+++ /dev/null
@@ -1,98 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
- if (typeof exports == "object" && typeof module == "object") // CommonJS
- mod(require("../../lib/codemirror"));
- else if (typeof define == "function" && define.amd) // AMD
- define(["../../lib/codemirror"], mod);
- else // Plain browser env
- mod(CodeMirror);
-})(function(CodeMirror) {
- "use strict";
-
- CodeMirror.defineOption("selectionPointer", false, function(cm, val) {
- var data = cm.state.selectionPointer;
- if (data) {
- CodeMirror.off(cm.getWrapperElement(), "mousemove", data.mousemove);
- CodeMirror.off(cm.getWrapperElement(), "mouseout", data.mouseout);
- CodeMirror.off(window, "scroll", data.windowScroll);
- cm.off("cursorActivity", reset);
- cm.off("scroll", reset);
- cm.state.selectionPointer = null;
- cm.display.lineDiv.style.cursor = "";
- }
- if (val) {
- data = cm.state.selectionPointer = {
- value: typeof val == "string" ? val : "default",
- mousemove: function(event) { mousemove(cm, event); },
- mouseout: function(event) { mouseout(cm, event); },
- windowScroll: function() { reset(cm); },
- rects: null,
- mouseX: null, mouseY: null,
- willUpdate: false
- };
- CodeMirror.on(cm.getWrapperElement(), "mousemove", data.mousemove);
- CodeMirror.on(cm.getWrapperElement(), "mouseout", data.mouseout);
- CodeMirror.on(window, "scroll", data.windowScroll);
- cm.on("cursorActivity", reset);
- cm.on("scroll", reset);
- }
- });
-
- function mousemove(cm, event) {
- var data = cm.state.selectionPointer;
- if (event.buttons == null ? event.which : event.buttons) {
- data.mouseX = data.mouseY = null;
- } else {
- data.mouseX = event.clientX;
- data.mouseY = event.clientY;
- }
- scheduleUpdate(cm);
- }
-
- function mouseout(cm, event) {
- if (!cm.getWrapperElement().contains(event.relatedTarget)) {
- var data = cm.state.selectionPointer;
- data.mouseX = data.mouseY = null;
- scheduleUpdate(cm);
- }
- }
-
- function reset(cm) {
- cm.state.selectionPointer.rects = null;
- scheduleUpdate(cm);
- }
-
- function scheduleUpdate(cm) {
- if (!cm.state.selectionPointer.willUpdate) {
- cm.state.selectionPointer.willUpdate = true;
- setTimeout(function() {
- update(cm);
- cm.state.selectionPointer.willUpdate = false;
- }, 50);
- }
- }
-
- function update(cm) {
- var data = cm.state.selectionPointer;
- if (!data) return;
- if (data.rects == null && data.mouseX != null) {
- data.rects = [];
- if (cm.somethingSelected()) {
- for (var sel = cm.display.selectionDiv.firstChild; sel; sel = sel.nextSibling)
- data.rects.push(sel.getBoundingClientRect());
- }
- }
- var inside = false;
- if (data.mouseX != null) for (var i = 0; i < data.rects.length; i++) {
- var rect = data.rects[i];
- if (rect.left <= data.mouseX && rect.right >= data.mouseX &&
- rect.top <= data.mouseY && rect.bottom >= data.mouseY)
- inside = true;
- }
- var cursor = inside ? data.value : "";
- if (cm.display.lineDiv.style.cursor != cursor)
- cm.display.lineDiv.style.cursor = cursor;
- }
-});
diff --git a/WebContent/addon/codemirror/addon/tern/tern.css b/WebContent/addon/codemirror/addon/tern/tern.css
deleted file mode 100644
index c4b8a2f..0000000
--- a/WebContent/addon/codemirror/addon/tern/tern.css
+++ /dev/null
@@ -1,87 +0,0 @@
-.CodeMirror-Tern-completion {
- padding-left: 22px;
- position: relative;
- line-height: 1.5;
-}
-.CodeMirror-Tern-completion:before {
- position: absolute;
- left: 2px;
- bottom: 2px;
- border-radius: 50%;
- font-size: 12px;
- font-weight: bold;
- height: 15px;
- width: 15px;
- line-height: 16px;
- text-align: center;
- color: white;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
-}
-.CodeMirror-Tern-completion-unknown:before {
- content: "?";
- background: #4bb;
-}
-.CodeMirror-Tern-completion-object:before {
- content: "O";
- background: #77c;
-}
-.CodeMirror-Tern-completion-fn:before {
- content: "F";
- background: #7c7;
-}
-.CodeMirror-Tern-completion-array:before {
- content: "A";
- background: #c66;
-}
-.CodeMirror-Tern-completion-number:before {
- content: "1";
- background: #999;
-}
-.CodeMirror-Tern-completion-string:before {
- content: "S";
- background: #999;
-}
-.CodeMirror-Tern-completion-bool:before {
- content: "B";
- background: #999;
-}
-
-.CodeMirror-Tern-completion-guess {
- color: #999;
-}
-
-.CodeMirror-Tern-tooltip {
- border: 1px solid silver;
- border-radius: 3px;
- color: #444;
- padding: 2px 5px;
- font-size: 90%;
- font-family: monospace;
- background-color: white;
- white-space: pre-wrap;
-
- max-width: 40em;
- position: absolute;
- z-index: 10;
- -webkit-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
- -moz-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
- box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-
- transition: opacity 1s;
- -moz-transition: opacity 1s;
- -webkit-transition: opacity 1s;
- -o-transition: opacity 1s;
- -ms-transition: opacity 1s;
-}
-
-.CodeMirror-Tern-hint-doc {
- max-width: 25em;
- margin-top: -3px;
-}
-
-.CodeMirror-Tern-fname { color: black; }
-.CodeMirror-Tern-farg { color: #70a; }
-.CodeMirror-Tern-farg-current { text-decoration: underline; }
-.CodeMirror-Tern-type { color: #07c; }
-.CodeMirror-Tern-fhint-guess { opacity: .7; }
diff --git a/WebContent/addon/codemirror/addon/tern/tern.js b/WebContent/addon/codemirror/addon/tern/tern.js
deleted file mode 100644
index efdf2ed..0000000
--- a/WebContent/addon/codemirror/addon/tern/tern.js
+++ /dev/null
@@ -1,701 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// Glue code between CodeMirror and Tern.
-//
-// Create a CodeMirror.TernServer to wrap an actual Tern server,
-// register open documents (CodeMirror.Doc instances) with it, and
-// call its methods to activate the assisting functions that Tern
-// provides.
-//
-// Options supported (all optional):
-// * defs: An array of JSON definition data structures.
-// * plugins: An object mapping plugin names to configuration
-// options.
-// * getFile: A function(name, c) that can be used to access files in
-// the project that haven't been loaded yet. Simply do c(null) to
-// indicate that a file is not available.
-// * fileFilter: A function(value, docName, doc) that will be applied
-// to documents before passing them on to Tern.
-// * switchToDoc: A function(name, doc) that should, when providing a
-// multi-file view, switch the view or focus to the named file.
-// * showError: A function(editor, message) that can be used to
-// override the way errors are displayed.
-// * completionTip: Customize the content in tooltips for completions.
-// Is passed a single argument—the completion's data as returned by
-// Tern—and may return a string, DOM node, or null to indicate that
-// no tip should be shown. By default the docstring is shown.
-// * typeTip: Like completionTip, but for the tooltips shown for type
-// queries.
-// * responseFilter: A function(doc, query, request, error, data) that
-// will be applied to the Tern responses before treating them
-//
-//
-// It is possible to run the Tern server in a web worker by specifying
-// these additional options:
-// * useWorker: Set to true to enable web worker mode. You'll probably
-// want to feature detect the actual value you use here, for example
-// !!window.Worker.
-// * workerScript: The main script of the worker. Point this to
-// wherever you are hosting worker.js from this directory.
-// * workerDeps: An array of paths pointing (relative to workerScript)
-// to the Acorn and Tern libraries and any Tern plugins you want to
-// load. Or, if you minified those into a single script and included
-// them in the workerScript, simply leave this undefined.
-
-(function(mod) {
- if (typeof exports == "object" && typeof module == "object") // CommonJS
- mod(require("../../lib/codemirror"));
- else if (typeof define == "function" && define.amd) // AMD
- define(["../../lib/codemirror"], mod);
- else // Plain browser env
- mod(CodeMirror);
-})(function(CodeMirror) {
- "use strict";
- // declare global: tern
-
- CodeMirror.TernServer = function(options) {
- var self = this;
- this.options = options || {};
- var plugins = this.options.plugins || (this.options.plugins = {});
- if (!plugins.doc_comment) plugins.doc_comment = true;
- this.docs = Object.create(null);
- if (this.options.useWorker) {
- this.server = new WorkerServer(this);
- } else {
- this.server = new tern.Server({
- getFile: function(name, c) { return getFile(self, name, c); },
- async: true,
- defs: this.options.defs || [],
- plugins: plugins
- });
- }
- this.trackChange = function(doc, change) { trackChange(self, doc, change); };
-
- this.cachedArgHints = null;
- this.activeArgHints = null;
- this.jumpStack = [];
-
- this.getHint = function(cm, c) { return hint(self, cm, c); };
- this.getHint.async = true;
- };
-
- CodeMirror.TernServer.prototype = {
- addDoc: function(name, doc) {
- var data = {doc: doc, name: name, changed: null};
- this.server.addFile(name, docValue(this, data));
- CodeMirror.on(doc, "change", this.trackChange);
- return this.docs[name] = data;
- },
-
- delDoc: function(id) {
- var found = resolveDoc(this, id);
- if (!found) return;
- CodeMirror.off(found.doc, "change", this.trackChange);
- delete this.docs[found.name];
- this.server.delFile(found.name);
- },
-
- hideDoc: function(id) {
- closeArgHints(this);
- var found = resolveDoc(this, id);
- if (found && found.changed) sendDoc(this, found);
- },
-
- complete: function(cm) {
- cm.showHint({hint: this.getHint});
- },
-
- showType: function(cm, pos, c) { showContextInfo(this, cm, pos, "type", c); },
-
- showDocs: function(cm, pos, c) { showContextInfo(this, cm, pos, "documentation", c); },
-
- updateArgHints: function(cm) { updateArgHints(this, cm); },
-
- jumpToDef: function(cm) { jumpToDef(this, cm); },
-
- jumpBack: function(cm) { jumpBack(this, cm); },
-
- rename: function(cm) { rename(this, cm); },
-
- selectName: function(cm) { selectName(this, cm); },
-
- request: function (cm, query, c, pos) {
- var self = this;
- var doc = findDoc(this, cm.getDoc());
- var request = buildRequest(this, doc, query, pos);
- var extraOptions = request.query && this.options.queryOptions && this.options.queryOptions[request.query.type]
- if (extraOptions) for (var prop in extraOptions) request.query[prop] = extraOptions[prop];
-
- this.server.request(request, function (error, data) {
- if (!error && self.options.responseFilter)
- data = self.options.responseFilter(doc, query, request, error, data);
- c(error, data);
- });
- },
-
- destroy: function () {
- closeArgHints(this)
- if (this.worker) {
- this.worker.terminate();
- this.worker = null;
- }
- }
- };
-
- var Pos = CodeMirror.Pos;
- var cls = "CodeMirror-Tern-";
- var bigDoc = 250;
-
- function getFile(ts, name, c) {
- var buf = ts.docs[name];
- if (buf)
- c(docValue(ts, buf));
- else if (ts.options.getFile)
- ts.options.getFile(name, c);
- else
- c(null);
- }
-
- function findDoc(ts, doc, name) {
- for (var n in ts.docs) {
- var cur = ts.docs[n];
- if (cur.doc == doc) return cur;
- }
- if (!name) for (var i = 0;; ++i) {
- n = "[doc" + (i || "") + "]";
- if (!ts.docs[n]) { name = n; break; }
- }
- return ts.addDoc(name, doc);
- }
-
- function resolveDoc(ts, id) {
- if (typeof id == "string") return ts.docs[id];
- if (id instanceof CodeMirror) id = id.getDoc();
- if (id instanceof CodeMirror.Doc) return findDoc(ts, id);
- }
-
- function trackChange(ts, doc, change) {
- var data = findDoc(ts, doc);
-
- var argHints = ts.cachedArgHints;
- if (argHints && argHints.doc == doc && cmpPos(argHints.start, change.to) >= 0)
- ts.cachedArgHints = null;
-
- var changed = data.changed;
- if (changed == null)
- data.changed = changed = {from: change.from.line, to: change.from.line};
- var end = change.from.line + (change.text.length - 1);
- if (change.from.line < changed.to) changed.to = changed.to - (change.to.line - end);
- if (end >= changed.to) changed.to = end + 1;
- if (changed.from > change.from.line) changed.from = change.from.line;
-
- if (doc.lineCount() > bigDoc && change.to - changed.from > 100) setTimeout(function() {
- if (data.changed && data.changed.to - data.changed.from > 100) sendDoc(ts, data);
- }, 200);
- }
-
- function sendDoc(ts, doc) {
- ts.server.request({files: [{type: "full", name: doc.name, text: docValue(ts, doc)}]}, function(error) {
- if (error) window.console.error(error);
- else doc.changed = null;
- });
- }
-
- // Completion
-
- function hint(ts, cm, c) {
- ts.request(cm, {type: "completions", types: true, docs: true, urls: true}, function(error, data) {
- if (error) return showError(ts, cm, error);
- var completions = [], after = "";
- var from = data.start, to = data.end;
- if (cm.getRange(Pos(from.line, from.ch - 2), from) == "[\"" &&
- cm.getRange(to, Pos(to.line, to.ch + 2)) != "\"]")
- after = "\"]";
-
- for (var i = 0; i < data.completions.length; ++i) {
- var completion = data.completions[i], className = typeToIcon(completion.type);
- if (data.guess) className += " " + cls + "guess";
- completions.push({text: completion.name + after,
- displayText: completion.displayName || completion.name,
- className: className,
- data: completion});
- }
-
- var obj = {from: from, to: to, list: completions};
- var tooltip = null;
- CodeMirror.on(obj, "close", function() { remove(tooltip); });
- CodeMirror.on(obj, "update", function() { remove(tooltip); });
- CodeMirror.on(obj, "select", function(cur, node) {
- remove(tooltip);
- var content = ts.options.completionTip ? ts.options.completionTip(cur.data) : cur.data.doc;
- if (content) {
- tooltip = makeTooltip(node.parentNode.getBoundingClientRect().right + window.pageXOffset,
- node.getBoundingClientRect().top + window.pageYOffset, content);
- tooltip.className += " " + cls + "hint-doc";
- }
- });
- c(obj);
- });
- }
-
- function typeToIcon(type) {
- var suffix;
- if (type == "?") suffix = "unknown";
- else if (type == "number" || type == "string" || type == "bool") suffix = type;
- else if (/^fn\(/.test(type)) suffix = "fn";
- else if (/^\[/.test(type)) suffix = "array";
- else suffix = "object";
- return cls + "completion " + cls + "completion-" + suffix;
- }
-
- // Type queries
-
- function showContextInfo(ts, cm, pos, queryName, c) {
- ts.request(cm, queryName, function(error, data) {
- if (error) return showError(ts, cm, error);
- if (ts.options.typeTip) {
- var tip = ts.options.typeTip(data);
- } else {
- var tip = elt("span", null, elt("strong", null, data.type || "not found"));
- if (data.doc)
- tip.appendChild(document.createTextNode(" — " + data.doc));
- if (data.url) {
- tip.appendChild(document.createTextNode(" "));
- var child = tip.appendChild(elt("a", null, "[docs]"));
- child.href = data.url;
- child.target = "_blank";
- }
- }
- tempTooltip(cm, tip, ts);
- if (c) c();
- }, pos);
- }
-
- // Maintaining argument hints
-
- function updateArgHints(ts, cm) {
- closeArgHints(ts);
-
- if (cm.somethingSelected()) return;
- var state = cm.getTokenAt(cm.getCursor()).state;
- var inner = CodeMirror.innerMode(cm.getMode(), state);
- if (inner.mode.name != "javascript") return;
- var lex = inner.state.lexical;
- if (lex.info != "call") return;
-
- var ch, argPos = lex.pos || 0, tabSize = cm.getOption("tabSize");
- for (var line = cm.getCursor().line, e = Math.max(0, line - 9), found = false; line >= e; --line) {
- var str = cm.getLine(line), extra = 0;
- for (var pos = 0;;) {
- var tab = str.indexOf("\t", pos);
- if (tab == -1) break;
- extra += tabSize - (tab + extra) % tabSize - 1;
- pos = tab + 1;
- }
- ch = lex.column - extra;
- if (str.charAt(ch) == "(") {found = true; break;}
- }
- if (!found) return;
-
- var start = Pos(line, ch);
- var cache = ts.cachedArgHints;
- if (cache && cache.doc == cm.getDoc() && cmpPos(start, cache.start) == 0)
- return showArgHints(ts, cm, argPos);
-
- ts.request(cm, {type: "type", preferFunction: true, end: start}, function(error, data) {
- if (error || !data.type || !(/^fn\(/).test(data.type)) return;
- ts.cachedArgHints = {
- start: start,
- type: parseFnType(data.type),
- name: data.exprName || data.name || "fn",
- guess: data.guess,
- doc: cm.getDoc()
- };
- showArgHints(ts, cm, argPos);
- });
- }
-
- function showArgHints(ts, cm, pos) {
- closeArgHints(ts);
-
- var cache = ts.cachedArgHints, tp = cache.type;
- var tip = elt("span", cache.guess ? cls + "fhint-guess" : null,
- elt("span", cls + "fname", cache.name), "(");
- for (var i = 0; i < tp.args.length; ++i) {
- if (i) tip.appendChild(document.createTextNode(", "));
- var arg = tp.args[i];
- tip.appendChild(elt("span", cls + "farg" + (i == pos ? " " + cls + "farg-current" : ""), arg.name || "?"));
- if (arg.type != "?") {
- tip.appendChild(document.createTextNode(":\u00a0"));
- tip.appendChild(elt("span", cls + "type", arg.type));
- }
- }
- tip.appendChild(document.createTextNode(tp.rettype ? ") ->\u00a0" : ")"));
- if (tp.rettype) tip.appendChild(elt("span", cls + "type", tp.rettype));
- var place = cm.cursorCoords(null, "page");
- ts.activeArgHints = makeTooltip(place.right + 1, place.bottom, tip);
- }
-
- function parseFnType(text) {
- var args = [], pos = 3;
-
- function skipMatching(upto) {
- var depth = 0, start = pos;
- for (;;) {
- var next = text.charAt(pos);
- if (upto.test(next) && !depth) return text.slice(start, pos);
- if (/[{\[\(]/.test(next)) ++depth;
- else if (/[}\]\)]/.test(next)) --depth;
- ++pos;
- }
- }
-
- // Parse arguments
- if (text.charAt(pos) != ")") for (;;) {
- var name = text.slice(pos).match(/^([^, \(\[\{]+): /);
- if (name) {
- pos += name[0].length;
- name = name[1];
- }
- args.push({name: name, type: skipMatching(/[\),]/)});
- if (text.charAt(pos) == ")") break;
- pos += 2;
- }
-
- var rettype = text.slice(pos).match(/^\) -> (.*)$/);
-
- return {args: args, rettype: rettype && rettype[1]};
- }
-
- // Moving to the definition of something
-
- function jumpToDef(ts, cm) {
- function inner(varName) {
- var req = {type: "definition", variable: varName || null};
- var doc = findDoc(ts, cm.getDoc());
- ts.server.request(buildRequest(ts, doc, req), function(error, data) {
- if (error) return showError(ts, cm, error);
- if (!data.file && data.url) { window.open(data.url); return; }
-
- if (data.file) {
- var localDoc = ts.docs[data.file], found;
- if (localDoc && (found = findContext(localDoc.doc, data))) {
- ts.jumpStack.push({file: doc.name,
- start: cm.getCursor("from"),
- end: cm.getCursor("to")});
- moveTo(ts, doc, localDoc, found.start, found.end);
- return;
- }
- }
- showError(ts, cm, "Could not find a definition.");
- });
- }
-
- if (!atInterestingExpression(cm))
- dialog(cm, "Jump to variable", function(name) { if (name) inner(name); });
- else
- inner();
- }
-
- function jumpBack(ts, cm) {
- var pos = ts.jumpStack.pop(), doc = pos && ts.docs[pos.file];
- if (!doc) return;
- moveTo(ts, findDoc(ts, cm.getDoc()), doc, pos.start, pos.end);
- }
-
- function moveTo(ts, curDoc, doc, start, end) {
- doc.doc.setSelection(start, end);
- if (curDoc != doc && ts.options.switchToDoc) {
- closeArgHints(ts);
- ts.options.switchToDoc(doc.name, doc.doc);
- }
- }
-
- // The {line,ch} representation of positions makes this rather awkward.
- function findContext(doc, data) {
- var before = data.context.slice(0, data.contextOffset).split("\n");
- var startLine = data.start.line - (before.length - 1);
- var start = Pos(startLine, (before.length == 1 ? data.start.ch : doc.getLine(startLine).length) - before[0].length);
-
- var text = doc.getLine(startLine).slice(start.ch);
- for (var cur = startLine + 1; cur < doc.lineCount() && text.length < data.context.length; ++cur)
- text += "\n" + doc.getLine(cur);
- if (text.slice(0, data.context.length) == data.context) return data;
-
- var cursor = doc.getSearchCursor(data.context, 0, false);
- var nearest, nearestDist = Infinity;
- while (cursor.findNext()) {
- var from = cursor.from(), dist = Math.abs(from.line - start.line) * 10000;
- if (!dist) dist = Math.abs(from.ch - start.ch);
- if (dist < nearestDist) { nearest = from; nearestDist = dist; }
- }
- if (!nearest) return null;
-
- if (before.length == 1)
- nearest.ch += before[0].length;
- else
- nearest = Pos(nearest.line + (before.length - 1), before[before.length - 1].length);
- if (data.start.line == data.end.line)
- var end = Pos(nearest.line, nearest.ch + (data.end.ch - data.start.ch));
- else
- var end = Pos(nearest.line + (data.end.line - data.start.line), data.end.ch);
- return {start: nearest, end: end};
- }
-
- function atInterestingExpression(cm) {
- var pos = cm.getCursor("end"), tok = cm.getTokenAt(pos);
- if (tok.start < pos.ch && tok.type == "comment") return false;
- return /[\w)\]]/.test(cm.getLine(pos.line).slice(Math.max(pos.ch - 1, 0), pos.ch + 1));
- }
-
- // Variable renaming
-
- function rename(ts, cm) {
- var token = cm.getTokenAt(cm.getCursor());
- if (!/\w/.test(token.string)) return showError(ts, cm, "Not at a variable");
- dialog(cm, "New name for " + token.string, function(newName) {
- ts.request(cm, {type: "rename", newName: newName, fullDocs: true}, function(error, data) {
- if (error) return showError(ts, cm, error);
- applyChanges(ts, data.changes);
- });
- });
- }
-
- function selectName(ts, cm) {
- var name = findDoc(ts, cm.doc).name;
- ts.request(cm, {type: "refs"}, function(error, data) {
- if (error) return showError(ts, cm, error);
- var ranges = [], cur = 0;
- var curPos = cm.getCursor();
- for (var i = 0; i < data.refs.length; i++) {
- var ref = data.refs[i];
- if (ref.file == name) {
- ranges.push({anchor: ref.start, head: ref.end});
- if (cmpPos(curPos, ref.start) >= 0 && cmpPos(curPos, ref.end) <= 0)
- cur = ranges.length - 1;
- }
- }
- cm.setSelections(ranges, cur);
- });
- }
-
- var nextChangeOrig = 0;
- function applyChanges(ts, changes) {
- var perFile = Object.create(null);
- for (var i = 0; i < changes.length; ++i) {
- var ch = changes[i];
- (perFile[ch.file] || (perFile[ch.file] = [])).push(ch);
- }
- for (var file in perFile) {
- var known = ts.docs[file], chs = perFile[file];;
- if (!known) continue;
- chs.sort(function(a, b) { return cmpPos(b.start, a.start); });
- var origin = "*rename" + (++nextChangeOrig);
- for (var i = 0; i < chs.length; ++i) {
- var ch = chs[i];
- known.doc.replaceRange(ch.text, ch.start, ch.end, origin);
- }
- }
- }
-
- // Generic request-building helper
-
- function buildRequest(ts, doc, query, pos) {
- var files = [], offsetLines = 0, allowFragments = !query.fullDocs;
- if (!allowFragments) delete query.fullDocs;
- if (typeof query == "string") query = {type: query};
- query.lineCharPositions = true;
- if (query.end == null) {
- query.end = pos || doc.doc.getCursor("end");
- if (doc.doc.somethingSelected())
- query.start = doc.doc.getCursor("start");
- }
- var startPos = query.start || query.end;
-
- if (doc.changed) {
- if (doc.doc.lineCount() > bigDoc && allowFragments !== false &&
- doc.changed.to - doc.changed.from < 100 &&
- doc.changed.from <= startPos.line && doc.changed.to > query.end.line) {
- files.push(getFragmentAround(doc, startPos, query.end));
- query.file = "#0";
- var offsetLines = files[0].offsetLines;
- if (query.start != null) query.start = Pos(query.start.line - -offsetLines, query.start.ch);
- query.end = Pos(query.end.line - offsetLines, query.end.ch);
- } else {
- files.push({type: "full",
- name: doc.name,
- text: docValue(ts, doc)});
- query.file = doc.name;
- doc.changed = null;
- }
- } else {
- query.file = doc.name;
- }
- for (var name in ts.docs) {
- var cur = ts.docs[name];
- if (cur.changed && cur != doc) {
- files.push({type: "full", name: cur.name, text: docValue(ts, cur)});
- cur.changed = null;
- }
- }
-
- return {query: query, files: files};
- }
-
- function getFragmentAround(data, start, end) {
- var doc = data.doc;
- var minIndent = null, minLine = null, endLine, tabSize = 4;
- for (var p = start.line - 1, min = Math.max(0, p - 50); p >= min; --p) {
- var line = doc.getLine(p), fn = line.search(/\bfunction\b/);
- if (fn < 0) continue;
- var indent = CodeMirror.countColumn(line, null, tabSize);
- if (minIndent != null && minIndent <= indent) continue;
- minIndent = indent;
- minLine = p;
- }
- if (minLine == null) minLine = min;
- var max = Math.min(doc.lastLine(), end.line + 20);
- if (minIndent == null || minIndent == CodeMirror.countColumn(doc.getLine(start.line), null, tabSize))
- endLine = max;
- else for (endLine = end.line + 1; endLine < max; ++endLine) {
- var indent = CodeMirror.countColumn(doc.getLine(endLine), null, tabSize);
- if (indent <= minIndent) break;
- }
- var from = Pos(minLine, 0);
-
- return {type: "part",
- name: data.name,
- offsetLines: from.line,
- text: doc.getRange(from, Pos(endLine, 0))};
- }
-
- // Generic utilities
-
- var cmpPos = CodeMirror.cmpPos;
-
- function elt(tagname, cls /*, ... elts*/) {
- var e = document.createElement(tagname);
- if (cls) e.className = cls;
- for (var i = 2; i < arguments.length; ++i) {
- var elt = arguments[i];
- if (typeof elt == "string") elt = document.createTextNode(elt);
- e.appendChild(elt);
- }
- return e;
- }
-
- function dialog(cm, text, f) {
- if (cm.openDialog)
- cm.openDialog(text + ":
", f);
- else
- f(prompt(text, ""));
- }
-
- // Tooltips
-
- function tempTooltip(cm, content, ts) {
- if (cm.state.ternTooltip) remove(cm.state.ternTooltip);
- var where = cm.cursorCoords();
- var tip = cm.state.ternTooltip = makeTooltip(where.right + 1, where.bottom, content);
- function maybeClear() {
- old = true;
- if (!mouseOnTip) clear();
- }
- function clear() {
- cm.state.ternTooltip = null;
- if (!tip.parentNode) return;
- cm.off("cursorActivity", clear);
- cm.off('blur', clear);
- cm.off('scroll', clear);
- fadeOut(tip);
- }
- var mouseOnTip = false, old = false;
- CodeMirror.on(tip, "mousemove", function() { mouseOnTip = true; });
- CodeMirror.on(tip, "mouseout", function(e) {
- if (!CodeMirror.contains(tip, e.relatedTarget || e.toElement)) {
- if (old) clear();
- else mouseOnTip = false;
- }
- });
- setTimeout(maybeClear, ts.options.hintDelay ? ts.options.hintDelay : 1700);
- cm.on("cursorActivity", clear);
- cm.on('blur', clear);
- cm.on('scroll', clear);
- }
-
- function makeTooltip(x, y, content) {
- var node = elt("div", cls + "tooltip", content);
- node.style.left = x + "px";
- node.style.top = y + "px";
- document.body.appendChild(node);
- return node;
- }
-
- function remove(node) {
- var p = node && node.parentNode;
- if (p) p.removeChild(node);
- }
-
- function fadeOut(tooltip) {
- tooltip.style.opacity = "0";
- setTimeout(function() { remove(tooltip); }, 1100);
- }
-
- function showError(ts, cm, msg) {
- if (ts.options.showError)
- ts.options.showError(cm, msg);
- else
- tempTooltip(cm, String(msg), ts);
- }
-
- function closeArgHints(ts) {
- if (ts.activeArgHints) { remove(ts.activeArgHints); ts.activeArgHints = null; }
- }
-
- function docValue(ts, doc) {
- var val = doc.doc.getValue();
- if (ts.options.fileFilter) val = ts.options.fileFilter(val, doc.name, doc.doc);
- return val;
- }
-
- // Worker wrapper
-
- function WorkerServer(ts) {
- var worker = ts.worker = new Worker(ts.options.workerScript);
- worker.postMessage({type: "init",
- defs: ts.options.defs,
- plugins: ts.options.plugins,
- scripts: ts.options.workerDeps});
- var msgId = 0, pending = {};
-
- function send(data, c) {
- if (c) {
- data.id = ++msgId;
- pending[msgId] = c;
- }
- worker.postMessage(data);
- }
- worker.onmessage = function(e) {
- var data = e.data;
- if (data.type == "getFile") {
- getFile(ts, data.name, function(err, text) {
- send({type: "getFile", err: String(err), text: text, id: data.id});
- });
- } else if (data.type == "debug") {
- window.console.log(data.message);
- } else if (data.id && pending[data.id]) {
- pending[data.id](data.err, data.body);
- delete pending[data.id];
- }
- };
- worker.onerror = function(e) {
- for (var id in pending) pending[id](e);
- pending = {};
- };
-
- this.addFile = function(name, text) { send({type: "add", name: name, text: text}); };
- this.delFile = function(name) { send({type: "del", name: name}); };
- this.request = function(body, c) { send({type: "req", body: body}, c); };
- }
-});
diff --git a/WebContent/addon/codemirror/addon/tern/worker.js b/WebContent/addon/codemirror/addon/tern/worker.js
deleted file mode 100644
index 887f906..0000000
--- a/WebContent/addon/codemirror/addon/tern/worker.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// declare global: tern, server
-
-var server;
-
-this.onmessage = function(e) {
- var data = e.data;
- switch (data.type) {
- case "init": return startServer(data.defs, data.plugins, data.scripts);
- case "add": return server.addFile(data.name, data.text);
- case "del": return server.delFile(data.name);
- case "req": return server.request(data.body, function(err, reqData) {
- postMessage({id: data.id, body: reqData, err: err && String(err)});
- });
- case "getFile":
- var c = pending[data.id];
- delete pending[data.id];
- return c(data.err, data.text);
- default: throw new Error("Unknown message type: " + data.type);
- }
-};
-
-var nextId = 0, pending = {};
-function getFile(file, c) {
- postMessage({type: "getFile", name: file, id: ++nextId});
- pending[nextId] = c;
-}
-
-function startServer(defs, plugins, scripts) {
- if (scripts) importScripts.apply(null, scripts);
-
- server = new tern.Server({
- getFile: getFile,
- async: true,
- defs: defs,
- plugins: plugins
- });
-}
-
-this.console = {
- log: function(v) { postMessage({type: "debug", message: v}); }
-};
diff --git a/WebContent/addon/codemirror/addon/wrap/hardwrap.js b/WebContent/addon/codemirror/addon/wrap/hardwrap.js
deleted file mode 100644
index 04851f9..0000000
--- a/WebContent/addon/codemirror/addon/wrap/hardwrap.js
+++ /dev/null
@@ -1,144 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
- if (typeof exports == "object" && typeof module == "object") // CommonJS
- mod(require("../../lib/codemirror"));
- else if (typeof define == "function" && define.amd) // AMD
- define(["../../lib/codemirror"], mod);
- else // Plain browser env
- mod(CodeMirror);
-})(function(CodeMirror) {
- "use strict";
-
- var Pos = CodeMirror.Pos;
-
- function findParagraph(cm, pos, options) {
- var startRE = options.paragraphStart || cm.getHelper(pos, "paragraphStart");
- for (var start = pos.line, first = cm.firstLine(); start > first; --start) {
- var line = cm.getLine(start);
- if (startRE && startRE.test(line)) break;
- if (!/\S/.test(line)) { ++start; break; }
- }
- var endRE = options.paragraphEnd || cm.getHelper(pos, "paragraphEnd");
- for (var end = pos.line + 1, last = cm.lastLine(); end <= last; ++end) {
- var line = cm.getLine(end);
- if (endRE && endRE.test(line)) { ++end; break; }
- if (!/\S/.test(line)) break;
- }
- return {from: start, to: end};
- }
-
- function findBreakPoint(text, column, wrapOn, killTrailingSpace) {
- var at = column
- while (at < text.length && text.charAt(at) == " ") at++
- for (; at > 0; --at)
- if (wrapOn.test(text.slice(at - 1, at + 1))) break;
- for (var first = true;; first = false) {
- var endOfText = at;
- if (killTrailingSpace)
- while (text.charAt(endOfText - 1) == " ") --endOfText;
- if (endOfText == 0 && first) at = column;
- else return {from: endOfText, to: at};
- }
- }
-
- function wrapRange(cm, from, to, options) {
- from = cm.clipPos(from); to = cm.clipPos(to);
- var column = options.column || 80;
- var wrapOn = options.wrapOn || /\s\S|-[^\.\d]/;
- var killTrailing = options.killTrailingSpace !== false;
- var changes = [], curLine = "", curNo = from.line;
- var lines = cm.getRange(from, to, false);
- if (!lines.length) return null;
- var leadingSpace = lines[0].match(/^[ \t]*/)[0];
-
- for (var i = 0; i < lines.length; ++i) {
- var text = lines[i], oldLen = curLine.length, spaceInserted = 0;
- if (curLine && text && !wrapOn.test(curLine.charAt(curLine.length - 1) + text.charAt(0))) {
- curLine += " ";
- spaceInserted = 1;
- }
- var spaceTrimmed = "";
- if (i) {
- spaceTrimmed = text.match(/^\s*/)[0];
- text = text.slice(spaceTrimmed.length);
- }
- curLine += text;
- if (i) {
- var firstBreak = curLine.length > column && leadingSpace == spaceTrimmed &&
- findBreakPoint(curLine, column, wrapOn, killTrailing);
- // If this isn't broken, or is broken at a different point, remove old break
- if (!firstBreak || firstBreak.from != oldLen || firstBreak.to != oldLen + spaceInserted) {
- changes.push({text: [spaceInserted ? " " : ""],
- from: Pos(curNo, oldLen),
- to: Pos(curNo + 1, spaceTrimmed.length)});
- } else {
- curLine = leadingSpace + text;
- ++curNo;
- }
- }
- while (curLine.length > column) {
- var bp = findBreakPoint(curLine, column, wrapOn, killTrailing);
- changes.push({text: ["", leadingSpace],
- from: Pos(curNo, bp.from),
- to: Pos(curNo, bp.to)});
- curLine = leadingSpace + curLine.slice(bp.to);
- ++curNo;
- }
- }
- if (changes.length) cm.operation(function() {
- for (var i = 0; i < changes.length; ++i) {
- var change = changes[i];
- if (change.text || CodeMirror.cmpPos(change.from, change.to))
- cm.replaceRange(change.text, change.from, change.to);
- }
- });
- return changes.length ? {from: changes[0].from, to: CodeMirror.changeEnd(changes[changes.length - 1])} : null;
- }
-
- CodeMirror.defineExtension("wrapParagraph", function(pos, options) {
- options = options || {};
- if (!pos) pos = this.getCursor();
- var para = findParagraph(this, pos, options);
- return wrapRange(this, Pos(para.from, 0), Pos(para.to - 1), options);
- });
-
- CodeMirror.commands.wrapLines = function(cm) {
- cm.operation(function() {
- var ranges = cm.listSelections(), at = cm.lastLine() + 1;
- for (var i = ranges.length - 1; i >= 0; i--) {
- var range = ranges[i], span;
- if (range.empty()) {
- var para = findParagraph(cm, range.head, {});
- span = {from: Pos(para.from, 0), to: Pos(para.to - 1)};
- } else {
- span = {from: range.from(), to: range.to()};
- }
- if (span.to.line >= at) continue;
- at = span.from.line;
- wrapRange(cm, span.from, span.to, {});
- }
- });
- };
-
- CodeMirror.defineExtension("wrapRange", function(from, to, options) {
- return wrapRange(this, from, to, options || {});
- });
-
- CodeMirror.defineExtension("wrapParagraphsInRange", function(from, to, options) {
- options = options || {};
- var cm = this, paras = [];
- for (var line = from.line; line <= to.line;) {
- var para = findParagraph(cm, Pos(line, 0), options);
- paras.push(para);
- line = para.to;
- }
- var madeChange = false;
- if (paras.length) cm.operation(function() {
- for (var i = paras.length - 1; i >= 0; --i)
- madeChange = madeChange || wrapRange(cm, Pos(paras[i].from, 0), Pos(paras[i].to - 1), options);
- });
- return madeChange;
- });
-});
diff --git a/WebContent/addon/codemirror/keymap/emacs.js b/WebContent/addon/codemirror/keymap/emacs.js
deleted file mode 100644
index 3eec1e5..0000000
--- a/WebContent/addon/codemirror/keymap/emacs.js
+++ /dev/null
@@ -1,412 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
- if (typeof exports == "object" && typeof module == "object") // CommonJS
- mod(require("../lib/codemirror"));
- else if (typeof define == "function" && define.amd) // AMD
- define(["../lib/codemirror"], mod);
- else // Plain browser env
- mod(CodeMirror);
-})(function(CodeMirror) {
- "use strict";
-
- var Pos = CodeMirror.Pos;
- function posEq(a, b) { return a.line == b.line && a.ch == b.ch; }
-
- // Kill 'ring'
-
- var killRing = [];
- function addToRing(str) {
- killRing.push(str);
- if (killRing.length > 50) killRing.shift();
- }
- function growRingTop(str) {
- if (!killRing.length) return addToRing(str);
- killRing[killRing.length - 1] += str;
- }
- function getFromRing(n) { return killRing[killRing.length - (n ? Math.min(n, 1) : 1)] || ""; }
- function popFromRing() { if (killRing.length > 1) killRing.pop(); return getFromRing(); }
-
- var lastKill = null;
-
- function kill(cm, from, to, mayGrow, text) {
- if (text == null) text = cm.getRange(from, to);
-
- if (mayGrow && lastKill && lastKill.cm == cm && posEq(from, lastKill.pos) && cm.isClean(lastKill.gen))
- growRingTop(text);
- else
- addToRing(text);
- cm.replaceRange("", from, to, "+delete");
-
- if (mayGrow) lastKill = {cm: cm, pos: from, gen: cm.changeGeneration()};
- else lastKill = null;
- }
-
- // Boundaries of various units
-
- function byChar(cm, pos, dir) {
- return cm.findPosH(pos, dir, "char", true);
- }
-
- function byWord(cm, pos, dir) {
- return cm.findPosH(pos, dir, "word", true);
- }
-
- function byLine(cm, pos, dir) {
- return cm.findPosV(pos, dir, "line", cm.doc.sel.goalColumn);
- }
-
- function byPage(cm, pos, dir) {
- return cm.findPosV(pos, dir, "page", cm.doc.sel.goalColumn);
- }
-
- function byParagraph(cm, pos, dir) {
- var no = pos.line, line = cm.getLine(no);
- var sawText = /\S/.test(dir < 0 ? line.slice(0, pos.ch) : line.slice(pos.ch));
- var fst = cm.firstLine(), lst = cm.lastLine();
- for (;;) {
- no += dir;
- if (no < fst || no > lst)
- return cm.clipPos(Pos(no - dir, dir < 0 ? 0 : null));
- line = cm.getLine(no);
- var hasText = /\S/.test(line);
- if (hasText) sawText = true;
- else if (sawText) return Pos(no, 0);
- }
- }
-
- function bySentence(cm, pos, dir) {
- var line = pos.line, ch = pos.ch;
- var text = cm.getLine(pos.line), sawWord = false;
- for (;;) {
- var next = text.charAt(ch + (dir < 0 ? -1 : 0));
- if (!next) { // End/beginning of line reached
- if (line == (dir < 0 ? cm.firstLine() : cm.lastLine())) return Pos(line, ch);
- text = cm.getLine(line + dir);
- if (!/\S/.test(text)) return Pos(line, ch);
- line += dir;
- ch = dir < 0 ? text.length : 0;
- continue;
- }
- if (sawWord && /[!?.]/.test(next)) return Pos(line, ch + (dir > 0 ? 1 : 0));
- if (!sawWord) sawWord = /\w/.test(next);
- ch += dir;
- }
- }
-
- function byExpr(cm, pos, dir) {
- var wrap;
- if (cm.findMatchingBracket && (wrap = cm.findMatchingBracket(pos, true))
- && wrap.match && (wrap.forward ? 1 : -1) == dir)
- return dir > 0 ? Pos(wrap.to.line, wrap.to.ch + 1) : wrap.to;
-
- for (var first = true;; first = false) {
- var token = cm.getTokenAt(pos);
- var after = Pos(pos.line, dir < 0 ? token.start : token.end);
- if (first && dir > 0 && token.end == pos.ch || !/\w/.test(token.string)) {
- var newPos = cm.findPosH(after, dir, "char");
- if (posEq(after, newPos)) return pos;
- else pos = newPos;
- } else {
- return after;
- }
- }
- }
-
- // Prefixes (only crudely supported)
-
- function getPrefix(cm, precise) {
- var digits = cm.state.emacsPrefix;
- if (!digits) return precise ? null : 1;
- clearPrefix(cm);
- return digits == "-" ? -1 : Number(digits);
- }
-
- function repeated(cmd) {
- var f = typeof cmd == "string" ? function(cm) { cm.execCommand(cmd); } : cmd;
- return function(cm) {
- var prefix = getPrefix(cm);
- f(cm);
- for (var i = 1; i < prefix; ++i) f(cm);
- };
- }
-
- function findEnd(cm, pos, by, dir) {
- var prefix = getPrefix(cm);
- if (prefix < 0) { dir = -dir; prefix = -prefix; }
- for (var i = 0; i < prefix; ++i) {
- var newPos = by(cm, pos, dir);
- if (posEq(newPos, pos)) break;
- pos = newPos;
- }
- return pos;
- }
-
- function move(by, dir) {
- var f = function(cm) {
- cm.extendSelection(findEnd(cm, cm.getCursor(), by, dir));
- };
- f.motion = true;
- return f;
- }
-
- function killTo(cm, by, dir) {
- var selections = cm.listSelections(), cursor;
- var i = selections.length;
- while (i--) {
- cursor = selections[i].head;
- kill(cm, cursor, findEnd(cm, cursor, by, dir), true);
- }
- }
-
- function killRegion(cm) {
- if (cm.somethingSelected()) {
- var selections = cm.listSelections(), selection;
- var i = selections.length;
- while (i--) {
- selection = selections[i];
- kill(cm, selection.anchor, selection.head);
- }
- return true;
- }
- }
-
- function addPrefix(cm, digit) {
- if (cm.state.emacsPrefix) {
- if (digit != "-") cm.state.emacsPrefix += digit;
- return;
- }
- // Not active yet
- cm.state.emacsPrefix = digit;
- cm.on("keyHandled", maybeClearPrefix);
- cm.on("inputRead", maybeDuplicateInput);
- }
-
- var prefixPreservingKeys = {"Alt-G": true, "Ctrl-X": true, "Ctrl-Q": true, "Ctrl-U": true};
-
- function maybeClearPrefix(cm, arg) {
- if (!cm.state.emacsPrefixMap && !prefixPreservingKeys.hasOwnProperty(arg))
- clearPrefix(cm);
- }
-
- function clearPrefix(cm) {
- cm.state.emacsPrefix = null;
- cm.off("keyHandled", maybeClearPrefix);
- cm.off("inputRead", maybeDuplicateInput);
- }
-
- function maybeDuplicateInput(cm, event) {
- var dup = getPrefix(cm);
- if (dup > 1 && event.origin == "+input") {
- var one = event.text.join("\n"), txt = "";
- for (var i = 1; i < dup; ++i) txt += one;
- cm.replaceSelection(txt);
- }
- }
-
- function addPrefixMap(cm) {
- cm.state.emacsPrefixMap = true;
- cm.addKeyMap(prefixMap);
- cm.on("keyHandled", maybeRemovePrefixMap);
- cm.on("inputRead", maybeRemovePrefixMap);
- }
-
- function maybeRemovePrefixMap(cm, arg) {
- if (typeof arg == "string" && (/^\d$/.test(arg) || arg == "Ctrl-U")) return;
- cm.removeKeyMap(prefixMap);
- cm.state.emacsPrefixMap = false;
- cm.off("keyHandled", maybeRemovePrefixMap);
- cm.off("inputRead", maybeRemovePrefixMap);
- }
-
- // Utilities
-
- function setMark(cm) {
- cm.setCursor(cm.getCursor());
- cm.setExtending(!cm.getExtending());
- cm.on("change", function() { cm.setExtending(false); });
- }
-
- function clearMark(cm) {
- cm.setExtending(false);
- cm.setCursor(cm.getCursor());
- }
-
- function getInput(cm, msg, f) {
- if (cm.openDialog)
- cm.openDialog(msg + ":
", f, {bottom: true});
- else
- f(prompt(msg, ""));
- }
-
- function operateOnWord(cm, op) {
- var start = cm.getCursor(), end = cm.findPosH(start, 1, "word");
- cm.replaceRange(op(cm.getRange(start, end)), start, end);
- cm.setCursor(end);
- }
-
- function toEnclosingExpr(cm) {
- var pos = cm.getCursor(), line = pos.line, ch = pos.ch;
- var stack = [];
- while (line >= cm.firstLine()) {
- var text = cm.getLine(line);
- for (var i = ch == null ? text.length : ch; i > 0;) {
- var ch = text.charAt(--i);
- if (ch == ")")
- stack.push("(");
- else if (ch == "]")
- stack.push("[");
- else if (ch == "}")
- stack.push("{");
- else if (/[\(\{\[]/.test(ch) && (!stack.length || stack.pop() != ch))
- return cm.extendSelection(Pos(line, i));
- }
- --line; ch = null;
- }
- }
-
- function quit(cm) {
- cm.execCommand("clearSearch");
- clearMark(cm);
- }
-
- // Actual keymap
-
- var keyMap = CodeMirror.keyMap.emacs = CodeMirror.normalizeKeyMap({
- "Ctrl-W": function(cm) {kill(cm, cm.getCursor("start"), cm.getCursor("end"));},
- "Ctrl-K": repeated(function(cm) {
- var start = cm.getCursor(), end = cm.clipPos(Pos(start.line));
- var text = cm.getRange(start, end);
- if (!/\S/.test(text)) {
- text += "\n";
- end = Pos(start.line + 1, 0);
- }
- kill(cm, start, end, true, text);
- }),
- "Alt-W": function(cm) {
- addToRing(cm.getSelection());
- clearMark(cm);
- },
- "Ctrl-Y": function(cm) {
- var start = cm.getCursor();
- cm.replaceRange(getFromRing(getPrefix(cm)), start, start, "paste");
- cm.setSelection(start, cm.getCursor());
- },
- "Alt-Y": function(cm) {cm.replaceSelection(popFromRing(), "around", "paste");},
-
- "Ctrl-Space": setMark, "Ctrl-Shift-2": setMark,
-
- "Ctrl-F": move(byChar, 1), "Ctrl-B": move(byChar, -1),
- "Right": move(byChar, 1), "Left": move(byChar, -1),
- "Ctrl-D": function(cm) { killTo(cm, byChar, 1); },
- "Delete": function(cm) { killRegion(cm) || killTo(cm, byChar, 1); },
- "Ctrl-H": function(cm) { killTo(cm, byChar, -1); },
- "Backspace": function(cm) { killRegion(cm) || killTo(cm, byChar, -1); },
-
- "Alt-F": move(byWord, 1), "Alt-B": move(byWord, -1),
- "Alt-D": function(cm) { killTo(cm, byWord, 1); },
- "Alt-Backspace": function(cm) { killTo(cm, byWord, -1); },
-
- "Ctrl-N": move(byLine, 1), "Ctrl-P": move(byLine, -1),
- "Down": move(byLine, 1), "Up": move(byLine, -1),
- "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd",
- "End": "goLineEnd", "Home": "goLineStart",
-
- "Alt-V": move(byPage, -1), "Ctrl-V": move(byPage, 1),
- "PageUp": move(byPage, -1), "PageDown": move(byPage, 1),
-
- "Ctrl-Up": move(byParagraph, -1), "Ctrl-Down": move(byParagraph, 1),
-
- "Alt-A": move(bySentence, -1), "Alt-E": move(bySentence, 1),
- "Alt-K": function(cm) { killTo(cm, bySentence, 1); },
-
- "Ctrl-Alt-K": function(cm) { killTo(cm, byExpr, 1); },
- "Ctrl-Alt-Backspace": function(cm) { killTo(cm, byExpr, -1); },
- "Ctrl-Alt-F": move(byExpr, 1), "Ctrl-Alt-B": move(byExpr, -1),
-
- "Shift-Ctrl-Alt-2": function(cm) {
- var cursor = cm.getCursor();
- cm.setSelection(findEnd(cm, cursor, byExpr, 1), cursor);
- },
- "Ctrl-Alt-T": function(cm) {
- var leftStart = byExpr(cm, cm.getCursor(), -1), leftEnd = byExpr(cm, leftStart, 1);
- var rightEnd = byExpr(cm, leftEnd, 1), rightStart = byExpr(cm, rightEnd, -1);
- cm.replaceRange(cm.getRange(rightStart, rightEnd) + cm.getRange(leftEnd, rightStart) +
- cm.getRange(leftStart, leftEnd), leftStart, rightEnd);
- },
- "Ctrl-Alt-U": repeated(toEnclosingExpr),
-
- "Alt-Space": function(cm) {
- var pos = cm.getCursor(), from = pos.ch, to = pos.ch, text = cm.getLine(pos.line);
- while (from && /\s/.test(text.charAt(from - 1))) --from;
- while (to < text.length && /\s/.test(text.charAt(to))) ++to;
- cm.replaceRange(" ", Pos(pos.line, from), Pos(pos.line, to));
- },
- "Ctrl-O": repeated(function(cm) { cm.replaceSelection("\n", "start"); }),
- "Ctrl-T": repeated(function(cm) {
- cm.execCommand("transposeChars");
- }),
-
- "Alt-C": repeated(function(cm) {
- operateOnWord(cm, function(w) {
- var letter = w.search(/\w/);
- if (letter == -1) return w;
- return w.slice(0, letter) + w.charAt(letter).toUpperCase() + w.slice(letter + 1).toLowerCase();
- });
- }),
- "Alt-U": repeated(function(cm) {
- operateOnWord(cm, function(w) { return w.toUpperCase(); });
- }),
- "Alt-L": repeated(function(cm) {
- operateOnWord(cm, function(w) { return w.toLowerCase(); });
- }),
-
- "Alt-;": "toggleComment",
-
- "Ctrl-/": repeated("undo"), "Shift-Ctrl--": repeated("undo"),
- "Ctrl-Z": repeated("undo"), "Cmd-Z": repeated("undo"),
- "Shift-Alt-,": "goDocStart", "Shift-Alt-.": "goDocEnd",
- "Ctrl-S": "findNext", "Ctrl-R": "findPrev", "Ctrl-G": quit, "Shift-Alt-5": "replace",
- "Alt-/": "autocomplete",
- "Ctrl-J": "newlineAndIndent", "Enter": false, "Tab": "indentAuto",
-
- "Alt-G G": function(cm) {
- var prefix = getPrefix(cm, true);
- if (prefix != null && prefix > 0) return cm.setCursor(prefix - 1);
-
- getInput(cm, "Goto line", function(str) {
- var num;
- if (str && !isNaN(num = Number(str)) && num == (num|0) && num > 0)
- cm.setCursor(num - 1);
- });
- },
-
- "Ctrl-X Tab": function(cm) {
- cm.indentSelection(getPrefix(cm, true) || cm.getOption("indentUnit"));
- },
- "Ctrl-X Ctrl-X": function(cm) {
- cm.setSelection(cm.getCursor("head"), cm.getCursor("anchor"));
- },
- "Ctrl-X Ctrl-S": "save",
- "Ctrl-X Ctrl-W": "save",
- "Ctrl-X S": "saveAll",
- "Ctrl-X F": "open",
- "Ctrl-X U": repeated("undo"),
- "Ctrl-X K": "close",
- "Ctrl-X Delete": function(cm) { kill(cm, cm.getCursor(), bySentence(cm, cm.getCursor(), 1), true); },
- "Ctrl-X H": "selectAll",
-
- "Ctrl-Q Tab": repeated("insertTab"),
- "Ctrl-U": addPrefixMap
- });
-
- var prefixMap = {"Ctrl-G": clearPrefix};
- function regPrefix(d) {
- prefixMap[d] = function(cm) { addPrefix(cm, d); };
- keyMap["Ctrl-" + d] = function(cm) { addPrefix(cm, d); };
- prefixPreservingKeys["Ctrl-" + d] = true;
- }
- for (var i = 0; i < 10; ++i) regPrefix(String(i));
- regPrefix("-");
-});
diff --git a/WebContent/addon/codemirror/keymap/sublime.js b/WebContent/addon/codemirror/keymap/sublime.js
deleted file mode 100644
index 98fce4d..0000000
--- a/WebContent/addon/codemirror/keymap/sublime.js
+++ /dev/null
@@ -1,582 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// A rough approximation of Sublime Text's keybindings
-// Depends on addon/search/searchcursor.js and optionally addon/dialog/dialogs.js
-
-(function(mod) {
- if (typeof exports == "object" && typeof module == "object") // CommonJS
- mod(require("../lib/codemirror"), require("../addon/search/searchcursor"), require("../addon/edit/matchbrackets"));
- else if (typeof define == "function" && define.amd) // AMD
- define(["../lib/codemirror", "../addon/search/searchcursor", "../addon/edit/matchbrackets"], mod);
- else // Plain browser env
- mod(CodeMirror);
-})(function(CodeMirror) {
- "use strict";
-
- var map = CodeMirror.keyMap.sublime = {fallthrough: "default"};
- var cmds = CodeMirror.commands;
- var Pos = CodeMirror.Pos;
- var mac = CodeMirror.keyMap["default"] == CodeMirror.keyMap.macDefault;
- var ctrl = mac ? "Cmd-" : "Ctrl-";
-
- // This is not exactly Sublime's algorithm. I couldn't make heads or tails of that.
- function findPosSubword(doc, start, dir) {
- if (dir < 0 && start.ch == 0) return doc.clipPos(Pos(start.line - 1));
- var line = doc.getLine(start.line);
- if (dir > 0 && start.ch >= line.length) return doc.clipPos(Pos(start.line + 1, 0));
- var state = "start", type;
- for (var pos = start.ch, e = dir < 0 ? 0 : line.length, i = 0; pos != e; pos += dir, i++) {
- var next = line.charAt(dir < 0 ? pos - 1 : pos);
- var cat = next != "_" && CodeMirror.isWordChar(next) ? "w" : "o";
- if (cat == "w" && next.toUpperCase() == next) cat = "W";
- if (state == "start") {
- if (cat != "o") { state = "in"; type = cat; }
- } else if (state == "in") {
- if (type != cat) {
- if (type == "w" && cat == "W" && dir < 0) pos--;
- if (type == "W" && cat == "w" && dir > 0) { type = "w"; continue; }
- break;
- }
- }
- }
- return Pos(start.line, pos);
- }
-
- function moveSubword(cm, dir) {
- cm.extendSelectionsBy(function(range) {
- if (cm.display.shift || cm.doc.extend || range.empty())
- return findPosSubword(cm.doc, range.head, dir);
- else
- return dir < 0 ? range.from() : range.to();
- });
- }
-
- var goSubwordCombo = mac ? "Ctrl-" : "Alt-";
-
- cmds[map[goSubwordCombo + "Left"] = "goSubwordLeft"] = function(cm) { moveSubword(cm, -1); };
- cmds[map[goSubwordCombo + "Right"] = "goSubwordRight"] = function(cm) { moveSubword(cm, 1); };
-
- if (mac) map["Cmd-Left"] = "goLineStartSmart";
-
- var scrollLineCombo = mac ? "Ctrl-Alt-" : "Ctrl-";
-
- cmds[map[scrollLineCombo + "Up"] = "scrollLineUp"] = function(cm) {
- var info = cm.getScrollInfo();
- if (!cm.somethingSelected()) {
- var visibleBottomLine = cm.lineAtHeight(info.top + info.clientHeight, "local");
- if (cm.getCursor().line >= visibleBottomLine)
- cm.execCommand("goLineUp");
- }
- cm.scrollTo(null, info.top - cm.defaultTextHeight());
- };
- cmds[map[scrollLineCombo + "Down"] = "scrollLineDown"] = function(cm) {
- var info = cm.getScrollInfo();
- if (!cm.somethingSelected()) {
- var visibleTopLine = cm.lineAtHeight(info.top, "local")+1;
- if (cm.getCursor().line <= visibleTopLine)
- cm.execCommand("goLineDown");
- }
- cm.scrollTo(null, info.top + cm.defaultTextHeight());
- };
-
- cmds[map["Shift-" + ctrl + "L"] = "splitSelectionByLine"] = function(cm) {
- var ranges = cm.listSelections(), lineRanges = [];
- for (var i = 0; i < ranges.length; i++) {
- var from = ranges[i].from(), to = ranges[i].to();
- for (var line = from.line; line <= to.line; ++line)
- if (!(to.line > from.line && line == to.line && to.ch == 0))
- lineRanges.push({anchor: line == from.line ? from : Pos(line, 0),
- head: line == to.line ? to : Pos(line)});
- }
- cm.setSelections(lineRanges, 0);
- };
-
- map["Shift-Tab"] = "indentLess";
-
- cmds[map["Esc"] = "singleSelectionTop"] = function(cm) {
- var range = cm.listSelections()[0];
- cm.setSelection(range.anchor, range.head, {scroll: false});
- };
-
- cmds[map[ctrl + "L"] = "selectLine"] = function(cm) {
- var ranges = cm.listSelections(), extended = [];
- for (var i = 0; i < ranges.length; i++) {
- var range = ranges[i];
- extended.push({anchor: Pos(range.from().line, 0),
- head: Pos(range.to().line + 1, 0)});
- }
- cm.setSelections(extended);
- };
-
- map["Shift-Ctrl-K"] = "deleteLine";
-
- function insertLine(cm, above) {
- if (cm.isReadOnly()) return CodeMirror.Pass
- cm.operation(function() {
- var len = cm.listSelections().length, newSelection = [], last = -1;
- for (var i = 0; i < len; i++) {
- var head = cm.listSelections()[i].head;
- if (head.line <= last) continue;
- var at = Pos(head.line + (above ? 0 : 1), 0);
- cm.replaceRange("\n", at, null, "+insertLine");
- cm.indentLine(at.line, null, true);
- newSelection.push({head: at, anchor: at});
- last = head.line + 1;
- }
- cm.setSelections(newSelection);
- });
- cm.execCommand("indentAuto");
- }
-
- cmds[map[ctrl + "Enter"] = "insertLineAfter"] = function(cm) { return insertLine(cm, false); };
-
- cmds[map["Shift-" + ctrl + "Enter"] = "insertLineBefore"] = function(cm) { return insertLine(cm, true); };
-
- function wordAt(cm, pos) {
- var start = pos.ch, end = start, line = cm.getLine(pos.line);
- while (start && CodeMirror.isWordChar(line.charAt(start - 1))) --start;
- while (end < line.length && CodeMirror.isWordChar(line.charAt(end))) ++end;
- return {from: Pos(pos.line, start), to: Pos(pos.line, end), word: line.slice(start, end)};
- }
-
- cmds[map[ctrl + "D"] = "selectNextOccurrence"] = function(cm) {
- var from = cm.getCursor("from"), to = cm.getCursor("to");
- var fullWord = cm.state.sublimeFindFullWord == cm.doc.sel;
- if (CodeMirror.cmpPos(from, to) == 0) {
- var word = wordAt(cm, from);
- if (!word.word) return;
- cm.setSelection(word.from, word.to);
- fullWord = true;
- } else {
- var text = cm.getRange(from, to);
- var query = fullWord ? new RegExp("\\b" + text + "\\b") : text;
- var cur = cm.getSearchCursor(query, to);
- if (cur.findNext()) {
- cm.addSelection(cur.from(), cur.to());
- } else {
- cur = cm.getSearchCursor(query, Pos(cm.firstLine(), 0));
- if (cur.findNext())
- cm.addSelection(cur.from(), cur.to());
- }
- }
- if (fullWord)
- cm.state.sublimeFindFullWord = cm.doc.sel;
- };
-
- var mirror = "(){}[]";
- function selectBetweenBrackets(cm) {
- var pos = cm.getCursor(), opening = cm.scanForBracket(pos, -1);
- if (!opening) return;
- for (;;) {
- var closing = cm.scanForBracket(pos, 1);
- if (!closing) return;
- if (closing.ch == mirror.charAt(mirror.indexOf(opening.ch) + 1)) {
- cm.setSelection(Pos(opening.pos.line, opening.pos.ch + 1), closing.pos, false);
- return true;
- }
- pos = Pos(closing.pos.line, closing.pos.ch + 1);
- }
- }
-
- cmds[map["Shift-" + ctrl + "Space"] = "selectScope"] = function(cm) {
- selectBetweenBrackets(cm) || cm.execCommand("selectAll");
- };
- cmds[map["Shift-" + ctrl + "M"] = "selectBetweenBrackets"] = function(cm) {
- if (!selectBetweenBrackets(cm)) return CodeMirror.Pass;
- };
-
- cmds[map[ctrl + "M"] = "goToBracket"] = function(cm) {
- cm.extendSelectionsBy(function(range) {
- var next = cm.scanForBracket(range.head, 1);
- if (next && CodeMirror.cmpPos(next.pos, range.head) != 0) return next.pos;
- var prev = cm.scanForBracket(range.head, -1);
- return prev && Pos(prev.pos.line, prev.pos.ch + 1) || range.head;
- });
- };
-
- var swapLineCombo = mac ? "Cmd-Ctrl-" : "Shift-Ctrl-";
-
- cmds[map[swapLineCombo + "Up"] = "swapLineUp"] = function(cm) {
- if (cm.isReadOnly()) return CodeMirror.Pass
- var ranges = cm.listSelections(), linesToMove = [], at = cm.firstLine() - 1, newSels = [];
- for (var i = 0; i < ranges.length; i++) {
- var range = ranges[i], from = range.from().line - 1, to = range.to().line;
- newSels.push({anchor: Pos(range.anchor.line - 1, range.anchor.ch),
- head: Pos(range.head.line - 1, range.head.ch)});
- if (range.to().ch == 0 && !range.empty()) --to;
- if (from > at) linesToMove.push(from, to);
- else if (linesToMove.length) linesToMove[linesToMove.length - 1] = to;
- at = to;
- }
- cm.operation(function() {
- for (var i = 0; i < linesToMove.length; i += 2) {
- var from = linesToMove[i], to = linesToMove[i + 1];
- var line = cm.getLine(from);
- cm.replaceRange("", Pos(from, 0), Pos(from + 1, 0), "+swapLine");
- if (to > cm.lastLine())
- cm.replaceRange("\n" + line, Pos(cm.lastLine()), null, "+swapLine");
- else
- cm.replaceRange(line + "\n", Pos(to, 0), null, "+swapLine");
- }
- cm.setSelections(newSels);
- cm.scrollIntoView();
- });
- };
-
- cmds[map[swapLineCombo + "Down"] = "swapLineDown"] = function(cm) {
- if (cm.isReadOnly()) return CodeMirror.Pass
- var ranges = cm.listSelections(), linesToMove = [], at = cm.lastLine() + 1;
- for (var i = ranges.length - 1; i >= 0; i--) {
- var range = ranges[i], from = range.to().line + 1, to = range.from().line;
- if (range.to().ch == 0 && !range.empty()) from--;
- if (from < at) linesToMove.push(from, to);
- else if (linesToMove.length) linesToMove[linesToMove.length - 1] = to;
- at = to;
- }
- cm.operation(function() {
- for (var i = linesToMove.length - 2; i >= 0; i -= 2) {
- var from = linesToMove[i], to = linesToMove[i + 1];
- var line = cm.getLine(from);
- if (from == cm.lastLine())
- cm.replaceRange("", Pos(from - 1), Pos(from), "+swapLine");
- else
- cm.replaceRange("", Pos(from, 0), Pos(from + 1, 0), "+swapLine");
- cm.replaceRange(line + "\n", Pos(to, 0), null, "+swapLine");
- }
- cm.scrollIntoView();
- });
- };
-
- cmds[map[ctrl + "/"] = "toggleCommentIndented"] = function(cm) {
- cm.toggleComment({ indent: true });
- }
-
- cmds[map[ctrl + "J"] = "joinLines"] = function(cm) {
- var ranges = cm.listSelections(), joined = [];
- for (var i = 0; i < ranges.length; i++) {
- var range = ranges[i], from = range.from();
- var start = from.line, end = range.to().line;
- while (i < ranges.length - 1 && ranges[i + 1].from().line == end)
- end = ranges[++i].to().line;
- joined.push({start: start, end: end, anchor: !range.empty() && from});
- }
- cm.operation(function() {
- var offset = 0, ranges = [];
- for (var i = 0; i < joined.length; i++) {
- var obj = joined[i];
- var anchor = obj.anchor && Pos(obj.anchor.line - offset, obj.anchor.ch), head;
- for (var line = obj.start; line <= obj.end; line++) {
- var actual = line - offset;
- if (line == obj.end) head = Pos(actual, cm.getLine(actual).length + 1);
- if (actual < cm.lastLine()) {
- cm.replaceRange(" ", Pos(actual), Pos(actual + 1, /^\s*/.exec(cm.getLine(actual + 1))[0].length));
- ++offset;
- }
- }
- ranges.push({anchor: anchor || head, head: head});
- }
- cm.setSelections(ranges, 0);
- });
- };
-
- cmds[map["Shift-" + ctrl + "D"] = "duplicateLine"] = function(cm) {
- cm.operation(function() {
- var rangeCount = cm.listSelections().length;
- for (var i = 0; i < rangeCount; i++) {
- var range = cm.listSelections()[i];
- if (range.empty())
- cm.replaceRange(cm.getLine(range.head.line) + "\n", Pos(range.head.line, 0));
- else
- cm.replaceRange(cm.getRange(range.from(), range.to()), range.from());
- }
- cm.scrollIntoView();
- });
- };
-
- if (!mac) map[ctrl + "T"] = "transposeChars";
-
- function sortLines(cm, caseSensitive) {
- if (cm.isReadOnly()) return CodeMirror.Pass
- var ranges = cm.listSelections(), toSort = [], selected;
- for (var i = 0; i < ranges.length; i++) {
- var range = ranges[i];
- if (range.empty()) continue;
- var from = range.from().line, to = range.to().line;
- while (i < ranges.length - 1 && ranges[i + 1].from().line == to)
- to = range[++i].to().line;
- toSort.push(from, to);
- }
- if (toSort.length) selected = true;
- else toSort.push(cm.firstLine(), cm.lastLine());
-
- cm.operation(function() {
- var ranges = [];
- for (var i = 0; i < toSort.length; i += 2) {
- var from = toSort[i], to = toSort[i + 1];
- var start = Pos(from, 0), end = Pos(to);
- var lines = cm.getRange(start, end, false);
- if (caseSensitive)
- lines.sort();
- else
- lines.sort(function(a, b) {
- var au = a.toUpperCase(), bu = b.toUpperCase();
- if (au != bu) { a = au; b = bu; }
- return a < b ? -1 : a == b ? 0 : 1;
- });
- cm.replaceRange(lines, start, end);
- if (selected) ranges.push({anchor: start, head: end});
- }
- if (selected) cm.setSelections(ranges, 0);
- });
- }
-
- cmds[map["F9"] = "sortLines"] = function(cm) { sortLines(cm, true); };
- cmds[map[ctrl + "F9"] = "sortLinesInsensitive"] = function(cm) { sortLines(cm, false); };
-
- cmds[map["F2"] = "nextBookmark"] = function(cm) {
- var marks = cm.state.sublimeBookmarks;
- if (marks) while (marks.length) {
- var current = marks.shift();
- var found = current.find();
- if (found) {
- marks.push(current);
- return cm.setSelection(found.from, found.to);
- }
- }
- };
-
- cmds[map["Shift-F2"] = "prevBookmark"] = function(cm) {
- var marks = cm.state.sublimeBookmarks;
- if (marks) while (marks.length) {
- marks.unshift(marks.pop());
- var found = marks[marks.length - 1].find();
- if (!found)
- marks.pop();
- else
- return cm.setSelection(found.from, found.to);
- }
- };
-
- cmds[map[ctrl + "F2"] = "toggleBookmark"] = function(cm) {
- var ranges = cm.listSelections();
- var marks = cm.state.sublimeBookmarks || (cm.state.sublimeBookmarks = []);
- for (var i = 0; i < ranges.length; i++) {
- var from = ranges[i].from(), to = ranges[i].to();
- var found = cm.findMarks(from, to);
- for (var j = 0; j < found.length; j++) {
- if (found[j].sublimeBookmark) {
- found[j].clear();
- for (var k = 0; k < marks.length; k++)
- if (marks[k] == found[j])
- marks.splice(k--, 1);
- break;
- }
- }
- if (j == found.length)
- marks.push(cm.markText(from, to, {sublimeBookmark: true, clearWhenEmpty: false}));
- }
- };
-
- cmds[map["Shift-" + ctrl + "F2"] = "clearBookmarks"] = function(cm) {
- var marks = cm.state.sublimeBookmarks;
- if (marks) for (var i = 0; i < marks.length; i++) marks[i].clear();
- marks.length = 0;
- };
-
- cmds[map["Alt-F2"] = "selectBookmarks"] = function(cm) {
- var marks = cm.state.sublimeBookmarks, ranges = [];
- if (marks) for (var i = 0; i < marks.length; i++) {
- var found = marks[i].find();
- if (!found)
- marks.splice(i--, 0);
- else
- ranges.push({anchor: found.from, head: found.to});
- }
- if (ranges.length)
- cm.setSelections(ranges, 0);
- };
-
- map["Alt-Q"] = "wrapLines";
-
- var cK = ctrl + "K ";
-
- function modifyWordOrSelection(cm, mod) {
- cm.operation(function() {
- var ranges = cm.listSelections(), indices = [], replacements = [];
- for (var i = 0; i < ranges.length; i++) {
- var range = ranges[i];
- if (range.empty()) { indices.push(i); replacements.push(""); }
- else replacements.push(mod(cm.getRange(range.from(), range.to())));
- }
- cm.replaceSelections(replacements, "around", "case");
- for (var i = indices.length - 1, at; i >= 0; i--) {
- var range = ranges[indices[i]];
- if (at && CodeMirror.cmpPos(range.head, at) > 0) continue;
- var word = wordAt(cm, range.head);
- at = word.from;
- cm.replaceRange(mod(word.word), word.from, word.to);
- }
- });
- }
-
- map[cK + ctrl + "Backspace"] = "delLineLeft";
-
- cmds[map["Backspace"] = "smartBackspace"] = function(cm) {
- if (cm.somethingSelected()) return CodeMirror.Pass;
-
- cm.operation(function() {
- var cursors = cm.listSelections();
- var indentUnit = cm.getOption("indentUnit");
-
- for (var i = cursors.length - 1; i >= 0; i--) {
- var cursor = cursors[i].head;
- var toStartOfLine = cm.getRange({line: cursor.line, ch: 0}, cursor);
- var column = CodeMirror.countColumn(toStartOfLine, null, cm.getOption("tabSize"));
-
- // Delete by one character by default
- var deletePos = cm.findPosH(cursor, -1, "char", false);
-
- if (toStartOfLine && !/\S/.test(toStartOfLine) && column % indentUnit == 0) {
- var prevIndent = new Pos(cursor.line,
- CodeMirror.findColumn(toStartOfLine, column - indentUnit, indentUnit));
-
- // Smart delete only if we found a valid prevIndent location
- if (prevIndent.ch != cursor.ch) deletePos = prevIndent;
- }
-
- cm.replaceRange("", deletePos, cursor, "+delete");
- }
- });
- };
-
- cmds[map[cK + ctrl + "K"] = "delLineRight"] = function(cm) {
- cm.operation(function() {
- var ranges = cm.listSelections();
- for (var i = ranges.length - 1; i >= 0; i--)
- cm.replaceRange("", ranges[i].anchor, Pos(ranges[i].to().line), "+delete");
- cm.scrollIntoView();
- });
- };
-
- cmds[map[cK + ctrl + "U"] = "upcaseAtCursor"] = function(cm) {
- modifyWordOrSelection(cm, function(str) { return str.toUpperCase(); });
- };
- cmds[map[cK + ctrl + "L"] = "downcaseAtCursor"] = function(cm) {
- modifyWordOrSelection(cm, function(str) { return str.toLowerCase(); });
- };
-
- cmds[map[cK + ctrl + "Space"] = "setSublimeMark"] = function(cm) {
- if (cm.state.sublimeMark) cm.state.sublimeMark.clear();
- cm.state.sublimeMark = cm.setBookmark(cm.getCursor());
- };
- cmds[map[cK + ctrl + "A"] = "selectToSublimeMark"] = function(cm) {
- var found = cm.state.sublimeMark && cm.state.sublimeMark.find();
- if (found) cm.setSelection(cm.getCursor(), found);
- };
- cmds[map[cK + ctrl + "W"] = "deleteToSublimeMark"] = function(cm) {
- var found = cm.state.sublimeMark && cm.state.sublimeMark.find();
- if (found) {
- var from = cm.getCursor(), to = found;
- if (CodeMirror.cmpPos(from, to) > 0) { var tmp = to; to = from; from = tmp; }
- cm.state.sublimeKilled = cm.getRange(from, to);
- cm.replaceRange("", from, to);
- }
- };
- cmds[map[cK + ctrl + "X"] = "swapWithSublimeMark"] = function(cm) {
- var found = cm.state.sublimeMark && cm.state.sublimeMark.find();
- if (found) {
- cm.state.sublimeMark.clear();
- cm.state.sublimeMark = cm.setBookmark(cm.getCursor());
- cm.setCursor(found);
- }
- };
- cmds[map[cK + ctrl + "Y"] = "sublimeYank"] = function(cm) {
- if (cm.state.sublimeKilled != null)
- cm.replaceSelection(cm.state.sublimeKilled, null, "paste");
- };
-
- map[cK + ctrl + "G"] = "clearBookmarks";
- cmds[map[cK + ctrl + "C"] = "showInCenter"] = function(cm) {
- var pos = cm.cursorCoords(null, "local");
- cm.scrollTo(null, (pos.top + pos.bottom) / 2 - cm.getScrollInfo().clientHeight / 2);
- };
-
- var selectLinesCombo = mac ? "Ctrl-Shift-" : "Ctrl-Alt-";
- cmds[map[selectLinesCombo + "Up"] = "selectLinesUpward"] = function(cm) {
- cm.operation(function() {
- var ranges = cm.listSelections();
- for (var i = 0; i < ranges.length; i++) {
- var range = ranges[i];
- if (range.head.line > cm.firstLine())
- cm.addSelection(Pos(range.head.line - 1, range.head.ch));
- }
- });
- };
- cmds[map[selectLinesCombo + "Down"] = "selectLinesDownward"] = function(cm) {
- cm.operation(function() {
- var ranges = cm.listSelections();
- for (var i = 0; i < ranges.length; i++) {
- var range = ranges[i];
- if (range.head.line < cm.lastLine())
- cm.addSelection(Pos(range.head.line + 1, range.head.ch));
- }
- });
- };
-
- function getTarget(cm) {
- var from = cm.getCursor("from"), to = cm.getCursor("to");
- if (CodeMirror.cmpPos(from, to) == 0) {
- var word = wordAt(cm, from);
- if (!word.word) return;
- from = word.from;
- to = word.to;
- }
- return {from: from, to: to, query: cm.getRange(from, to), word: word};
- }
-
- function findAndGoTo(cm, forward) {
- var target = getTarget(cm);
- if (!target) return;
- var query = target.query;
- var cur = cm.getSearchCursor(query, forward ? target.to : target.from);
-
- if (forward ? cur.findNext() : cur.findPrevious()) {
- cm.setSelection(cur.from(), cur.to());
- } else {
- cur = cm.getSearchCursor(query, forward ? Pos(cm.firstLine(), 0)
- : cm.clipPos(Pos(cm.lastLine())));
- if (forward ? cur.findNext() : cur.findPrevious())
- cm.setSelection(cur.from(), cur.to());
- else if (target.word)
- cm.setSelection(target.from, target.to);
- }
- };
- cmds[map[ctrl + "F3"] = "findUnder"] = function(cm) { findAndGoTo(cm, true); };
- cmds[map["Shift-" + ctrl + "F3"] = "findUnderPrevious"] = function(cm) { findAndGoTo(cm,false); };
- cmds[map["Alt-F3"] = "findAllUnder"] = function(cm) {
- var target = getTarget(cm);
- if (!target) return;
- var cur = cm.getSearchCursor(target.query);
- var matches = [];
- var primaryIndex = -1;
- while (cur.findNext()) {
- matches.push({anchor: cur.from(), head: cur.to()});
- if (cur.from().line <= target.from.line && cur.from().ch <= target.from.ch)
- primaryIndex++;
- }
- cm.setSelections(matches, primaryIndex);
- };
-
- map["Shift-" + ctrl + "["] = "fold";
- map["Shift-" + ctrl + "]"] = "unfold";
- map[cK + ctrl + "0"] = map[cK + ctrl + "J"] = "unfoldAll";
-
- map[ctrl + "I"] = "findIncremental";
- map["Shift-" + ctrl + "I"] = "findIncrementalReverse";
- map[ctrl + "H"] = "replace";
- map["F3"] = "findNext";
- map["Shift-F3"] = "findPrev";
-
- CodeMirror.normalizeKeyMap(map);
-});
diff --git a/WebContent/addon/codemirror/keymap/vim.js b/WebContent/addon/codemirror/keymap/vim.js
deleted file mode 100644
index a166f72..0000000
--- a/WebContent/addon/codemirror/keymap/vim.js
+++ /dev/null
@@ -1,5083 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-/**
- * Supported keybindings:
- * Too many to list. Refer to defaultKeyMap below.
- *
- * Supported Ex commands:
- * Refer to defaultExCommandMap below.
- *
- * Registers: unnamed, -, a-z, A-Z, 0-9
- * (Does not respect the special case for number registers when delete
- * operator is made with these commands: %, (, ), , /, ?, n, N, {, } )
- * TODO: Implement the remaining registers.
- *
- * Marks: a-z, A-Z, and 0-9
- * TODO: Implement the remaining special marks. They have more complex
- * behavior.
- *
- * Events:
- * 'vim-mode-change' - raised on the editor anytime the current mode changes,
- * Event object: {mode: "visual", subMode: "linewise"}
- *
- * Code structure:
- * 1. Default keymap
- * 2. Variable declarations and short basic helpers
- * 3. Instance (External API) implementation
- * 4. Internal state tracking objects (input state, counter) implementation
- * and instantiation
- * 5. Key handler (the main command dispatcher) implementation
- * 6. Motion, operator, and action implementations
- * 7. Helper functions for the key handler, motions, operators, and actions
- * 8. Set up Vim to work as a keymap for CodeMirror.
- * 9. Ex command implementations.
- */
-
-(function(mod) {
- if (typeof exports == "object" && typeof module == "object") // CommonJS
- mod(require("../lib/codemirror"), require("../addon/search/searchcursor"), require("../addon/dialog/dialog"), require("../addon/edit/matchbrackets.js"));
- else if (typeof define == "function" && define.amd) // AMD
- define(["../lib/codemirror", "../addon/search/searchcursor", "../addon/dialog/dialog", "../addon/edit/matchbrackets"], mod);
- else // Plain browser env
- mod(CodeMirror);
-})(function(CodeMirror) {
- 'use strict';
-
- var defaultKeymap = [
- // Key to key mapping. This goes first to make it possible to override
- // existing mappings.
- { keys: '
', type: 'keyToKey', toKeys: 'h' },
- { keys: '', type: 'keyToKey', toKeys: 'l' },
- { keys: '', type: 'keyToKey', toKeys: 'k' },
- { keys: '', type: 'keyToKey', toKeys: 'j' },
- { keys: '', type: 'keyToKey', toKeys: 'l' },
- { keys: '', type: 'keyToKey', toKeys: 'h', context: 'normal'},
- { keys: '', type: 'keyToKey', toKeys: 'W' },
- { keys: '', type: 'keyToKey', toKeys: 'B', context: 'normal' },
- { keys: '', type: 'keyToKey', toKeys: 'w' },
- { keys: '', type: 'keyToKey', toKeys: 'b', context: 'normal' },
- { keys: '', type: 'keyToKey', toKeys: 'j' },
- { keys: '', type: 'keyToKey', toKeys: 'k' },
- { keys: '', type: 'keyToKey', toKeys: '' },
- { keys: '', type: 'keyToKey', toKeys: '' },
- { keys: '', type: 'keyToKey', toKeys: '', context: 'insert' },
- { keys: '', type: 'keyToKey', toKeys: '', context: 'insert' },
- { keys: 's', type: 'keyToKey', toKeys: 'cl', context: 'normal' },
- { keys: 's', type: 'keyToKey', toKeys: 'c', context: 'visual'},
- { keys: 'S', type: 'keyToKey', toKeys: 'cc', context: 'normal' },
- { keys: 'S', type: 'keyToKey', toKeys: 'VdO', context: 'visual' },
- { keys: '', type: 'keyToKey', toKeys: '0' },
- { keys: '', type: 'keyToKey', toKeys: '$' },
- { keys: '', type: 'keyToKey', toKeys: '' },
- { keys: '', type: 'keyToKey', toKeys: '' },
- { keys: '', type: 'keyToKey', toKeys: 'j^', context: 'normal' },
- { keys: '', type: 'action', action: 'toggleOverwrite', context: 'insert' },
- // Motions
- { keys: 'H', type: 'motion', motion: 'moveToTopLine', motionArgs: { linewise: true, toJumplist: true }},
- { keys: 'M', type: 'motion', motion: 'moveToMiddleLine', motionArgs: { linewise: true, toJumplist: true }},
- { keys: 'L', type: 'motion', motion: 'moveToBottomLine', motionArgs: { linewise: true, toJumplist: true }},
- { keys: 'h', type: 'motion', motion: 'moveByCharacters', motionArgs: { forward: false }},
- { keys: 'l', type: 'motion', motion: 'moveByCharacters', motionArgs: { forward: true }},
- { keys: 'j', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, linewise: true }},
- { keys: 'k', type: 'motion', motion: 'moveByLines', motionArgs: { forward: false, linewise: true }},
- { keys: 'gj', type: 'motion', motion: 'moveByDisplayLines', motionArgs: { forward: true }},
- { keys: 'gk', type: 'motion', motion: 'moveByDisplayLines', motionArgs: { forward: false }},
- { keys: 'w', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: false }},
- { keys: 'W', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: false, bigWord: true }},
- { keys: 'e', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: true, inclusive: true }},
- { keys: 'E', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: true, bigWord: true, inclusive: true }},
- { keys: 'b', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false }},
- { keys: 'B', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false, bigWord: true }},
- { keys: 'ge', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: true, inclusive: true }},
- { keys: 'gE', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: true, bigWord: true, inclusive: true }},
- { keys: '{', type: 'motion', motion: 'moveByParagraph', motionArgs: { forward: false, toJumplist: true }},
- { keys: '}', type: 'motion', motion: 'moveByParagraph', motionArgs: { forward: true, toJumplist: true }},
- { keys: '', type: 'motion', motion: 'moveByPage', motionArgs: { forward: true }},
- { keys: '', type: 'motion', motion: 'moveByPage', motionArgs: { forward: false }},
- { keys: '', type: 'motion', motion: 'moveByScroll', motionArgs: { forward: true, explicitRepeat: true }},
- { keys: '', type: 'motion', motion: 'moveByScroll', motionArgs: { forward: false, explicitRepeat: true }},
- { keys: 'gg', type: 'motion', motion: 'moveToLineOrEdgeOfDocument', motionArgs: { forward: false, explicitRepeat: true, linewise: true, toJumplist: true }},
- { keys: 'G', type: 'motion', motion: 'moveToLineOrEdgeOfDocument', motionArgs: { forward: true, explicitRepeat: true, linewise: true, toJumplist: true }},
- { keys: '0', type: 'motion', motion: 'moveToStartOfLine' },
- { keys: '^', type: 'motion', motion: 'moveToFirstNonWhiteSpaceCharacter' },
- { keys: '+', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, toFirstChar:true }},
- { keys: '-', type: 'motion', motion: 'moveByLines', motionArgs: { forward: false, toFirstChar:true }},
- { keys: '_', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, toFirstChar:true, repeatOffset:-1 }},
- { keys: '$', type: 'motion', motion: 'moveToEol', motionArgs: { inclusive: true }},
- { keys: '%', type: 'motion', motion: 'moveToMatchedSymbol', motionArgs: { inclusive: true, toJumplist: true }},
- { keys: 'f', type: 'motion', motion: 'moveToCharacter', motionArgs: { forward: true , inclusive: true }},
- { keys: 'F', type: 'motion', motion: 'moveToCharacter', motionArgs: { forward: false }},
- { keys: 't', type: 'motion', motion: 'moveTillCharacter', motionArgs: { forward: true, inclusive: true }},
- { keys: 'T', type: 'motion', motion: 'moveTillCharacter', motionArgs: { forward: false }},
- { keys: ';', type: 'motion', motion: 'repeatLastCharacterSearch', motionArgs: { forward: true }},
- { keys: ',', type: 'motion', motion: 'repeatLastCharacterSearch', motionArgs: { forward: false }},
- { keys: '\'', type: 'motion', motion: 'goToMark', motionArgs: {toJumplist: true, linewise: true}},
- { keys: '`', type: 'motion', motion: 'goToMark', motionArgs: {toJumplist: true}},
- { keys: ']`', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true } },
- { keys: '[`', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false } },
- { keys: ']\'', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true, linewise: true } },
- { keys: '[\'', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false, linewise: true } },
- // the next two aren't motions but must come before more general motion declarations
- { keys: ']p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: true, isEdit: true, matchIndent: true}},
- { keys: '[p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: false, isEdit: true, matchIndent: true}},
- { keys: ']', type: 'motion', motion: 'moveToSymbol', motionArgs: { forward: true, toJumplist: true}},
- { keys: '[', type: 'motion', motion: 'moveToSymbol', motionArgs: { forward: false, toJumplist: true}},
- { keys: '|', type: 'motion', motion: 'moveToColumn'},
- { keys: 'o', type: 'motion', motion: 'moveToOtherHighlightedEnd', context:'visual'},
- { keys: 'O', type: 'motion', motion: 'moveToOtherHighlightedEnd', motionArgs: {sameLine: true}, context:'visual'},
- // Operators
- { keys: 'd', type: 'operator', operator: 'delete' },
- { keys: 'y', type: 'operator', operator: 'yank' },
- { keys: 'c', type: 'operator', operator: 'change' },
- { keys: '>', type: 'operator', operator: 'indent', operatorArgs: { indentRight: true }},
- { keys: '<', type: 'operator', operator: 'indent', operatorArgs: { indentRight: false }},
- { keys: 'g~', type: 'operator', operator: 'changeCase' },
- { keys: 'gu', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: true}, isEdit: true },
- { keys: 'gU', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: false}, isEdit: true },
- { keys: 'n', type: 'motion', motion: 'findNext', motionArgs: { forward: true, toJumplist: true }},
- { keys: 'N', type: 'motion', motion: 'findNext', motionArgs: { forward: false, toJumplist: true }},
- // Operator-Motion dual commands
- { keys: 'x', type: 'operatorMotion', operator: 'delete', motion: 'moveByCharacters', motionArgs: { forward: true }, operatorMotionArgs: { visualLine: false }},
- { keys: 'X', type: 'operatorMotion', operator: 'delete', motion: 'moveByCharacters', motionArgs: { forward: false }, operatorMotionArgs: { visualLine: true }},
- { keys: 'D', type: 'operatorMotion', operator: 'delete', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'},
- { keys: 'D', type: 'operator', operator: 'delete', operatorArgs: { linewise: true }, context: 'visual'},
- { keys: 'Y', type: 'operatorMotion', operator: 'yank', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'},
- { keys: 'Y', type: 'operator', operator: 'yank', operatorArgs: { linewise: true }, context: 'visual'},
- { keys: 'C', type: 'operatorMotion', operator: 'change', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'},
- { keys: 'C', type: 'operator', operator: 'change', operatorArgs: { linewise: true }, context: 'visual'},
- { keys: '~', type: 'operatorMotion', operator: 'changeCase', motion: 'moveByCharacters', motionArgs: { forward: true }, operatorArgs: { shouldMoveCursor: true }, context: 'normal'},
- { keys: '~', type: 'operator', operator: 'changeCase', context: 'visual'},
- { keys: '', type: 'operatorMotion', operator: 'delete', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false }, context: 'insert' },
- // Actions
- { keys: '', type: 'action', action: 'jumpListWalk', actionArgs: { forward: true }},
- { keys: '', type: 'action', action: 'jumpListWalk', actionArgs: { forward: false }},
- { keys: '', type: 'action', action: 'scroll', actionArgs: { forward: true, linewise: true }},
- { keys: '', type: 'action', action: 'scroll', actionArgs: { forward: false, linewise: true }},
- { keys: 'a', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'charAfter' }, context: 'normal' },
- { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'eol' }, context: 'normal' },
- { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'endOfSelectedArea' }, context: 'visual' },
- { keys: 'i', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'inplace' }, context: 'normal' },
- { keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'firstNonBlank'}, context: 'normal' },
- { keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'startOfSelectedArea' }, context: 'visual' },
- { keys: 'o', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: true }, context: 'normal' },
- { keys: 'O', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: false }, context: 'normal' },
- { keys: 'v', type: 'action', action: 'toggleVisualMode' },
- { keys: 'V', type: 'action', action: 'toggleVisualMode', actionArgs: { linewise: true }},
- { keys: '', type: 'action', action: 'toggleVisualMode', actionArgs: { blockwise: true }},
- { keys: '', type: 'action', action: 'toggleVisualMode', actionArgs: { blockwise: true }},
- { keys: 'gv', type: 'action', action: 'reselectLastSelection' },
- { keys: 'J', type: 'action', action: 'joinLines', isEdit: true },
- { keys: 'p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: true, isEdit: true }},
- { keys: 'P', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: false, isEdit: true }},
- { keys: 'r', type: 'action', action: 'replace', isEdit: true },
- { keys: '@', type: 'action', action: 'replayMacro' },
- { keys: 'q', type: 'action', action: 'enterMacroRecordMode' },
- // Handle Replace-mode as a special case of insert mode.
- { keys: 'R', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { replace: true }},
- { keys: 'u', type: 'action', action: 'undo', context: 'normal' },
- { keys: 'u', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: true}, context: 'visual', isEdit: true },
- { keys: 'U', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: false}, context: 'visual', isEdit: true },
- { keys: '', type: 'action', action: 'redo' },
- { keys: 'm', type: 'action', action: 'setMark' },
- { keys: '"', type: 'action', action: 'setRegister' },
- { keys: 'zz', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'center' }},
- { keys: 'z.', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'center' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
- { keys: 'zt', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'top' }},
- { keys: 'z', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'top' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
- { keys: 'z-', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'bottom' }},
- { keys: 'zb', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'bottom' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
- { keys: '.', type: 'action', action: 'repeatLastEdit' },
- { keys: '', type: 'action', action: 'incrementNumberToken', isEdit: true, actionArgs: {increase: true, backtrack: false}},
- { keys: '', type: 'action', action: 'incrementNumberToken', isEdit: true, actionArgs: {increase: false, backtrack: false}},
- // Text object motions
- { keys: 'a', type: 'motion', motion: 'textObjectManipulation' },
- { keys: 'i', type: 'motion', motion: 'textObjectManipulation', motionArgs: { textObjectInner: true }},
- // Search
- { keys: '/', type: 'search', searchArgs: { forward: true, querySrc: 'prompt', toJumplist: true }},
- { keys: '?', type: 'search', searchArgs: { forward: false, querySrc: 'prompt', toJumplist: true }},
- { keys: '*', type: 'search', searchArgs: { forward: true, querySrc: 'wordUnderCursor', wholeWordOnly: true, toJumplist: true }},
- { keys: '#', type: 'search', searchArgs: { forward: false, querySrc: 'wordUnderCursor', wholeWordOnly: true, toJumplist: true }},
- { keys: 'g*', type: 'search', searchArgs: { forward: true, querySrc: 'wordUnderCursor', toJumplist: true }},
- { keys: 'g#', type: 'search', searchArgs: { forward: false, querySrc: 'wordUnderCursor', toJumplist: true }},
- // Ex command
- { keys: ':', type: 'ex' }
- ];
-
- /**
- * Ex commands
- * Care must be taken when adding to the default Ex command map. For any
- * pair of commands that have a shared prefix, at least one of their
- * shortNames must not match the prefix of the other command.
- */
- var defaultExCommandMap = [
- { name: 'colorscheme', shortName: 'colo' },
- { name: 'map' },
- { name: 'imap', shortName: 'im' },
- { name: 'nmap', shortName: 'nm' },
- { name: 'vmap', shortName: 'vm' },
- { name: 'unmap' },
- { name: 'write', shortName: 'w' },
- { name: 'undo', shortName: 'u' },
- { name: 'redo', shortName: 'red' },
- { name: 'set', shortName: 'se' },
- { name: 'set', shortName: 'se' },
- { name: 'setlocal', shortName: 'setl' },
- { name: 'setglobal', shortName: 'setg' },
- { name: 'sort', shortName: 'sor' },
- { name: 'substitute', shortName: 's', possiblyAsync: true },
- { name: 'nohlsearch', shortName: 'noh' },
- { name: 'yank', shortName: 'y' },
- { name: 'delmarks', shortName: 'delm' },
- { name: 'registers', shortName: 'reg', excludeFromCommandHistory: true },
- { name: 'global', shortName: 'g' }
- ];
-
- var Pos = CodeMirror.Pos;
-
- var Vim = function() {
- function enterVimMode(cm) {
- cm.setOption('disableInput', true);
- cm.setOption('showCursorWhenSelecting', false);
- CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
- cm.on('cursorActivity', onCursorActivity);
- maybeInitVimState(cm);
- CodeMirror.on(cm.getInputField(), 'paste', getOnPasteFn(cm));
- }
-
- function leaveVimMode(cm) {
- cm.setOption('disableInput', false);
- cm.off('cursorActivity', onCursorActivity);
- CodeMirror.off(cm.getInputField(), 'paste', getOnPasteFn(cm));
- cm.state.vim = null;
- }
-
- function detachVimMap(cm, next) {
- if (this == CodeMirror.keyMap.vim)
- CodeMirror.rmClass(cm.getWrapperElement(), "cm-fat-cursor");
-
- if (!next || next.attach != attachVimMap)
- leaveVimMode(cm, false);
- }
- function attachVimMap(cm, prev) {
- if (this == CodeMirror.keyMap.vim)
- CodeMirror.addClass(cm.getWrapperElement(), "cm-fat-cursor");
-
- if (!prev || prev.attach != attachVimMap)
- enterVimMode(cm);
- }
-
- // Deprecated, simply setting the keymap works again.
- CodeMirror.defineOption('vimMode', false, function(cm, val, prev) {
- if (val && cm.getOption("keyMap") != "vim")
- cm.setOption("keyMap", "vim");
- else if (!val && prev != CodeMirror.Init && /^vim/.test(cm.getOption("keyMap")))
- cm.setOption("keyMap", "default");
- });
-
- function cmKey(key, cm) {
- if (!cm) { return undefined; }
- if (this[key]) { return this[key]; }
- var vimKey = cmKeyToVimKey(key);
- if (!vimKey) {
- return false;
- }
- var cmd = CodeMirror.Vim.findKey(cm, vimKey);
- if (typeof cmd == 'function') {
- CodeMirror.signal(cm, 'vim-keypress', vimKey);
- }
- return cmd;
- }
-
- var modifiers = {'Shift': 'S', 'Ctrl': 'C', 'Alt': 'A', 'Cmd': 'D', 'Mod': 'A'};
- var specialKeys = {Enter:'CR',Backspace:'BS',Delete:'Del',Insert:'Ins'};
- function cmKeyToVimKey(key) {
- if (key.charAt(0) == '\'') {
- // Keypress character binding of format "'a'"
- return key.charAt(1);
- }
- var pieces = key.split(/-(?!$)/);
- var lastPiece = pieces[pieces.length - 1];
- if (pieces.length == 1 && pieces[0].length == 1) {
- // No-modifier bindings use literal character bindings above. Skip.
- return false;
- } else if (pieces.length == 2 && pieces[0] == 'Shift' && lastPiece.length == 1) {
- // Ignore Shift+char bindings as they should be handled by literal character.
- return false;
- }
- var hasCharacter = false;
- for (var i = 0; i < pieces.length; i++) {
- var piece = pieces[i];
- if (piece in modifiers) { pieces[i] = modifiers[piece]; }
- else { hasCharacter = true; }
- if (piece in specialKeys) { pieces[i] = specialKeys[piece]; }
- }
- if (!hasCharacter) {
- // Vim does not support modifier only keys.
- return false;
- }
- // TODO: Current bindings expect the character to be lower case, but
- // it looks like vim key notation uses upper case.
- if (isUpperCase(lastPiece)) {
- pieces[pieces.length - 1] = lastPiece.toLowerCase();
- }
- return '<' + pieces.join('-') + '>';
- }
-
- function getOnPasteFn(cm) {
- var vim = cm.state.vim;
- if (!vim.onPasteFn) {
- vim.onPasteFn = function() {
- if (!vim.insertMode) {
- cm.setCursor(offsetCursor(cm.getCursor(), 0, 1));
- actions.enterInsertMode(cm, {}, vim);
- }
- };
- }
- return vim.onPasteFn;
- }
-
- var numberRegex = /[\d]/;
- var wordCharTest = [CodeMirror.isWordChar, function(ch) {
- return ch && !CodeMirror.isWordChar(ch) && !/\s/.test(ch);
- }], bigWordCharTest = [function(ch) {
- return /\S/.test(ch);
- }];
- function makeKeyRange(start, size) {
- var keys = [];
- for (var i = start; i < start + size; i++) {
- keys.push(String.fromCharCode(i));
- }
- return keys;
- }
- var upperCaseAlphabet = makeKeyRange(65, 26);
- var lowerCaseAlphabet = makeKeyRange(97, 26);
- var numbers = makeKeyRange(48, 10);
- var validMarks = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['<', '>']);
- var validRegisters = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['-', '"', '.', ':', '/']);
-
- function isLine(cm, line) {
- return line >= cm.firstLine() && line <= cm.lastLine();
- }
- function isLowerCase(k) {
- return (/^[a-z]$/).test(k);
- }
- function isMatchableSymbol(k) {
- return '()[]{}'.indexOf(k) != -1;
- }
- function isNumber(k) {
- return numberRegex.test(k);
- }
- function isUpperCase(k) {
- return (/^[A-Z]$/).test(k);
- }
- function isWhiteSpaceString(k) {
- return (/^\s*$/).test(k);
- }
- function inArray(val, arr) {
- for (var i = 0; i < arr.length; i++) {
- if (arr[i] == val) {
- return true;
- }
- }
- return false;
- }
-
- var options = {};
- function defineOption(name, defaultValue, type, aliases, callback) {
- if (defaultValue === undefined && !callback) {
- throw Error('defaultValue is required unless callback is provided');
- }
- if (!type) { type = 'string'; }
- options[name] = {
- type: type,
- defaultValue: defaultValue,
- callback: callback
- };
- if (aliases) {
- for (var i = 0; i < aliases.length; i++) {
- options[aliases[i]] = options[name];
- }
- }
- if (defaultValue) {
- setOption(name, defaultValue);
- }
- }
-
- function setOption(name, value, cm, cfg) {
- var option = options[name];
- cfg = cfg || {};
- var scope = cfg.scope;
- if (!option) {
- throw Error('Unknown option: ' + name);
- }
- if (option.type == 'boolean') {
- if (value && value !== true) {
- throw Error('Invalid argument: ' + name + '=' + value);
- } else if (value !== false) {
- // Boolean options are set to true if value is not defined.
- value = true;
- }
- }
- if (option.callback) {
- if (scope !== 'local') {
- option.callback(value, undefined);
- }
- if (scope !== 'global' && cm) {
- option.callback(value, cm);
- }
- } else {
- if (scope !== 'local') {
- option.value = option.type == 'boolean' ? !!value : value;
- }
- if (scope !== 'global' && cm) {
- cm.state.vim.options[name] = {value: value};
- }
- }
- }
-
- function getOption(name, cm, cfg) {
- var option = options[name];
- cfg = cfg || {};
- var scope = cfg.scope;
- if (!option) {
- throw Error('Unknown option: ' + name);
- }
- if (option.callback) {
- var local = cm && option.callback(undefined, cm);
- if (scope !== 'global' && local !== undefined) {
- return local;
- }
- if (scope !== 'local') {
- return option.callback();
- }
- return;
- } else {
- var local = (scope !== 'global') && (cm && cm.state.vim.options[name]);
- return (local || (scope !== 'local') && option || {}).value;
- }
- }
-
- defineOption('filetype', undefined, 'string', ['ft'], function(name, cm) {
- // Option is local. Do nothing for global.
- if (cm === undefined) {
- return;
- }
- // The 'filetype' option proxies to the CodeMirror 'mode' option.
- if (name === undefined) {
- var mode = cm.getOption('mode');
- return mode == 'null' ? '' : mode;
- } else {
- var mode = name == '' ? 'null' : name;
- cm.setOption('mode', mode);
- }
- });
-
- var createCircularJumpList = function() {
- var size = 100;
- var pointer = -1;
- var head = 0;
- var tail = 0;
- var buffer = new Array(size);
- function add(cm, oldCur, newCur) {
- var current = pointer % size;
- var curMark = buffer[current];
- function useNextSlot(cursor) {
- var next = ++pointer % size;
- var trashMark = buffer[next];
- if (trashMark) {
- trashMark.clear();
- }
- buffer[next] = cm.setBookmark(cursor);
- }
- if (curMark) {
- var markPos = curMark.find();
- // avoid recording redundant cursor position
- if (markPos && !cursorEqual(markPos, oldCur)) {
- useNextSlot(oldCur);
- }
- } else {
- useNextSlot(oldCur);
- }
- useNextSlot(newCur);
- head = pointer;
- tail = pointer - size + 1;
- if (tail < 0) {
- tail = 0;
- }
- }
- function move(cm, offset) {
- pointer += offset;
- if (pointer > head) {
- pointer = head;
- } else if (pointer < tail) {
- pointer = tail;
- }
- var mark = buffer[(size + pointer) % size];
- // skip marks that are temporarily removed from text buffer
- if (mark && !mark.find()) {
- var inc = offset > 0 ? 1 : -1;
- var newCur;
- var oldCur = cm.getCursor();
- do {
- pointer += inc;
- mark = buffer[(size + pointer) % size];
- // skip marks that are the same as current position
- if (mark &&
- (newCur = mark.find()) &&
- !cursorEqual(oldCur, newCur)) {
- break;
- }
- } while (pointer < head && pointer > tail);
- }
- return mark;
- }
- return {
- cachedCursor: undefined, //used for # and * jumps
- add: add,
- move: move
- };
- };
-
- // Returns an object to track the changes associated insert mode. It
- // clones the object that is passed in, or creates an empty object one if
- // none is provided.
- var createInsertModeChanges = function(c) {
- if (c) {
- // Copy construction
- return {
- changes: c.changes,
- expectCursorActivityForChange: c.expectCursorActivityForChange
- };
- }
- return {
- // Change list
- changes: [],
- // Set to true on change, false on cursorActivity.
- expectCursorActivityForChange: false
- };
- };
-
- function MacroModeState() {
- this.latestRegister = undefined;
- this.isPlaying = false;
- this.isRecording = false;
- this.replaySearchQueries = [];
- this.onRecordingDone = undefined;
- this.lastInsertModeChanges = createInsertModeChanges();
- }
- MacroModeState.prototype = {
- exitMacroRecordMode: function() {
- var macroModeState = vimGlobalState.macroModeState;
- if (macroModeState.onRecordingDone) {
- macroModeState.onRecordingDone(); // close dialog
- }
- macroModeState.onRecordingDone = undefined;
- macroModeState.isRecording = false;
- },
- enterMacroRecordMode: function(cm, registerName) {
- var register =
- vimGlobalState.registerController.getRegister(registerName);
- if (register) {
- register.clear();
- this.latestRegister = registerName;
- if (cm.openDialog) {
- this.onRecordingDone = cm.openDialog(
- '(recording)['+registerName+']', null, {bottom:true});
- }
- this.isRecording = true;
- }
- }
- };
-
- function maybeInitVimState(cm) {
- if (!cm.state.vim) {
- // Store instance state in the CodeMirror object.
- cm.state.vim = {
- inputState: new InputState(),
- // Vim's input state that triggered the last edit, used to repeat
- // motions and operators with '.'.
- lastEditInputState: undefined,
- // Vim's action command before the last edit, used to repeat actions
- // with '.' and insert mode repeat.
- lastEditActionCommand: undefined,
- // When using jk for navigation, if you move from a longer line to a
- // shorter line, the cursor may clip to the end of the shorter line.
- // If j is pressed again and cursor goes to the next line, the
- // cursor should go back to its horizontal position on the longer
- // line if it can. This is to keep track of the horizontal position.
- lastHPos: -1,
- // Doing the same with screen-position for gj/gk
- lastHSPos: -1,
- // The last motion command run. Cleared if a non-motion command gets
- // executed in between.
- lastMotion: null,
- marks: {},
- // Mark for rendering fake cursor for visual mode.
- fakeCursor: null,
- insertMode: false,
- // Repeat count for changes made in insert mode, triggered by key
- // sequences like 3,i. Only exists when insertMode is true.
- insertModeRepeat: undefined,
- visualMode: false,
- // If we are in visual line mode. No effect if visualMode is false.
- visualLine: false,
- visualBlock: false,
- lastSelection: null,
- lastPastedText: null,
- sel: {},
- // Buffer-local/window-local values of vim options.
- options: {}
- };
- }
- return cm.state.vim;
- }
- var vimGlobalState;
- function resetVimGlobalState() {
- vimGlobalState = {
- // The current search query.
- searchQuery: null,
- // Whether we are searching backwards.
- searchIsReversed: false,
- // Replace part of the last substituted pattern
- lastSubstituteReplacePart: undefined,
- jumpList: createCircularJumpList(),
- macroModeState: new MacroModeState,
- // Recording latest f, t, F or T motion command.
- lastCharacterSearch: {increment:0, forward:true, selectedCharacter:''},
- registerController: new RegisterController({}),
- // search history buffer
- searchHistoryController: new HistoryController({}),
- // ex Command history buffer
- exCommandHistoryController : new HistoryController({})
- };
- for (var optionName in options) {
- var option = options[optionName];
- option.value = option.defaultValue;
- }
- }
-
- var lastInsertModeKeyTimer;
- var vimApi= {
- buildKeyMap: function() {
- // TODO: Convert keymap into dictionary format for fast lookup.
- },
- // Testing hook, though it might be useful to expose the register
- // controller anyways.
- getRegisterController: function() {
- return vimGlobalState.registerController;
- },
- // Testing hook.
- resetVimGlobalState_: resetVimGlobalState,
-
- // Testing hook.
- getVimGlobalState_: function() {
- return vimGlobalState;
- },
-
- // Testing hook.
- maybeInitVimState_: maybeInitVimState,
-
- suppressErrorLogging: false,
-
- InsertModeKey: InsertModeKey,
- map: function(lhs, rhs, ctx) {
- // Add user defined key bindings.
- exCommandDispatcher.map(lhs, rhs, ctx);
- },
- unmap: function(lhs, ctx) {
- exCommandDispatcher.unmap(lhs, ctx);
- },
- // TODO: Expose setOption and getOption as instance methods. Need to decide how to namespace
- // them, or somehow make them work with the existing CodeMirror setOption/getOption API.
- setOption: setOption,
- getOption: getOption,
- defineOption: defineOption,
- defineEx: function(name, prefix, func){
- if (!prefix) {
- prefix = name;
- } else if (name.indexOf(prefix) !== 0) {
- throw new Error('(Vim.defineEx) "'+prefix+'" is not a prefix of "'+name+'", command not registered');
- }
- exCommands[name]=func;
- exCommandDispatcher.commandMap_[prefix]={name:name, shortName:prefix, type:'api'};
- },
- handleKey: function (cm, key, origin) {
- var command = this.findKey(cm, key, origin);
- if (typeof command === 'function') {
- return command();
- }
- },
- /**
- * This is the outermost function called by CodeMirror, after keys have
- * been mapped to their Vim equivalents.
- *
- * Finds a command based on the key (and cached keys if there is a
- * multi-key sequence). Returns `undefined` if no key is matched, a noop
- * function if a partial match is found (multi-key), and a function to
- * execute the bound command if a a key is matched. The function always
- * returns true.
- */
- findKey: function(cm, key, origin) {
- var vim = maybeInitVimState(cm);
- function handleMacroRecording() {
- var macroModeState = vimGlobalState.macroModeState;
- if (macroModeState.isRecording) {
- if (key == 'q') {
- macroModeState.exitMacroRecordMode();
- clearInputState(cm);
- return true;
- }
- if (origin != 'mapping') {
- logKey(macroModeState, key);
- }
- }
- }
- function handleEsc() {
- if (key == '') {
- // Clear input state and get back to normal mode.
- clearInputState(cm);
- if (vim.visualMode) {
- exitVisualMode(cm);
- } else if (vim.insertMode) {
- exitInsertMode(cm);
- }
- return true;
- }
- }
- function doKeyToKey(keys) {
- // TODO: prevent infinite recursion.
- var match;
- while (keys) {
- // Pull off one command key, which is either a single character
- // or a special sequence wrapped in '<' and '>', e.g. ''.
- match = (/<\w+-.+?>|<\w+>|./).exec(keys);
- key = match[0];
- keys = keys.substring(match.index + key.length);
- CodeMirror.Vim.handleKey(cm, key, 'mapping');
- }
- }
-
- function handleKeyInsertMode() {
- if (handleEsc()) { return true; }
- var keys = vim.inputState.keyBuffer = vim.inputState.keyBuffer + key;
- var keysAreChars = key.length == 1;
- var match = commandDispatcher.matchCommand(keys, defaultKeymap, vim.inputState, 'insert');
- // Need to check all key substrings in insert mode.
- while (keys.length > 1 && match.type != 'full') {
- var keys = vim.inputState.keyBuffer = keys.slice(1);
- var thisMatch = commandDispatcher.matchCommand(keys, defaultKeymap, vim.inputState, 'insert');
- if (thisMatch.type != 'none') { match = thisMatch; }
- }
- if (match.type == 'none') { clearInputState(cm); return false; }
- else if (match.type == 'partial') {
- if (lastInsertModeKeyTimer) { window.clearTimeout(lastInsertModeKeyTimer); }
- lastInsertModeKeyTimer = window.setTimeout(
- function() { if (vim.insertMode && vim.inputState.keyBuffer) { clearInputState(cm); } },
- getOption('insertModeEscKeysTimeout'));
- return !keysAreChars;
- }
-
- if (lastInsertModeKeyTimer) { window.clearTimeout(lastInsertModeKeyTimer); }
- if (keysAreChars) {
- var selections = cm.listSelections();
- for (var i = 0; i < selections.length; i++) {
- var here = selections[i].head;
- cm.replaceRange('', offsetCursor(here, 0, -(keys.length - 1)), here, '+input');
- }
- vimGlobalState.macroModeState.lastInsertModeChanges.changes.pop();
- }
- clearInputState(cm);
- return match.command;
- }
-
- function handleKeyNonInsertMode() {
- if (handleMacroRecording() || handleEsc()) { return true; };
-
- var keys = vim.inputState.keyBuffer = vim.inputState.keyBuffer + key;
- if (/^[1-9]\d*$/.test(keys)) { return true; }
-
- var keysMatcher = /^(\d*)(.*)$/.exec(keys);
- if (!keysMatcher) { clearInputState(cm); return false; }
- var context = vim.visualMode ? 'visual' :
- 'normal';
- var match = commandDispatcher.matchCommand(keysMatcher[2] || keysMatcher[1], defaultKeymap, vim.inputState, context);
- if (match.type == 'none') { clearInputState(cm); return false; }
- else if (match.type == 'partial') { return true; }
-
- vim.inputState.keyBuffer = '';
- var keysMatcher = /^(\d*)(.*)$/.exec(keys);
- if (keysMatcher[1] && keysMatcher[1] != '0') {
- vim.inputState.pushRepeatDigit(keysMatcher[1]);
- }
- return match.command;
- }
-
- var command;
- if (vim.insertMode) { command = handleKeyInsertMode(); }
- else { command = handleKeyNonInsertMode(); }
- if (command === false) {
- return undefined;
- } else if (command === true) {
- // TODO: Look into using CodeMirror's multi-key handling.
- // Return no-op since we are caching the key. Counts as handled, but
- // don't want act on it just yet.
- return function() { return true; };
- } else {
- return function() {
- return cm.operation(function() {
- cm.curOp.isVimOp = true;
- try {
- if (command.type == 'keyToKey') {
- doKeyToKey(command.toKeys);
- } else {
- commandDispatcher.processCommand(cm, vim, command);
- }
- } catch (e) {
- // clear VIM state in case it's in a bad state.
- cm.state.vim = undefined;
- maybeInitVimState(cm);
- if (!CodeMirror.Vim.suppressErrorLogging) {
- console['log'](e);
- }
- throw e;
- }
- return true;
- });
- };
- }
- },
- handleEx: function(cm, input) {
- exCommandDispatcher.processCommand(cm, input);
- },
-
- defineMotion: defineMotion,
- defineAction: defineAction,
- defineOperator: defineOperator,
- mapCommand: mapCommand,
- _mapCommand: _mapCommand,
-
- defineRegister: defineRegister,
-
- exitVisualMode: exitVisualMode,
- exitInsertMode: exitInsertMode
- };
-
- // Represents the current input state.
- function InputState() {
- this.prefixRepeat = [];
- this.motionRepeat = [];
-
- this.operator = null;
- this.operatorArgs = null;
- this.motion = null;
- this.motionArgs = null;
- this.keyBuffer = []; // For matching multi-key commands.
- this.registerName = null; // Defaults to the unnamed register.
- }
- InputState.prototype.pushRepeatDigit = function(n) {
- if (!this.operator) {
- this.prefixRepeat = this.prefixRepeat.concat(n);
- } else {
- this.motionRepeat = this.motionRepeat.concat(n);
- }
- };
- InputState.prototype.getRepeat = function() {
- var repeat = 0;
- if (this.prefixRepeat.length > 0 || this.motionRepeat.length > 0) {
- repeat = 1;
- if (this.prefixRepeat.length > 0) {
- repeat *= parseInt(this.prefixRepeat.join(''), 10);
- }
- if (this.motionRepeat.length > 0) {
- repeat *= parseInt(this.motionRepeat.join(''), 10);
- }
- }
- return repeat;
- };
-
- function clearInputState(cm, reason) {
- cm.state.vim.inputState = new InputState();
- CodeMirror.signal(cm, 'vim-command-done', reason);
- }
-
- /*
- * Register stores information about copy and paste registers. Besides
- * text, a register must store whether it is linewise (i.e., when it is
- * pasted, should it insert itself into a new line, or should the text be
- * inserted at the cursor position.)
- */
- function Register(text, linewise, blockwise) {
- this.clear();
- this.keyBuffer = [text || ''];
- this.insertModeChanges = [];
- this.searchQueries = [];
- this.linewise = !!linewise;
- this.blockwise = !!blockwise;
- }
- Register.prototype = {
- setText: function(text, linewise, blockwise) {
- this.keyBuffer = [text || ''];
- this.linewise = !!linewise;
- this.blockwise = !!blockwise;
- },
- pushText: function(text, linewise) {
- // if this register has ever been set to linewise, use linewise.
- if (linewise) {
- if (!this.linewise) {
- this.keyBuffer.push('\n');
- }
- this.linewise = true;
- }
- this.keyBuffer.push(text);
- },
- pushInsertModeChanges: function(changes) {
- this.insertModeChanges.push(createInsertModeChanges(changes));
- },
- pushSearchQuery: function(query) {
- this.searchQueries.push(query);
- },
- clear: function() {
- this.keyBuffer = [];
- this.insertModeChanges = [];
- this.searchQueries = [];
- this.linewise = false;
- },
- toString: function() {
- return this.keyBuffer.join('');
- }
- };
-
- /**
- * Defines an external register.
- *
- * The name should be a single character that will be used to reference the register.
- * The register should support setText, pushText, clear, and toString(). See Register
- * for a reference implementation.
- */
- function defineRegister(name, register) {
- var registers = vimGlobalState.registerController.registers[name];
- if (!name || name.length != 1) {
- throw Error('Register name must be 1 character');
- }
- if (registers[name]) {
- throw Error('Register already defined ' + name);
- }
- registers[name] = register;
- validRegisters.push(name);
- }
-
- /*
- * vim registers allow you to keep many independent copy and paste buffers.
- * See http://usevim.com/2012/04/13/registers/ for an introduction.
- *
- * RegisterController keeps the state of all the registers. An initial
- * state may be passed in. The unnamed register '"' will always be
- * overridden.
- */
- function RegisterController(registers) {
- this.registers = registers;
- this.unnamedRegister = registers['"'] = new Register();
- registers['.'] = new Register();
- registers[':'] = new Register();
- registers['/'] = new Register();
- }
- RegisterController.prototype = {
- pushText: function(registerName, operator, text, linewise, blockwise) {
- if (linewise && text.charAt(0) == '\n') {
- text = text.slice(1) + '\n';
- }
- if (linewise && text.charAt(text.length - 1) !== '\n'){
- text += '\n';
- }
- // Lowercase and uppercase registers refer to the same register.
- // Uppercase just means append.
- var register = this.isValidRegister(registerName) ?
- this.getRegister(registerName) : null;
- // if no register/an invalid register was specified, things go to the
- // default registers
- if (!register) {
- switch (operator) {
- case 'yank':
- // The 0 register contains the text from the most recent yank.
- this.registers['0'] = new Register(text, linewise, blockwise);
- break;
- case 'delete':
- case 'change':
- if (text.indexOf('\n') == -1) {
- // Delete less than 1 line. Update the small delete register.
- this.registers['-'] = new Register(text, linewise);
- } else {
- // Shift down the contents of the numbered registers and put the
- // deleted text into register 1.
- this.shiftNumericRegisters_();
- this.registers['1'] = new Register(text, linewise);
- }
- break;
- }
- // Make sure the unnamed register is set to what just happened
- this.unnamedRegister.setText(text, linewise, blockwise);
- return;
- }
-
- // If we've gotten to this point, we've actually specified a register
- var append = isUpperCase(registerName);
- if (append) {
- register.pushText(text, linewise);
- } else {
- register.setText(text, linewise, blockwise);
- }
- // The unnamed register always has the same value as the last used
- // register.
- this.unnamedRegister.setText(register.toString(), linewise);
- },
- // Gets the register named @name. If one of @name doesn't already exist,
- // create it. If @name is invalid, return the unnamedRegister.
- getRegister: function(name) {
- if (!this.isValidRegister(name)) {
- return this.unnamedRegister;
- }
- name = name.toLowerCase();
- if (!this.registers[name]) {
- this.registers[name] = new Register();
- }
- return this.registers[name];
- },
- isValidRegister: function(name) {
- return name && inArray(name, validRegisters);
- },
- shiftNumericRegisters_: function() {
- for (var i = 9; i >= 2; i--) {
- this.registers[i] = this.getRegister('' + (i - 1));
- }
- }
- };
- function HistoryController() {
- this.historyBuffer = [];
- this.iterator = 0;
- this.initialPrefix = null;
- }
- HistoryController.prototype = {
- // the input argument here acts a user entered prefix for a small time
- // until we start autocompletion in which case it is the autocompleted.
- nextMatch: function (input, up) {
- var historyBuffer = this.historyBuffer;
- var dir = up ? -1 : 1;
- if (this.initialPrefix === null) this.initialPrefix = input;
- for (var i = this.iterator + dir; up ? i >= 0 : i < historyBuffer.length; i+= dir) {
- var element = historyBuffer[i];
- for (var j = 0; j <= element.length; j++) {
- if (this.initialPrefix == element.substring(0, j)) {
- this.iterator = i;
- return element;
- }
- }
- }
- // should return the user input in case we reach the end of buffer.
- if (i >= historyBuffer.length) {
- this.iterator = historyBuffer.length;
- return this.initialPrefix;
- }
- // return the last autocompleted query or exCommand as it is.
- if (i < 0 ) return input;
- },
- pushInput: function(input) {
- var index = this.historyBuffer.indexOf(input);
- if (index > -1) this.historyBuffer.splice(index, 1);
- if (input.length) this.historyBuffer.push(input);
- },
- reset: function() {
- this.initialPrefix = null;
- this.iterator = this.historyBuffer.length;
- }
- };
- var commandDispatcher = {
- matchCommand: function(keys, keyMap, inputState, context) {
- var matches = commandMatches(keys, keyMap, context, inputState);
- if (!matches.full && !matches.partial) {
- return {type: 'none'};
- } else if (!matches.full && matches.partial) {
- return {type: 'partial'};
- }
-
- var bestMatch;
- for (var i = 0; i < matches.full.length; i++) {
- var match = matches.full[i];
- if (!bestMatch) {
- bestMatch = match;
- }
- }
- if (bestMatch.keys.slice(-11) == '') {
- inputState.selectedCharacter = lastChar(keys);
- }
- return {type: 'full', command: bestMatch};
- },
- processCommand: function(cm, vim, command) {
- vim.inputState.repeatOverride = command.repeatOverride;
- switch (command.type) {
- case 'motion':
- this.processMotion(cm, vim, command);
- break;
- case 'operator':
- this.processOperator(cm, vim, command);
- break;
- case 'operatorMotion':
- this.processOperatorMotion(cm, vim, command);
- break;
- case 'action':
- this.processAction(cm, vim, command);
- break;
- case 'search':
- this.processSearch(cm, vim, command);
- break;
- case 'ex':
- case 'keyToEx':
- this.processEx(cm, vim, command);
- break;
- default:
- break;
- }
- },
- processMotion: function(cm, vim, command) {
- vim.inputState.motion = command.motion;
- vim.inputState.motionArgs = copyArgs(command.motionArgs);
- this.evalInput(cm, vim);
- },
- processOperator: function(cm, vim, command) {
- var inputState = vim.inputState;
- if (inputState.operator) {
- if (inputState.operator == command.operator) {
- // Typing an operator twice like 'dd' makes the operator operate
- // linewise
- inputState.motion = 'expandToLine';
- inputState.motionArgs = { linewise: true };
- this.evalInput(cm, vim);
- return;
- } else {
- // 2 different operators in a row doesn't make sense.
- clearInputState(cm);
- }
- }
- inputState.operator = command.operator;
- inputState.operatorArgs = copyArgs(command.operatorArgs);
- if (vim.visualMode) {
- // Operating on a selection in visual mode. We don't need a motion.
- this.evalInput(cm, vim);
- }
- },
- processOperatorMotion: function(cm, vim, command) {
- var visualMode = vim.visualMode;
- var operatorMotionArgs = copyArgs(command.operatorMotionArgs);
- if (operatorMotionArgs) {
- // Operator motions may have special behavior in visual mode.
- if (visualMode && operatorMotionArgs.visualLine) {
- vim.visualLine = true;
- }
- }
- this.processOperator(cm, vim, command);
- if (!visualMode) {
- this.processMotion(cm, vim, command);
- }
- },
- processAction: function(cm, vim, command) {
- var inputState = vim.inputState;
- var repeat = inputState.getRepeat();
- var repeatIsExplicit = !!repeat;
- var actionArgs = copyArgs(command.actionArgs) || {};
- if (inputState.selectedCharacter) {
- actionArgs.selectedCharacter = inputState.selectedCharacter;
- }
- // Actions may or may not have motions and operators. Do these first.
- if (command.operator) {
- this.processOperator(cm, vim, command);
- }
- if (command.motion) {
- this.processMotion(cm, vim, command);
- }
- if (command.motion || command.operator) {
- this.evalInput(cm, vim);
- }
- actionArgs.repeat = repeat || 1;
- actionArgs.repeatIsExplicit = repeatIsExplicit;
- actionArgs.registerName = inputState.registerName;
- clearInputState(cm);
- vim.lastMotion = null;
- if (command.isEdit) {
- this.recordLastEdit(vim, inputState, command);
- }
- actions[command.action](cm, actionArgs, vim);
- },
- processSearch: function(cm, vim, command) {
- if (!cm.getSearchCursor) {
- // Search depends on SearchCursor.
- return;
- }
- var forward = command.searchArgs.forward;
- var wholeWordOnly = command.searchArgs.wholeWordOnly;
- getSearchState(cm).setReversed(!forward);
- var promptPrefix = (forward) ? '/' : '?';
- var originalQuery = getSearchState(cm).getQuery();
- var originalScrollPos = cm.getScrollInfo();
- function handleQuery(query, ignoreCase, smartCase) {
- vimGlobalState.searchHistoryController.pushInput(query);
- vimGlobalState.searchHistoryController.reset();
- try {
- updateSearchQuery(cm, query, ignoreCase, smartCase);
- } catch (e) {
- showConfirm(cm, 'Invalid regex: ' + query);
- clearInputState(cm);
- return;
- }
- commandDispatcher.processMotion(cm, vim, {
- type: 'motion',
- motion: 'findNext',
- motionArgs: { forward: true, toJumplist: command.searchArgs.toJumplist }
- });
- }
- function onPromptClose(query) {
- cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
- handleQuery(query, true /** ignoreCase */, true /** smartCase */);
- var macroModeState = vimGlobalState.macroModeState;
- if (macroModeState.isRecording) {
- logSearchQuery(macroModeState, query);
- }
- }
- function onPromptKeyUp(e, query, close) {
- var keyName = CodeMirror.keyName(e), up;
- if (keyName == 'Up' || keyName == 'Down') {
- up = keyName == 'Up' ? true : false;
- query = vimGlobalState.searchHistoryController.nextMatch(query, up) || '';
- close(query);
- } else {
- if ( keyName != 'Left' && keyName != 'Right' && keyName != 'Ctrl' && keyName != 'Alt' && keyName != 'Shift')
- vimGlobalState.searchHistoryController.reset();
- }
- var parsedQuery;
- try {
- parsedQuery = updateSearchQuery(cm, query,
- true /** ignoreCase */, true /** smartCase */);
- } catch (e) {
- // Swallow bad regexes for incremental search.
- }
- if (parsedQuery) {
- cm.scrollIntoView(findNext(cm, !forward, parsedQuery), 30);
- } else {
- clearSearchHighlight(cm);
- cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
- }
- }
- function onPromptKeyDown(e, query, close) {
- var keyName = CodeMirror.keyName(e);
- if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[' ||
- (keyName == 'Backspace' && query == '')) {
- vimGlobalState.searchHistoryController.pushInput(query);
- vimGlobalState.searchHistoryController.reset();
- updateSearchQuery(cm, originalQuery);
- clearSearchHighlight(cm);
- cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
- CodeMirror.e_stop(e);
- clearInputState(cm);
- close();
- cm.focus();
- } else if (keyName == 'Ctrl-U') {
- // Ctrl-U clears input.
- CodeMirror.e_stop(e);
- close('');
- }
- }
- switch (command.searchArgs.querySrc) {
- case 'prompt':
- var macroModeState = vimGlobalState.macroModeState;
- if (macroModeState.isPlaying) {
- var query = macroModeState.replaySearchQueries.shift();
- handleQuery(query, true /** ignoreCase */, false /** smartCase */);
- } else {
- showPrompt(cm, {
- onClose: onPromptClose,
- prefix: promptPrefix,
- desc: searchPromptDesc,
- onKeyUp: onPromptKeyUp,
- onKeyDown: onPromptKeyDown
- });
- }
- break;
- case 'wordUnderCursor':
- var word = expandWordUnderCursor(cm, false /** inclusive */,
- true /** forward */, false /** bigWord */,
- true /** noSymbol */);
- var isKeyword = true;
- if (!word) {
- word = expandWordUnderCursor(cm, false /** inclusive */,
- true /** forward */, false /** bigWord */,
- false /** noSymbol */);
- isKeyword = false;
- }
- if (!word) {
- return;
- }
- var query = cm.getLine(word.start.line).substring(word.start.ch,
- word.end.ch);
- if (isKeyword && wholeWordOnly) {
- query = '\\b' + query + '\\b';
- } else {
- query = escapeRegex(query);
- }
-
- // cachedCursor is used to save the old position of the cursor
- // when * or # causes vim to seek for the nearest word and shift
- // the cursor before entering the motion.
- vimGlobalState.jumpList.cachedCursor = cm.getCursor();
- cm.setCursor(word.start);
-
- handleQuery(query, true /** ignoreCase */, false /** smartCase */);
- break;
- }
- },
- processEx: function(cm, vim, command) {
- function onPromptClose(input) {
- // Give the prompt some time to close so that if processCommand shows
- // an error, the elements don't overlap.
- vimGlobalState.exCommandHistoryController.pushInput(input);
- vimGlobalState.exCommandHistoryController.reset();
- exCommandDispatcher.processCommand(cm, input);
- }
- function onPromptKeyDown(e, input, close) {
- var keyName = CodeMirror.keyName(e), up;
- if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[' ||
- (keyName == 'Backspace' && input == '')) {
- vimGlobalState.exCommandHistoryController.pushInput(input);
- vimGlobalState.exCommandHistoryController.reset();
- CodeMirror.e_stop(e);
- clearInputState(cm);
- close();
- cm.focus();
- }
- if (keyName == 'Up' || keyName == 'Down') {
- up = keyName == 'Up' ? true : false;
- input = vimGlobalState.exCommandHistoryController.nextMatch(input, up) || '';
- close(input);
- } else if (keyName == 'Ctrl-U') {
- // Ctrl-U clears input.
- CodeMirror.e_stop(e);
- close('');
- } else {
- if ( keyName != 'Left' && keyName != 'Right' && keyName != 'Ctrl' && keyName != 'Alt' && keyName != 'Shift')
- vimGlobalState.exCommandHistoryController.reset();
- }
- }
- if (command.type == 'keyToEx') {
- // Handle user defined Ex to Ex mappings
- exCommandDispatcher.processCommand(cm, command.exArgs.input);
- } else {
- if (vim.visualMode) {
- showPrompt(cm, { onClose: onPromptClose, prefix: ':', value: '\'<,\'>',
- onKeyDown: onPromptKeyDown});
- } else {
- showPrompt(cm, { onClose: onPromptClose, prefix: ':',
- onKeyDown: onPromptKeyDown});
- }
- }
- },
- evalInput: function(cm, vim) {
- // If the motion command is set, execute both the operator and motion.
- // Otherwise return.
- var inputState = vim.inputState;
- var motion = inputState.motion;
- var motionArgs = inputState.motionArgs || {};
- var operator = inputState.operator;
- var operatorArgs = inputState.operatorArgs || {};
- var registerName = inputState.registerName;
- var sel = vim.sel;
- // TODO: Make sure cm and vim selections are identical outside visual mode.
- var origHead = copyCursor(vim.visualMode ? clipCursorToContent(cm, sel.head): cm.getCursor('head'));
- var origAnchor = copyCursor(vim.visualMode ? clipCursorToContent(cm, sel.anchor) : cm.getCursor('anchor'));
- var oldHead = copyCursor(origHead);
- var oldAnchor = copyCursor(origAnchor);
- var newHead, newAnchor;
- var repeat;
- if (operator) {
- this.recordLastEdit(vim, inputState);
- }
- if (inputState.repeatOverride !== undefined) {
- // If repeatOverride is specified, that takes precedence over the
- // input state's repeat. Used by Ex mode and can be user defined.
- repeat = inputState.repeatOverride;
- } else {
- repeat = inputState.getRepeat();
- }
- if (repeat > 0 && motionArgs.explicitRepeat) {
- motionArgs.repeatIsExplicit = true;
- } else if (motionArgs.noRepeat ||
- (!motionArgs.explicitRepeat && repeat === 0)) {
- repeat = 1;
- motionArgs.repeatIsExplicit = false;
- }
- if (inputState.selectedCharacter) {
- // If there is a character input, stick it in all of the arg arrays.
- motionArgs.selectedCharacter = operatorArgs.selectedCharacter =
- inputState.selectedCharacter;
- }
- motionArgs.repeat = repeat;
- clearInputState(cm);
- if (motion) {
- var motionResult = motions[motion](cm, origHead, motionArgs, vim);
- vim.lastMotion = motions[motion];
- if (!motionResult) {
- return;
- }
- if (motionArgs.toJumplist) {
- var jumpList = vimGlobalState.jumpList;
- // if the current motion is # or *, use cachedCursor
- var cachedCursor = jumpList.cachedCursor;
- if (cachedCursor) {
- recordJumpPosition(cm, cachedCursor, motionResult);
- delete jumpList.cachedCursor;
- } else {
- recordJumpPosition(cm, origHead, motionResult);
- }
- }
- if (motionResult instanceof Array) {
- newAnchor = motionResult[0];
- newHead = motionResult[1];
- } else {
- newHead = motionResult;
- }
- // TODO: Handle null returns from motion commands better.
- if (!newHead) {
- newHead = copyCursor(origHead);
- }
- if (vim.visualMode) {
- if (!(vim.visualBlock && newHead.ch === Infinity)) {
- newHead = clipCursorToContent(cm, newHead, vim.visualBlock);
- }
- if (newAnchor) {
- newAnchor = clipCursorToContent(cm, newAnchor, true);
- }
- newAnchor = newAnchor || oldAnchor;
- sel.anchor = newAnchor;
- sel.head = newHead;
- updateCmSelection(cm);
- updateMark(cm, vim, '<',
- cursorIsBefore(newAnchor, newHead) ? newAnchor
- : newHead);
- updateMark(cm, vim, '>',
- cursorIsBefore(newAnchor, newHead) ? newHead
- : newAnchor);
- } else if (!operator) {
- newHead = clipCursorToContent(cm, newHead);
- cm.setCursor(newHead.line, newHead.ch);
- }
- }
- if (operator) {
- if (operatorArgs.lastSel) {
- // Replaying a visual mode operation
- newAnchor = oldAnchor;
- var lastSel = operatorArgs.lastSel;
- var lineOffset = Math.abs(lastSel.head.line - lastSel.anchor.line);
- var chOffset = Math.abs(lastSel.head.ch - lastSel.anchor.ch);
- if (lastSel.visualLine) {
- // Linewise Visual mode: The same number of lines.
- newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch);
- } else if (lastSel.visualBlock) {
- // Blockwise Visual mode: The same number of lines and columns.
- newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch + chOffset);
- } else if (lastSel.head.line == lastSel.anchor.line) {
- // Normal Visual mode within one line: The same number of characters.
- newHead = Pos(oldAnchor.line, oldAnchor.ch + chOffset);
- } else {
- // Normal Visual mode with several lines: The same number of lines, in the
- // last line the same number of characters as in the last line the last time.
- newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch);
- }
- vim.visualMode = true;
- vim.visualLine = lastSel.visualLine;
- vim.visualBlock = lastSel.visualBlock;
- sel = vim.sel = {
- anchor: newAnchor,
- head: newHead
- };
- updateCmSelection(cm);
- } else if (vim.visualMode) {
- operatorArgs.lastSel = {
- anchor: copyCursor(sel.anchor),
- head: copyCursor(sel.head),
- visualBlock: vim.visualBlock,
- visualLine: vim.visualLine
- };
- }
- var curStart, curEnd, linewise, mode;
- var cmSel;
- if (vim.visualMode) {
- // Init visual op
- curStart = cursorMin(sel.head, sel.anchor);
- curEnd = cursorMax(sel.head, sel.anchor);
- linewise = vim.visualLine || operatorArgs.linewise;
- mode = vim.visualBlock ? 'block' :
- linewise ? 'line' :
- 'char';
- cmSel = makeCmSelection(cm, {
- anchor: curStart,
- head: curEnd
- }, mode);
- if (linewise) {
- var ranges = cmSel.ranges;
- if (mode == 'block') {
- // Linewise operators in visual block mode extend to end of line
- for (var i = 0; i < ranges.length; i++) {
- ranges[i].head.ch = lineLength(cm, ranges[i].head.line);
- }
- } else if (mode == 'line') {
- ranges[0].head = Pos(ranges[0].head.line + 1, 0);
- }
- }
- } else {
- // Init motion op
- curStart = copyCursor(newAnchor || oldAnchor);
- curEnd = copyCursor(newHead || oldHead);
- if (cursorIsBefore(curEnd, curStart)) {
- var tmp = curStart;
- curStart = curEnd;
- curEnd = tmp;
- }
- linewise = motionArgs.linewise || operatorArgs.linewise;
- if (linewise) {
- // Expand selection to entire line.
- expandSelectionToLine(cm, curStart, curEnd);
- } else if (motionArgs.forward) {
- // Clip to trailing newlines only if the motion goes forward.
- clipToLine(cm, curStart, curEnd);
- }
- mode = 'char';
- var exclusive = !motionArgs.inclusive || linewise;
- cmSel = makeCmSelection(cm, {
- anchor: curStart,
- head: curEnd
- }, mode, exclusive);
- }
- cm.setSelections(cmSel.ranges, cmSel.primary);
- vim.lastMotion = null;
- operatorArgs.repeat = repeat; // For indent in visual mode.
- operatorArgs.registerName = registerName;
- // Keep track of linewise as it affects how paste and change behave.
- operatorArgs.linewise = linewise;
- var operatorMoveTo = operators[operator](
- cm, operatorArgs, cmSel.ranges, oldAnchor, newHead);
- if (vim.visualMode) {
- exitVisualMode(cm, operatorMoveTo != null);
- }
- if (operatorMoveTo) {
- cm.setCursor(operatorMoveTo);
- }
- }
- },
- recordLastEdit: function(vim, inputState, actionCommand) {
- var macroModeState = vimGlobalState.macroModeState;
- if (macroModeState.isPlaying) { return; }
- vim.lastEditInputState = inputState;
- vim.lastEditActionCommand = actionCommand;
- macroModeState.lastInsertModeChanges.changes = [];
- macroModeState.lastInsertModeChanges.expectCursorActivityForChange = false;
- }
- };
-
- /**
- * typedef {Object{line:number,ch:number}} Cursor An object containing the
- * position of the cursor.
- */
- // All of the functions below return Cursor objects.
- var motions = {
- moveToTopLine: function(cm, _head, motionArgs) {
- var line = getUserVisibleLines(cm).top + motionArgs.repeat -1;
- return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
- },
- moveToMiddleLine: function(cm) {
- var range = getUserVisibleLines(cm);
- var line = Math.floor((range.top + range.bottom) * 0.5);
- return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
- },
- moveToBottomLine: function(cm, _head, motionArgs) {
- var line = getUserVisibleLines(cm).bottom - motionArgs.repeat +1;
- return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
- },
- expandToLine: function(_cm, head, motionArgs) {
- // Expands forward to end of line, and then to next line if repeat is
- // >1. Does not handle backward motion!
- var cur = head;
- return Pos(cur.line + motionArgs.repeat - 1, Infinity);
- },
- findNext: function(cm, _head, motionArgs) {
- var state = getSearchState(cm);
- var query = state.getQuery();
- if (!query) {
- return;
- }
- var prev = !motionArgs.forward;
- // If search is initiated with ? instead of /, negate direction.
- prev = (state.isReversed()) ? !prev : prev;
- highlightSearchMatches(cm, query);
- return findNext(cm, prev/** prev */, query, motionArgs.repeat);
- },
- goToMark: function(cm, _head, motionArgs, vim) {
- var mark = vim.marks[motionArgs.selectedCharacter];
- if (mark) {
- var pos = mark.find();
- return motionArgs.linewise ? { line: pos.line, ch: findFirstNonWhiteSpaceCharacter(cm.getLine(pos.line)) } : pos;
- }
- return null;
- },
- moveToOtherHighlightedEnd: function(cm, _head, motionArgs, vim) {
- if (vim.visualBlock && motionArgs.sameLine) {
- var sel = vim.sel;
- return [
- clipCursorToContent(cm, Pos(sel.anchor.line, sel.head.ch)),
- clipCursorToContent(cm, Pos(sel.head.line, sel.anchor.ch))
- ];
- } else {
- return ([vim.sel.head, vim.sel.anchor]);
- }
- },
- jumpToMark: function(cm, head, motionArgs, vim) {
- var best = head;
- for (var i = 0; i < motionArgs.repeat; i++) {
- var cursor = best;
- for (var key in vim.marks) {
- if (!isLowerCase(key)) {
- continue;
- }
- var mark = vim.marks[key].find();
- var isWrongDirection = (motionArgs.forward) ?
- cursorIsBefore(mark, cursor) : cursorIsBefore(cursor, mark);
-
- if (isWrongDirection) {
- continue;
- }
- if (motionArgs.linewise && (mark.line == cursor.line)) {
- continue;
- }
-
- var equal = cursorEqual(cursor, best);
- var between = (motionArgs.forward) ?
- cursorIsBetween(cursor, mark, best) :
- cursorIsBetween(best, mark, cursor);
-
- if (equal || between) {
- best = mark;
- }
- }
- }
-
- if (motionArgs.linewise) {
- // Vim places the cursor on the first non-whitespace character of
- // the line if there is one, else it places the cursor at the end
- // of the line, regardless of whether a mark was found.
- best = Pos(best.line, findFirstNonWhiteSpaceCharacter(cm.getLine(best.line)));
- }
- return best;
- },
- moveByCharacters: function(_cm, head, motionArgs) {
- var cur = head;
- var repeat = motionArgs.repeat;
- var ch = motionArgs.forward ? cur.ch + repeat : cur.ch - repeat;
- return Pos(cur.line, ch);
- },
- moveByLines: function(cm, head, motionArgs, vim) {
- var cur = head;
- var endCh = cur.ch;
- // Depending what our last motion was, we may want to do different
- // things. If our last motion was moving vertically, we want to
- // preserve the HPos from our last horizontal move. If our last motion
- // was going to the end of a line, moving vertically we should go to
- // the end of the line, etc.
- switch (vim.lastMotion) {
- case this.moveByLines:
- case this.moveByDisplayLines:
- case this.moveByScroll:
- case this.moveToColumn:
- case this.moveToEol:
- endCh = vim.lastHPos;
- break;
- default:
- vim.lastHPos = endCh;
- }
- var repeat = motionArgs.repeat+(motionArgs.repeatOffset||0);
- var line = motionArgs.forward ? cur.line + repeat : cur.line - repeat;
- var first = cm.firstLine();
- var last = cm.lastLine();
- // Vim go to line begin or line end when cursor at first/last line and
- // move to previous/next line is triggered.
- if (line < first && cur.line == first){
- return this.moveToStartOfLine(cm, head, motionArgs, vim);
- }else if (line > last && cur.line == last){
- return this.moveToEol(cm, head, motionArgs, vim);
- }
- if (motionArgs.toFirstChar){
- endCh=findFirstNonWhiteSpaceCharacter(cm.getLine(line));
- vim.lastHPos = endCh;
- }
- vim.lastHSPos = cm.charCoords(Pos(line, endCh),'div').left;
- return Pos(line, endCh);
- },
- moveByDisplayLines: function(cm, head, motionArgs, vim) {
- var cur = head;
- switch (vim.lastMotion) {
- case this.moveByDisplayLines:
- case this.moveByScroll:
- case this.moveByLines:
- case this.moveToColumn:
- case this.moveToEol:
- break;
- default:
- vim.lastHSPos = cm.charCoords(cur,'div').left;
- }
- var repeat = motionArgs.repeat;
- var res=cm.findPosV(cur,(motionArgs.forward ? repeat : -repeat),'line',vim.lastHSPos);
- if (res.hitSide) {
- if (motionArgs.forward) {
- var lastCharCoords = cm.charCoords(res, 'div');
- var goalCoords = { top: lastCharCoords.top + 8, left: vim.lastHSPos };
- var res = cm.coordsChar(goalCoords, 'div');
- } else {
- var resCoords = cm.charCoords(Pos(cm.firstLine(), 0), 'div');
- resCoords.left = vim.lastHSPos;
- res = cm.coordsChar(resCoords, 'div');
- }
- }
- vim.lastHPos = res.ch;
- return res;
- },
- moveByPage: function(cm, head, motionArgs) {
- // CodeMirror only exposes functions that move the cursor page down, so
- // doing this bad hack to move the cursor and move it back. evalInput
- // will move the cursor to where it should be in the end.
- var curStart = head;
- var repeat = motionArgs.repeat;
- return cm.findPosV(curStart, (motionArgs.forward ? repeat : -repeat), 'page');
- },
- moveByParagraph: function(cm, head, motionArgs) {
- var dir = motionArgs.forward ? 1 : -1;
- return findParagraph(cm, head, motionArgs.repeat, dir);
- },
- moveByScroll: function(cm, head, motionArgs, vim) {
- var scrollbox = cm.getScrollInfo();
- var curEnd = null;
- var repeat = motionArgs.repeat;
- if (!repeat) {
- repeat = scrollbox.clientHeight / (2 * cm.defaultTextHeight());
- }
- var orig = cm.charCoords(head, 'local');
- motionArgs.repeat = repeat;
- var curEnd = motions.moveByDisplayLines(cm, head, motionArgs, vim);
- if (!curEnd) {
- return null;
- }
- var dest = cm.charCoords(curEnd, 'local');
- cm.scrollTo(null, scrollbox.top + dest.top - orig.top);
- return curEnd;
- },
- moveByWords: function(cm, head, motionArgs) {
- return moveToWord(cm, head, motionArgs.repeat, !!motionArgs.forward,
- !!motionArgs.wordEnd, !!motionArgs.bigWord);
- },
- moveTillCharacter: function(cm, _head, motionArgs) {
- var repeat = motionArgs.repeat;
- var curEnd = moveToCharacter(cm, repeat, motionArgs.forward,
- motionArgs.selectedCharacter);
- var increment = motionArgs.forward ? -1 : 1;
- recordLastCharacterSearch(increment, motionArgs);
- if (!curEnd) return null;
- curEnd.ch += increment;
- return curEnd;
- },
- moveToCharacter: function(cm, head, motionArgs) {
- var repeat = motionArgs.repeat;
- recordLastCharacterSearch(0, motionArgs);
- return moveToCharacter(cm, repeat, motionArgs.forward,
- motionArgs.selectedCharacter) || head;
- },
- moveToSymbol: function(cm, head, motionArgs) {
- var repeat = motionArgs.repeat;
- return findSymbol(cm, repeat, motionArgs.forward,
- motionArgs.selectedCharacter) || head;
- },
- moveToColumn: function(cm, head, motionArgs, vim) {
- var repeat = motionArgs.repeat;
- // repeat is equivalent to which column we want to move to!
- vim.lastHPos = repeat - 1;
- vim.lastHSPos = cm.charCoords(head,'div').left;
- return moveToColumn(cm, repeat);
- },
- moveToEol: function(cm, head, motionArgs, vim) {
- var cur = head;
- vim.lastHPos = Infinity;
- var retval= Pos(cur.line + motionArgs.repeat - 1, Infinity);
- var end=cm.clipPos(retval);
- end.ch--;
- vim.lastHSPos = cm.charCoords(end,'div').left;
- return retval;
- },
- moveToFirstNonWhiteSpaceCharacter: function(cm, head) {
- // Go to the start of the line where the text begins, or the end for
- // whitespace-only lines
- var cursor = head;
- return Pos(cursor.line,
- findFirstNonWhiteSpaceCharacter(cm.getLine(cursor.line)));
- },
- moveToMatchedSymbol: function(cm, head) {
- var cursor = head;
- var line = cursor.line;
- var ch = cursor.ch;
- var lineText = cm.getLine(line);
- var symbol;
- do {
- symbol = lineText.charAt(ch++);
- if (symbol && isMatchableSymbol(symbol)) {
- var style = cm.getTokenTypeAt(Pos(line, ch));
- if (style !== "string" && style !== "comment") {
- break;
- }
- }
- } while (symbol);
- if (symbol) {
- var matched = cm.findMatchingBracket(Pos(line, ch));
- return matched.to;
- } else {
- return cursor;
- }
- },
- moveToStartOfLine: function(_cm, head) {
- return Pos(head.line, 0);
- },
- moveToLineOrEdgeOfDocument: function(cm, _head, motionArgs) {
- var lineNum = motionArgs.forward ? cm.lastLine() : cm.firstLine();
- if (motionArgs.repeatIsExplicit) {
- lineNum = motionArgs.repeat - cm.getOption('firstLineNumber');
- }
- return Pos(lineNum,
- findFirstNonWhiteSpaceCharacter(cm.getLine(lineNum)));
- },
- textObjectManipulation: function(cm, head, motionArgs, vim) {
- // TODO: lots of possible exceptions that can be thrown here. Try da(
- // outside of a () block.
-
- // TODO: adding <> >< to this map doesn't work, presumably because
- // they're operators
- var mirroredPairs = {'(': ')', ')': '(',
- '{': '}', '}': '{',
- '[': ']', ']': '['};
- var selfPaired = {'\'': true, '"': true};
-
- var character = motionArgs.selectedCharacter;
- // 'b' refers to '()' block.
- // 'B' refers to '{}' block.
- if (character == 'b') {
- character = '(';
- } else if (character == 'B') {
- character = '{';
- }
-
- // Inclusive is the difference between a and i
- // TODO: Instead of using the additional text object map to perform text
- // object operations, merge the map into the defaultKeyMap and use
- // motionArgs to define behavior. Define separate entries for 'aw',
- // 'iw', 'a[', 'i[', etc.
- var inclusive = !motionArgs.textObjectInner;
-
- var tmp;
- if (mirroredPairs[character]) {
- tmp = selectCompanionObject(cm, head, character, inclusive);
- } else if (selfPaired[character]) {
- tmp = findBeginningAndEnd(cm, head, character, inclusive);
- } else if (character === 'W') {
- tmp = expandWordUnderCursor(cm, inclusive, true /** forward */,
- true /** bigWord */);
- } else if (character === 'w') {
- tmp = expandWordUnderCursor(cm, inclusive, true /** forward */,
- false /** bigWord */);
- } else if (character === 'p') {
- tmp = findParagraph(cm, head, motionArgs.repeat, 0, inclusive);
- motionArgs.linewise = true;
- if (vim.visualMode) {
- if (!vim.visualLine) { vim.visualLine = true; }
- } else {
- var operatorArgs = vim.inputState.operatorArgs;
- if (operatorArgs) { operatorArgs.linewise = true; }
- tmp.end.line--;
- }
- } else {
- // No text object defined for this, don't move.
- return null;
- }
-
- if (!cm.state.vim.visualMode) {
- return [tmp.start, tmp.end];
- } else {
- return expandSelection(cm, tmp.start, tmp.end);
- }
- },
-
- repeatLastCharacterSearch: function(cm, head, motionArgs) {
- var lastSearch = vimGlobalState.lastCharacterSearch;
- var repeat = motionArgs.repeat;
- var forward = motionArgs.forward === lastSearch.forward;
- var increment = (lastSearch.increment ? 1 : 0) * (forward ? -1 : 1);
- cm.moveH(-increment, 'char');
- motionArgs.inclusive = forward ? true : false;
- var curEnd = moveToCharacter(cm, repeat, forward, lastSearch.selectedCharacter);
- if (!curEnd) {
- cm.moveH(increment, 'char');
- return head;
- }
- curEnd.ch += increment;
- return curEnd;
- }
- };
-
- function defineMotion(name, fn) {
- motions[name] = fn;
- }
-
- function fillArray(val, times) {
- var arr = [];
- for (var i = 0; i < times; i++) {
- arr.push(val);
- }
- return arr;
- }
- /**
- * An operator acts on a text selection. It receives the list of selections
- * as input. The corresponding CodeMirror selection is guaranteed to
- * match the input selection.
- */
- var operators = {
- change: function(cm, args, ranges) {
- var finalHead, text;
- var vim = cm.state.vim;
- vimGlobalState.macroModeState.lastInsertModeChanges.inVisualBlock = vim.visualBlock;
- if (!vim.visualMode) {
- var anchor = ranges[0].anchor,
- head = ranges[0].head;
- text = cm.getRange(anchor, head);
- var lastState = vim.lastEditInputState || {};
- if (lastState.motion == "moveByWords" && !isWhiteSpaceString(text)) {
- // Exclude trailing whitespace if the range is not all whitespace.
- var match = (/\s+$/).exec(text);
- if (match && lastState.motionArgs && lastState.motionArgs.forward) {
- head = offsetCursor(head, 0, - match[0].length);
- text = text.slice(0, - match[0].length);
- }
- }
- var prevLineEnd = new Pos(anchor.line - 1, Number.MAX_VALUE);
- var wasLastLine = cm.firstLine() == cm.lastLine();
- if (head.line > cm.lastLine() && args.linewise && !wasLastLine) {
- cm.replaceRange('', prevLineEnd, head);
- } else {
- cm.replaceRange('', anchor, head);
- }
- if (args.linewise) {
- // Push the next line back down, if there is a next line.
- if (!wasLastLine) {
- cm.setCursor(prevLineEnd);
- CodeMirror.commands.newlineAndIndent(cm);
- }
- // make sure cursor ends up at the end of the line.
- anchor.ch = Number.MAX_VALUE;
- }
- finalHead = anchor;
- } else {
- text = cm.getSelection();
- var replacement = fillArray('', ranges.length);
- cm.replaceSelections(replacement);
- finalHead = cursorMin(ranges[0].head, ranges[0].anchor);
- }
- vimGlobalState.registerController.pushText(
- args.registerName, 'change', text,
- args.linewise, ranges.length > 1);
- actions.enterInsertMode(cm, {head: finalHead}, cm.state.vim);
- },
- // delete is a javascript keyword.
- 'delete': function(cm, args, ranges) {
- var finalHead, text;
- var vim = cm.state.vim;
- if (!vim.visualBlock) {
- var anchor = ranges[0].anchor,
- head = ranges[0].head;
- if (args.linewise &&
- head.line != cm.firstLine() &&
- anchor.line == cm.lastLine() &&
- anchor.line == head.line - 1) {
- // Special case for dd on last line (and first line).
- if (anchor.line == cm.firstLine()) {
- anchor.ch = 0;
- } else {
- anchor = Pos(anchor.line - 1, lineLength(cm, anchor.line - 1));
- }
- }
- text = cm.getRange(anchor, head);
- cm.replaceRange('', anchor, head);
- finalHead = anchor;
- if (args.linewise) {
- finalHead = motions.moveToFirstNonWhiteSpaceCharacter(cm, anchor);
- }
- } else {
- text = cm.getSelection();
- var replacement = fillArray('', ranges.length);
- cm.replaceSelections(replacement);
- finalHead = ranges[0].anchor;
- }
- vimGlobalState.registerController.pushText(
- args.registerName, 'delete', text,
- args.linewise, vim.visualBlock);
- return clipCursorToContent(cm, finalHead);
- },
- indent: function(cm, args, ranges) {
- var vim = cm.state.vim;
- var startLine = ranges[0].anchor.line;
- var endLine = vim.visualBlock ?
- ranges[ranges.length - 1].anchor.line :
- ranges[0].head.line;
- // In visual mode, n> shifts the selection right n times, instead of
- // shifting n lines right once.
- var repeat = (vim.visualMode) ? args.repeat : 1;
- if (args.linewise) {
- // The only way to delete a newline is to delete until the start of
- // the next line, so in linewise mode evalInput will include the next
- // line. We don't want this in indent, so we go back a line.
- endLine--;
- }
- for (var i = startLine; i <= endLine; i++) {
- for (var j = 0; j < repeat; j++) {
- cm.indentLine(i, args.indentRight);
- }
- }
- return motions.moveToFirstNonWhiteSpaceCharacter(cm, ranges[0].anchor);
- },
- changeCase: function(cm, args, ranges, oldAnchor, newHead) {
- var selections = cm.getSelections();
- var swapped = [];
- var toLower = args.toLower;
- for (var j = 0; j < selections.length; j++) {
- var toSwap = selections[j];
- var text = '';
- if (toLower === true) {
- text = toSwap.toLowerCase();
- } else if (toLower === false) {
- text = toSwap.toUpperCase();
- } else {
- for (var i = 0; i < toSwap.length; i++) {
- var character = toSwap.charAt(i);
- text += isUpperCase(character) ? character.toLowerCase() :
- character.toUpperCase();
- }
- }
- swapped.push(text);
- }
- cm.replaceSelections(swapped);
- if (args.shouldMoveCursor){
- return newHead;
- } else if (!cm.state.vim.visualMode && args.linewise && ranges[0].anchor.line + 1 == ranges[0].head.line) {
- return motions.moveToFirstNonWhiteSpaceCharacter(cm, oldAnchor);
- } else if (args.linewise){
- return oldAnchor;
- } else {
- return cursorMin(ranges[0].anchor, ranges[0].head);
- }
- },
- yank: function(cm, args, ranges, oldAnchor) {
- var vim = cm.state.vim;
- var text = cm.getSelection();
- var endPos = vim.visualMode
- ? cursorMin(vim.sel.anchor, vim.sel.head, ranges[0].head, ranges[0].anchor)
- : oldAnchor;
- vimGlobalState.registerController.pushText(
- args.registerName, 'yank',
- text, args.linewise, vim.visualBlock);
- return endPos;
- }
- };
-
- function defineOperator(name, fn) {
- operators[name] = fn;
- }
-
- var actions = {
- jumpListWalk: function(cm, actionArgs, vim) {
- if (vim.visualMode) {
- return;
- }
- var repeat = actionArgs.repeat;
- var forward = actionArgs.forward;
- var jumpList = vimGlobalState.jumpList;
-
- var mark = jumpList.move(cm, forward ? repeat : -repeat);
- var markPos = mark ? mark.find() : undefined;
- markPos = markPos ? markPos : cm.getCursor();
- cm.setCursor(markPos);
- },
- scroll: function(cm, actionArgs, vim) {
- if (vim.visualMode) {
- return;
- }
- var repeat = actionArgs.repeat || 1;
- var lineHeight = cm.defaultTextHeight();
- var top = cm.getScrollInfo().top;
- var delta = lineHeight * repeat;
- var newPos = actionArgs.forward ? top + delta : top - delta;
- var cursor = copyCursor(cm.getCursor());
- var cursorCoords = cm.charCoords(cursor, 'local');
- if (actionArgs.forward) {
- if (newPos > cursorCoords.top) {
- cursor.line += (newPos - cursorCoords.top) / lineHeight;
- cursor.line = Math.ceil(cursor.line);
- cm.setCursor(cursor);
- cursorCoords = cm.charCoords(cursor, 'local');
- cm.scrollTo(null, cursorCoords.top);
- } else {
- // Cursor stays within bounds. Just reposition the scroll window.
- cm.scrollTo(null, newPos);
- }
- } else {
- var newBottom = newPos + cm.getScrollInfo().clientHeight;
- if (newBottom < cursorCoords.bottom) {
- cursor.line -= (cursorCoords.bottom - newBottom) / lineHeight;
- cursor.line = Math.floor(cursor.line);
- cm.setCursor(cursor);
- cursorCoords = cm.charCoords(cursor, 'local');
- cm.scrollTo(
- null, cursorCoords.bottom - cm.getScrollInfo().clientHeight);
- } else {
- // Cursor stays within bounds. Just reposition the scroll window.
- cm.scrollTo(null, newPos);
- }
- }
- },
- scrollToCursor: function(cm, actionArgs) {
- var lineNum = cm.getCursor().line;
- var charCoords = cm.charCoords(Pos(lineNum, 0), 'local');
- var height = cm.getScrollInfo().clientHeight;
- var y = charCoords.top;
- var lineHeight = charCoords.bottom - y;
- switch (actionArgs.position) {
- case 'center': y = y - (height / 2) + lineHeight;
- break;
- case 'bottom': y = y - height + lineHeight;
- break;
- }
- cm.scrollTo(null, y);
- },
- replayMacro: function(cm, actionArgs, vim) {
- var registerName = actionArgs.selectedCharacter;
- var repeat = actionArgs.repeat;
- var macroModeState = vimGlobalState.macroModeState;
- if (registerName == '@') {
- registerName = macroModeState.latestRegister;
- }
- while(repeat--){
- executeMacroRegister(cm, vim, macroModeState, registerName);
- }
- },
- enterMacroRecordMode: function(cm, actionArgs) {
- var macroModeState = vimGlobalState.macroModeState;
- var registerName = actionArgs.selectedCharacter;
- macroModeState.enterMacroRecordMode(cm, registerName);
- },
- toggleOverwrite: function(cm) {
- if (!cm.state.overwrite) {
- cm.toggleOverwrite(true);
- cm.setOption('keyMap', 'vim-replace');
- CodeMirror.signal(cm, "vim-mode-change", {mode: "replace"});
- } else {
- cm.toggleOverwrite(false);
- cm.setOption('keyMap', 'vim-insert');
- CodeMirror.signal(cm, "vim-mode-change", {mode: "insert"});
- }
- },
- enterInsertMode: function(cm, actionArgs, vim) {
- if (cm.getOption('readOnly')) { return; }
- vim.insertMode = true;
- vim.insertModeRepeat = actionArgs && actionArgs.repeat || 1;
- var insertAt = (actionArgs) ? actionArgs.insertAt : null;
- var sel = vim.sel;
- var head = actionArgs.head || cm.getCursor('head');
- var height = cm.listSelections().length;
- if (insertAt == 'eol') {
- head = Pos(head.line, lineLength(cm, head.line));
- } else if (insertAt == 'charAfter') {
- head = offsetCursor(head, 0, 1);
- } else if (insertAt == 'firstNonBlank') {
- head = motions.moveToFirstNonWhiteSpaceCharacter(cm, head);
- } else if (insertAt == 'startOfSelectedArea') {
- if (!vim.visualBlock) {
- if (sel.head.line < sel.anchor.line) {
- head = sel.head;
- } else {
- head = Pos(sel.anchor.line, 0);
- }
- } else {
- head = Pos(
- Math.min(sel.head.line, sel.anchor.line),
- Math.min(sel.head.ch, sel.anchor.ch));
- height = Math.abs(sel.head.line - sel.anchor.line) + 1;
- }
- } else if (insertAt == 'endOfSelectedArea') {
- if (!vim.visualBlock) {
- if (sel.head.line >= sel.anchor.line) {
- head = offsetCursor(sel.head, 0, 1);
- } else {
- head = Pos(sel.anchor.line, 0);
- }
- } else {
- head = Pos(
- Math.min(sel.head.line, sel.anchor.line),
- Math.max(sel.head.ch + 1, sel.anchor.ch));
- height = Math.abs(sel.head.line - sel.anchor.line) + 1;
- }
- } else if (insertAt == 'inplace') {
- if (vim.visualMode){
- return;
- }
- }
- cm.setOption('disableInput', false);
- if (actionArgs && actionArgs.replace) {
- // Handle Replace-mode as a special case of insert mode.
- cm.toggleOverwrite(true);
- cm.setOption('keyMap', 'vim-replace');
- CodeMirror.signal(cm, "vim-mode-change", {mode: "replace"});
- } else {
- cm.toggleOverwrite(false);
- cm.setOption('keyMap', 'vim-insert');
- CodeMirror.signal(cm, "vim-mode-change", {mode: "insert"});
- }
- if (!vimGlobalState.macroModeState.isPlaying) {
- // Only record if not replaying.
- cm.on('change', onChange);
- CodeMirror.on(cm.getInputField(), 'keydown', onKeyEventTargetKeyDown);
- }
- if (vim.visualMode) {
- exitVisualMode(cm);
- }
- selectForInsert(cm, head, height);
- },
- toggleVisualMode: function(cm, actionArgs, vim) {
- var repeat = actionArgs.repeat;
- var anchor = cm.getCursor();
- var head;
- // TODO: The repeat should actually select number of characters/lines
- // equal to the repeat times the size of the previous visual
- // operation.
- if (!vim.visualMode) {
- // Entering visual mode
- vim.visualMode = true;
- vim.visualLine = !!actionArgs.linewise;
- vim.visualBlock = !!actionArgs.blockwise;
- head = clipCursorToContent(
- cm, Pos(anchor.line, anchor.ch + repeat - 1),
- true /** includeLineBreak */);
- vim.sel = {
- anchor: anchor,
- head: head
- };
- CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : vim.visualBlock ? "blockwise" : ""});
- updateCmSelection(cm);
- updateMark(cm, vim, '<', cursorMin(anchor, head));
- updateMark(cm, vim, '>', cursorMax(anchor, head));
- } else if (vim.visualLine ^ actionArgs.linewise ||
- vim.visualBlock ^ actionArgs.blockwise) {
- // Toggling between modes
- vim.visualLine = !!actionArgs.linewise;
- vim.visualBlock = !!actionArgs.blockwise;
- CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : vim.visualBlock ? "blockwise" : ""});
- updateCmSelection(cm);
- } else {
- exitVisualMode(cm);
- }
- },
- reselectLastSelection: function(cm, _actionArgs, vim) {
- var lastSelection = vim.lastSelection;
- if (vim.visualMode) {
- updateLastSelection(cm, vim);
- }
- if (lastSelection) {
- var anchor = lastSelection.anchorMark.find();
- var head = lastSelection.headMark.find();
- if (!anchor || !head) {
- // If the marks have been destroyed due to edits, do nothing.
- return;
- }
- vim.sel = {
- anchor: anchor,
- head: head
- };
- vim.visualMode = true;
- vim.visualLine = lastSelection.visualLine;
- vim.visualBlock = lastSelection.visualBlock;
- updateCmSelection(cm);
- updateMark(cm, vim, '<', cursorMin(anchor, head));
- updateMark(cm, vim, '>', cursorMax(anchor, head));
- CodeMirror.signal(cm, 'vim-mode-change', {
- mode: 'visual',
- subMode: vim.visualLine ? 'linewise' :
- vim.visualBlock ? 'blockwise' : ''});
- }
- },
- joinLines: function(cm, actionArgs, vim) {
- var curStart, curEnd;
- if (vim.visualMode) {
- curStart = cm.getCursor('anchor');
- curEnd = cm.getCursor('head');
- if (cursorIsBefore(curEnd, curStart)) {
- var tmp = curEnd;
- curEnd = curStart;
- curStart = tmp;
- }
- curEnd.ch = lineLength(cm, curEnd.line) - 1;
- } else {
- // Repeat is the number of lines to join. Minimum 2 lines.
- var repeat = Math.max(actionArgs.repeat, 2);
- curStart = cm.getCursor();
- curEnd = clipCursorToContent(cm, Pos(curStart.line + repeat - 1,
- Infinity));
- }
- var finalCh = 0;
- for (var i = curStart.line; i < curEnd.line; i++) {
- finalCh = lineLength(cm, curStart.line);
- var tmp = Pos(curStart.line + 1,
- lineLength(cm, curStart.line + 1));
- var text = cm.getRange(curStart, tmp);
- text = text.replace(/\n\s*/g, ' ');
- cm.replaceRange(text, curStart, tmp);
- }
- var curFinalPos = Pos(curStart.line, finalCh);
- if (vim.visualMode) {
- exitVisualMode(cm, false);
- }
- cm.setCursor(curFinalPos);
- },
- newLineAndEnterInsertMode: function(cm, actionArgs, vim) {
- vim.insertMode = true;
- var insertAt = copyCursor(cm.getCursor());
- if (insertAt.line === cm.firstLine() && !actionArgs.after) {
- // Special case for inserting newline before start of document.
- cm.replaceRange('\n', Pos(cm.firstLine(), 0));
- cm.setCursor(cm.firstLine(), 0);
- } else {
- insertAt.line = (actionArgs.after) ? insertAt.line :
- insertAt.line - 1;
- insertAt.ch = lineLength(cm, insertAt.line);
- cm.setCursor(insertAt);
- var newlineFn = CodeMirror.commands.newlineAndIndentContinueComment ||
- CodeMirror.commands.newlineAndIndent;
- newlineFn(cm);
- }
- this.enterInsertMode(cm, { repeat: actionArgs.repeat }, vim);
- },
- paste: function(cm, actionArgs, vim) {
- var cur = copyCursor(cm.getCursor());
- var register = vimGlobalState.registerController.getRegister(
- actionArgs.registerName);
- var text = register.toString();
- if (!text) {
- return;
- }
- if (actionArgs.matchIndent) {
- var tabSize = cm.getOption("tabSize");
- // length that considers tabs and tabSize
- var whitespaceLength = function(str) {
- var tabs = (str.split("\t").length - 1);
- var spaces = (str.split(" ").length - 1);
- return tabs * tabSize + spaces * 1;
- };
- var currentLine = cm.getLine(cm.getCursor().line);
- var indent = whitespaceLength(currentLine.match(/^\s*/)[0]);
- // chomp last newline b/c don't want it to match /^\s*/gm
- var chompedText = text.replace(/\n$/, '');
- var wasChomped = text !== chompedText;
- var firstIndent = whitespaceLength(text.match(/^\s*/)[0]);
- var text = chompedText.replace(/^\s*/gm, function(wspace) {
- var newIndent = indent + (whitespaceLength(wspace) - firstIndent);
- if (newIndent < 0) {
- return "";
- }
- else if (cm.getOption("indentWithTabs")) {
- var quotient = Math.floor(newIndent / tabSize);
- return Array(quotient + 1).join('\t');
- }
- else {
- return Array(newIndent + 1).join(' ');
- }
- });
- text += wasChomped ? "\n" : "";
- }
- if (actionArgs.repeat > 1) {
- var text = Array(actionArgs.repeat + 1).join(text);
- }
- var linewise = register.linewise;
- var blockwise = register.blockwise;
- if (linewise) {
- if(vim.visualMode) {
- text = vim.visualLine ? text.slice(0, -1) : '\n' + text.slice(0, text.length - 1) + '\n';
- } else if (actionArgs.after) {
- // Move the newline at the end to the start instead, and paste just
- // before the newline character of the line we are on right now.
- text = '\n' + text.slice(0, text.length - 1);
- cur.ch = lineLength(cm, cur.line);
- } else {
- cur.ch = 0;
- }
- } else {
- if (blockwise) {
- text = text.split('\n');
- for (var i = 0; i < text.length; i++) {
- text[i] = (text[i] == '') ? ' ' : text[i];
- }
- }
- cur.ch += actionArgs.after ? 1 : 0;
- }
- var curPosFinal;
- var idx;
- if (vim.visualMode) {
- // save the pasted text for reselection if the need arises
- vim.lastPastedText = text;
- var lastSelectionCurEnd;
- var selectedArea = getSelectedAreaRange(cm, vim);
- var selectionStart = selectedArea[0];
- var selectionEnd = selectedArea[1];
- var selectedText = cm.getSelection();
- var selections = cm.listSelections();
- var emptyStrings = new Array(selections.length).join('1').split('1');
- // save the curEnd marker before it get cleared due to cm.replaceRange.
- if (vim.lastSelection) {
- lastSelectionCurEnd = vim.lastSelection.headMark.find();
- }
- // push the previously selected text to unnamed register
- vimGlobalState.registerController.unnamedRegister.setText(selectedText);
- if (blockwise) {
- // first delete the selected text
- cm.replaceSelections(emptyStrings);
- // Set new selections as per the block length of the yanked text
- selectionEnd = Pos(selectionStart.line + text.length-1, selectionStart.ch);
- cm.setCursor(selectionStart);
- selectBlock(cm, selectionEnd);
- cm.replaceSelections(text);
- curPosFinal = selectionStart;
- } else if (vim.visualBlock) {
- cm.replaceSelections(emptyStrings);
- cm.setCursor(selectionStart);
- cm.replaceRange(text, selectionStart, selectionStart);
- curPosFinal = selectionStart;
- } else {
- cm.replaceRange(text, selectionStart, selectionEnd);
- curPosFinal = cm.posFromIndex(cm.indexFromPos(selectionStart) + text.length - 1);
- }
- // restore the the curEnd marker
- if(lastSelectionCurEnd) {
- vim.lastSelection.headMark = cm.setBookmark(lastSelectionCurEnd);
- }
- if (linewise) {
- curPosFinal.ch=0;
- }
- } else {
- if (blockwise) {
- cm.setCursor(cur);
- for (var i = 0; i < text.length; i++) {
- var line = cur.line+i;
- if (line > cm.lastLine()) {
- cm.replaceRange('\n', Pos(line, 0));
- }
- var lastCh = lineLength(cm, line);
- if (lastCh < cur.ch) {
- extendLineToColumn(cm, line, cur.ch);
- }
- }
- cm.setCursor(cur);
- selectBlock(cm, Pos(cur.line + text.length-1, cur.ch));
- cm.replaceSelections(text);
- curPosFinal = cur;
- } else {
- cm.replaceRange(text, cur);
- // Now fine tune the cursor to where we want it.
- if (linewise && actionArgs.after) {
- curPosFinal = Pos(
- cur.line + 1,
- findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line + 1)));
- } else if (linewise && !actionArgs.after) {
- curPosFinal = Pos(
- cur.line,
- findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line)));
- } else if (!linewise && actionArgs.after) {
- idx = cm.indexFromPos(cur);
- curPosFinal = cm.posFromIndex(idx + text.length - 1);
- } else {
- idx = cm.indexFromPos(cur);
- curPosFinal = cm.posFromIndex(idx + text.length);
- }
- }
- }
- if (vim.visualMode) {
- exitVisualMode(cm, false);
- }
- cm.setCursor(curPosFinal);
- },
- undo: function(cm, actionArgs) {
- cm.operation(function() {
- repeatFn(cm, CodeMirror.commands.undo, actionArgs.repeat)();
- cm.setCursor(cm.getCursor('anchor'));
- });
- },
- redo: function(cm, actionArgs) {
- repeatFn(cm, CodeMirror.commands.redo, actionArgs.repeat)();
- },
- setRegister: function(_cm, actionArgs, vim) {
- vim.inputState.registerName = actionArgs.selectedCharacter;
- },
- setMark: function(cm, actionArgs, vim) {
- var markName = actionArgs.selectedCharacter;
- updateMark(cm, vim, markName, cm.getCursor());
- },
- replace: function(cm, actionArgs, vim) {
- var replaceWith = actionArgs.selectedCharacter;
- var curStart = cm.getCursor();
- var replaceTo;
- var curEnd;
- var selections = cm.listSelections();
- if (vim.visualMode) {
- curStart = cm.getCursor('start');
- curEnd = cm.getCursor('end');
- } else {
- var line = cm.getLine(curStart.line);
- replaceTo = curStart.ch + actionArgs.repeat;
- if (replaceTo > line.length) {
- replaceTo=line.length;
- }
- curEnd = Pos(curStart.line, replaceTo);
- }
- if (replaceWith=='\n') {
- if (!vim.visualMode) cm.replaceRange('', curStart, curEnd);
- // special case, where vim help says to replace by just one line-break
- (CodeMirror.commands.newlineAndIndentContinueComment || CodeMirror.commands.newlineAndIndent)(cm);
- } else {
- var replaceWithStr = cm.getRange(curStart, curEnd);
- //replace all characters in range by selected, but keep linebreaks
- replaceWithStr = replaceWithStr.replace(/[^\n]/g, replaceWith);
- if (vim.visualBlock) {
- // Tabs are split in visua block before replacing
- var spaces = new Array(cm.getOption("tabSize")+1).join(' ');
- replaceWithStr = cm.getSelection();
- replaceWithStr = replaceWithStr.replace(/\t/g, spaces).replace(/[^\n]/g, replaceWith).split('\n');
- cm.replaceSelections(replaceWithStr);
- } else {
- cm.replaceRange(replaceWithStr, curStart, curEnd);
- }
- if (vim.visualMode) {
- curStart = cursorIsBefore(selections[0].anchor, selections[0].head) ?
- selections[0].anchor : selections[0].head;
- cm.setCursor(curStart);
- exitVisualMode(cm, false);
- } else {
- cm.setCursor(offsetCursor(curEnd, 0, -1));
- }
- }
- },
- incrementNumberToken: function(cm, actionArgs) {
- var cur = cm.getCursor();
- var lineStr = cm.getLine(cur.line);
- var re = /-?\d+/g;
- var match;
- var start;
- var end;
- var numberStr;
- var token;
- while ((match = re.exec(lineStr)) !== null) {
- token = match[0];
- start = match.index;
- end = start + token.length;
- if (cur.ch < end)break;
- }
- if (!actionArgs.backtrack && (end <= cur.ch))return;
- if (token) {
- var increment = actionArgs.increase ? 1 : -1;
- var number = parseInt(token) + (increment * actionArgs.repeat);
- var from = Pos(cur.line, start);
- var to = Pos(cur.line, end);
- numberStr = number.toString();
- cm.replaceRange(numberStr, from, to);
- } else {
- return;
- }
- cm.setCursor(Pos(cur.line, start + numberStr.length - 1));
- },
- repeatLastEdit: function(cm, actionArgs, vim) {
- var lastEditInputState = vim.lastEditInputState;
- if (!lastEditInputState) { return; }
- var repeat = actionArgs.repeat;
- if (repeat && actionArgs.repeatIsExplicit) {
- vim.lastEditInputState.repeatOverride = repeat;
- } else {
- repeat = vim.lastEditInputState.repeatOverride || repeat;
- }
- repeatLastEdit(cm, vim, repeat, false /** repeatForInsert */);
- },
- exitInsertMode: exitInsertMode
- };
-
- function defineAction(name, fn) {
- actions[name] = fn;
- }
-
- /*
- * Below are miscellaneous utility functions used by vim.js
- */
-
- /**
- * Clips cursor to ensure that line is within the buffer's range
- * If includeLineBreak is true, then allow cur.ch == lineLength.
- */
- function clipCursorToContent(cm, cur, includeLineBreak) {
- var line = Math.min(Math.max(cm.firstLine(), cur.line), cm.lastLine() );
- var maxCh = lineLength(cm, line) - 1;
- maxCh = (includeLineBreak) ? maxCh + 1 : maxCh;
- var ch = Math.min(Math.max(0, cur.ch), maxCh);
- return Pos(line, ch);
- }
- function copyArgs(args) {
- var ret = {};
- for (var prop in args) {
- if (args.hasOwnProperty(prop)) {
- ret[prop] = args[prop];
- }
- }
- return ret;
- }
- function offsetCursor(cur, offsetLine, offsetCh) {
- if (typeof offsetLine === 'object') {
- offsetCh = offsetLine.ch;
- offsetLine = offsetLine.line;
- }
- return Pos(cur.line + offsetLine, cur.ch + offsetCh);
- }
- function getOffset(anchor, head) {
- return {
- line: head.line - anchor.line,
- ch: head.line - anchor.line
- };
- }
- function commandMatches(keys, keyMap, context, inputState) {
- // Partial matches are not applied. They inform the key handler
- // that the current key sequence is a subsequence of a valid key
- // sequence, so that the key buffer is not cleared.
- var match, partial = [], full = [];
- for (var i = 0; i < keyMap.length; i++) {
- var command = keyMap[i];
- if (context == 'insert' && command.context != 'insert' ||
- command.context && command.context != context ||
- inputState.operator && command.type == 'action' ||
- !(match = commandMatch(keys, command.keys))) { continue; }
- if (match == 'partial') { partial.push(command); }
- if (match == 'full') { full.push(command); }
- }
- return {
- partial: partial.length && partial,
- full: full.length && full
- };
- }
- function commandMatch(pressed, mapped) {
- if (mapped.slice(-11) == '') {
- // Last character matches anything.
- var prefixLen = mapped.length - 11;
- var pressedPrefix = pressed.slice(0, prefixLen);
- var mappedPrefix = mapped.slice(0, prefixLen);
- return pressedPrefix == mappedPrefix && pressed.length > prefixLen ? 'full' :
- mappedPrefix.indexOf(pressedPrefix) == 0 ? 'partial' : false;
- } else {
- return pressed == mapped ? 'full' :
- mapped.indexOf(pressed) == 0 ? 'partial' : false;
- }
- }
- function lastChar(keys) {
- var match = /^.*(<[\w\-]+>)$/.exec(keys);
- var selectedCharacter = match ? match[1] : keys.slice(-1);
- if (selectedCharacter.length > 1){
- switch(selectedCharacter){
- case '':
- selectedCharacter='\n';
- break;
- case '':
- selectedCharacter=' ';
- break;
- default:
- break;
- }
- }
- return selectedCharacter;
- }
- function repeatFn(cm, fn, repeat) {
- return function() {
- for (var i = 0; i < repeat; i++) {
- fn(cm);
- }
- };
- }
- function copyCursor(cur) {
- return Pos(cur.line, cur.ch);
- }
- function cursorEqual(cur1, cur2) {
- return cur1.ch == cur2.ch && cur1.line == cur2.line;
- }
- function cursorIsBefore(cur1, cur2) {
- if (cur1.line < cur2.line) {
- return true;
- }
- if (cur1.line == cur2.line && cur1.ch < cur2.ch) {
- return true;
- }
- return false;
- }
- function cursorMin(cur1, cur2) {
- if (arguments.length > 2) {
- cur2 = cursorMin.apply(undefined, Array.prototype.slice.call(arguments, 1));
- }
- return cursorIsBefore(cur1, cur2) ? cur1 : cur2;
- }
- function cursorMax(cur1, cur2) {
- if (arguments.length > 2) {
- cur2 = cursorMax.apply(undefined, Array.prototype.slice.call(arguments, 1));
- }
- return cursorIsBefore(cur1, cur2) ? cur2 : cur1;
- }
- function cursorIsBetween(cur1, cur2, cur3) {
- // returns true if cur2 is between cur1 and cur3.
- var cur1before2 = cursorIsBefore(cur1, cur2);
- var cur2before3 = cursorIsBefore(cur2, cur3);
- return cur1before2 && cur2before3;
- }
- function lineLength(cm, lineNum) {
- return cm.getLine(lineNum).length;
- }
- function trim(s) {
- if (s.trim) {
- return s.trim();
- }
- return s.replace(/^\s+|\s+$/g, '');
- }
- function escapeRegex(s) {
- return s.replace(/([.?*+$\[\]\/\\(){}|\-])/g, '\\$1');
- }
- function extendLineToColumn(cm, lineNum, column) {
- var endCh = lineLength(cm, lineNum);
- var spaces = new Array(column-endCh+1).join(' ');
- cm.setCursor(Pos(lineNum, endCh));
- cm.replaceRange(spaces, cm.getCursor());
- }
- // This functions selects a rectangular block
- // of text with selectionEnd as any of its corner
- // Height of block:
- // Difference in selectionEnd.line and first/last selection.line
- // Width of the block:
- // Distance between selectionEnd.ch and any(first considered here) selection.ch
- function selectBlock(cm, selectionEnd) {
- var selections = [], ranges = cm.listSelections();
- var head = copyCursor(cm.clipPos(selectionEnd));
- var isClipped = !cursorEqual(selectionEnd, head);
- var curHead = cm.getCursor('head');
- var primIndex = getIndex(ranges, curHead);
- var wasClipped = cursorEqual(ranges[primIndex].head, ranges[primIndex].anchor);
- var max = ranges.length - 1;
- var index = max - primIndex > primIndex ? max : 0;
- var base = ranges[index].anchor;
-
- var firstLine = Math.min(base.line, head.line);
- var lastLine = Math.max(base.line, head.line);
- var baseCh = base.ch, headCh = head.ch;
-
- var dir = ranges[index].head.ch - baseCh;
- var newDir = headCh - baseCh;
- if (dir > 0 && newDir <= 0) {
- baseCh++;
- if (!isClipped) { headCh--; }
- } else if (dir < 0 && newDir >= 0) {
- baseCh--;
- if (!wasClipped) { headCh++; }
- } else if (dir < 0 && newDir == -1) {
- baseCh--;
- headCh++;
- }
- for (var line = firstLine; line <= lastLine; line++) {
- var range = {anchor: new Pos(line, baseCh), head: new Pos(line, headCh)};
- selections.push(range);
- }
- primIndex = head.line == lastLine ? selections.length - 1 : 0;
- cm.setSelections(selections);
- selectionEnd.ch = headCh;
- base.ch = baseCh;
- return base;
- }
- function selectForInsert(cm, head, height) {
- var sel = [];
- for (var i = 0; i < height; i++) {
- var lineHead = offsetCursor(head, i, 0);
- sel.push({anchor: lineHead, head: lineHead});
- }
- cm.setSelections(sel, 0);
- }
- // getIndex returns the index of the cursor in the selections.
- function getIndex(ranges, cursor, end) {
- for (var i = 0; i < ranges.length; i++) {
- var atAnchor = end != 'head' && cursorEqual(ranges[i].anchor, cursor);
- var atHead = end != 'anchor' && cursorEqual(ranges[i].head, cursor);
- if (atAnchor || atHead) {
- return i;
- }
- }
- return -1;
- }
- function getSelectedAreaRange(cm, vim) {
- var lastSelection = vim.lastSelection;
- var getCurrentSelectedAreaRange = function() {
- var selections = cm.listSelections();
- var start = selections[0];
- var end = selections[selections.length-1];
- var selectionStart = cursorIsBefore(start.anchor, start.head) ? start.anchor : start.head;
- var selectionEnd = cursorIsBefore(end.anchor, end.head) ? end.head : end.anchor;
- return [selectionStart, selectionEnd];
- };
- var getLastSelectedAreaRange = function() {
- var selectionStart = cm.getCursor();
- var selectionEnd = cm.getCursor();
- var block = lastSelection.visualBlock;
- if (block) {
- var width = block.width;
- var height = block.height;
- selectionEnd = Pos(selectionStart.line + height, selectionStart.ch + width);
- var selections = [];
- // selectBlock creates a 'proper' rectangular block.
- // We do not want that in all cases, so we manually set selections.
- for (var i = selectionStart.line; i < selectionEnd.line; i++) {
- var anchor = Pos(i, selectionStart.ch);
- var head = Pos(i, selectionEnd.ch);
- var range = {anchor: anchor, head: head};
- selections.push(range);
- }
- cm.setSelections(selections);
- } else {
- var start = lastSelection.anchorMark.find();
- var end = lastSelection.headMark.find();
- var line = end.line - start.line;
- var ch = end.ch - start.ch;
- selectionEnd = {line: selectionEnd.line + line, ch: line ? selectionEnd.ch : ch + selectionEnd.ch};
- if (lastSelection.visualLine) {
- selectionStart = Pos(selectionStart.line, 0);
- selectionEnd = Pos(selectionEnd.line, lineLength(cm, selectionEnd.line));
- }
- cm.setSelection(selectionStart, selectionEnd);
- }
- return [selectionStart, selectionEnd];
- };
- if (!vim.visualMode) {
- // In case of replaying the action.
- return getLastSelectedAreaRange();
- } else {
- return getCurrentSelectedAreaRange();
- }
- }
- // Updates the previous selection with the current selection's values. This
- // should only be called in visual mode.
- function updateLastSelection(cm, vim) {
- var anchor = vim.sel.anchor;
- var head = vim.sel.head;
- // To accommodate the effect of lastPastedText in the last selection
- if (vim.lastPastedText) {
- head = cm.posFromIndex(cm.indexFromPos(anchor) + vim.lastPastedText.length);
- vim.lastPastedText = null;
- }
- vim.lastSelection = {'anchorMark': cm.setBookmark(anchor),
- 'headMark': cm.setBookmark(head),
- 'anchor': copyCursor(anchor),
- 'head': copyCursor(head),
- 'visualMode': vim.visualMode,
- 'visualLine': vim.visualLine,
- 'visualBlock': vim.visualBlock};
- }
- function expandSelection(cm, start, end) {
- var sel = cm.state.vim.sel;
- var head = sel.head;
- var anchor = sel.anchor;
- var tmp;
- if (cursorIsBefore(end, start)) {
- tmp = end;
- end = start;
- start = tmp;
- }
- if (cursorIsBefore(head, anchor)) {
- head = cursorMin(start, head);
- anchor = cursorMax(anchor, end);
- } else {
- anchor = cursorMin(start, anchor);
- head = cursorMax(head, end);
- head = offsetCursor(head, 0, -1);
- if (head.ch == -1 && head.line != cm.firstLine()) {
- head = Pos(head.line - 1, lineLength(cm, head.line - 1));
- }
- }
- return [anchor, head];
- }
- /**
- * Updates the CodeMirror selection to match the provided vim selection.
- * If no arguments are given, it uses the current vim selection state.
- */
- function updateCmSelection(cm, sel, mode) {
- var vim = cm.state.vim;
- sel = sel || vim.sel;
- var mode = mode ||
- vim.visualLine ? 'line' : vim.visualBlock ? 'block' : 'char';
- var cmSel = makeCmSelection(cm, sel, mode);
- cm.setSelections(cmSel.ranges, cmSel.primary);
- updateFakeCursor(cm);
- }
- function makeCmSelection(cm, sel, mode, exclusive) {
- var head = copyCursor(sel.head);
- var anchor = copyCursor(sel.anchor);
- if (mode == 'char') {
- var headOffset = !exclusive && !cursorIsBefore(sel.head, sel.anchor) ? 1 : 0;
- var anchorOffset = cursorIsBefore(sel.head, sel.anchor) ? 1 : 0;
- head = offsetCursor(sel.head, 0, headOffset);
- anchor = offsetCursor(sel.anchor, 0, anchorOffset);
- return {
- ranges: [{anchor: anchor, head: head}],
- primary: 0
- };
- } else if (mode == 'line') {
- if (!cursorIsBefore(sel.head, sel.anchor)) {
- anchor.ch = 0;
-
- var lastLine = cm.lastLine();
- if (head.line > lastLine) {
- head.line = lastLine;
- }
- head.ch = lineLength(cm, head.line);
- } else {
- head.ch = 0;
- anchor.ch = lineLength(cm, anchor.line);
- }
- return {
- ranges: [{anchor: anchor, head: head}],
- primary: 0
- };
- } else if (mode == 'block') {
- var top = Math.min(anchor.line, head.line),
- left = Math.min(anchor.ch, head.ch),
- bottom = Math.max(anchor.line, head.line),
- right = Math.max(anchor.ch, head.ch) + 1;
- var height = bottom - top + 1;
- var primary = head.line == top ? 0 : height - 1;
- var ranges = [];
- for (var i = 0; i < height; i++) {
- ranges.push({
- anchor: Pos(top + i, left),
- head: Pos(top + i, right)
- });
- }
- return {
- ranges: ranges,
- primary: primary
- };
- }
- }
- function getHead(cm) {
- var cur = cm.getCursor('head');
- if (cm.getSelection().length == 1) {
- // Small corner case when only 1 character is selected. The "real"
- // head is the left of head and anchor.
- cur = cursorMin(cur, cm.getCursor('anchor'));
- }
- return cur;
- }
-
- /**
- * If moveHead is set to false, the CodeMirror selection will not be
- * touched. The caller assumes the responsibility of putting the cursor
- * in the right place.
- */
- function exitVisualMode(cm, moveHead) {
- var vim = cm.state.vim;
- if (moveHead !== false) {
- cm.setCursor(clipCursorToContent(cm, vim.sel.head));
- }
- updateLastSelection(cm, vim);
- vim.visualMode = false;
- vim.visualLine = false;
- vim.visualBlock = false;
- CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
- if (vim.fakeCursor) {
- vim.fakeCursor.clear();
- }
- }
-
- // Remove any trailing newlines from the selection. For
- // example, with the caret at the start of the last word on the line,
- // 'dw' should word, but not the newline, while 'w' should advance the
- // caret to the first character of the next line.
- function clipToLine(cm, curStart, curEnd) {
- var selection = cm.getRange(curStart, curEnd);
- // Only clip if the selection ends with trailing newline + whitespace
- if (/\n\s*$/.test(selection)) {
- var lines = selection.split('\n');
- // We know this is all whitespace.
- lines.pop();
-
- // Cases:
- // 1. Last word is an empty line - do not clip the trailing '\n'
- // 2. Last word is not an empty line - clip the trailing '\n'
- var line;
- // Find the line containing the last word, and clip all whitespace up
- // to it.
- for (var line = lines.pop(); lines.length > 0 && line && isWhiteSpaceString(line); line = lines.pop()) {
- curEnd.line--;
- curEnd.ch = 0;
- }
- // If the last word is not an empty line, clip an additional newline
- if (line) {
- curEnd.line--;
- curEnd.ch = lineLength(cm, curEnd.line);
- } else {
- curEnd.ch = 0;
- }
- }
- }
-
- // Expand the selection to line ends.
- function expandSelectionToLine(_cm, curStart, curEnd) {
- curStart.ch = 0;
- curEnd.ch = 0;
- curEnd.line++;
- }
-
- function findFirstNonWhiteSpaceCharacter(text) {
- if (!text) {
- return 0;
- }
- var firstNonWS = text.search(/\S/);
- return firstNonWS == -1 ? text.length : firstNonWS;
- }
-
- function expandWordUnderCursor(cm, inclusive, _forward, bigWord, noSymbol) {
- var cur = getHead(cm);
- var line = cm.getLine(cur.line);
- var idx = cur.ch;
-
- // Seek to first word or non-whitespace character, depending on if
- // noSymbol is true.
- var test = noSymbol ? wordCharTest[0] : bigWordCharTest [0];
- while (!test(line.charAt(idx))) {
- idx++;
- if (idx >= line.length) { return null; }
- }
-
- if (bigWord) {
- test = bigWordCharTest[0];
- } else {
- test = wordCharTest[0];
- if (!test(line.charAt(idx))) {
- test = wordCharTest[1];
- }
- }
-
- var end = idx, start = idx;
- while (test(line.charAt(end)) && end < line.length) { end++; }
- while (test(line.charAt(start)) && start >= 0) { start--; }
- start++;
-
- if (inclusive) {
- // If present, include all whitespace after word.
- // Otherwise, include all whitespace before word, except indentation.
- var wordEnd = end;
- while (/\s/.test(line.charAt(end)) && end < line.length) { end++; }
- if (wordEnd == end) {
- var wordStart = start;
- while (/\s/.test(line.charAt(start - 1)) && start > 0) { start--; }
- if (!start) { start = wordStart; }
- }
- }
- return { start: Pos(cur.line, start), end: Pos(cur.line, end) };
- }
-
- function recordJumpPosition(cm, oldCur, newCur) {
- if (!cursorEqual(oldCur, newCur)) {
- vimGlobalState.jumpList.add(cm, oldCur, newCur);
- }
- }
-
- function recordLastCharacterSearch(increment, args) {
- vimGlobalState.lastCharacterSearch.increment = increment;
- vimGlobalState.lastCharacterSearch.forward = args.forward;
- vimGlobalState.lastCharacterSearch.selectedCharacter = args.selectedCharacter;
- }
-
- var symbolToMode = {
- '(': 'bracket', ')': 'bracket', '{': 'bracket', '}': 'bracket',
- '[': 'section', ']': 'section',
- '*': 'comment', '/': 'comment',
- 'm': 'method', 'M': 'method',
- '#': 'preprocess'
- };
- var findSymbolModes = {
- bracket: {
- isComplete: function(state) {
- if (state.nextCh === state.symb) {
- state.depth++;
- if (state.depth >= 1)return true;
- } else if (state.nextCh === state.reverseSymb) {
- state.depth--;
- }
- return false;
- }
- },
- section: {
- init: function(state) {
- state.curMoveThrough = true;
- state.symb = (state.forward ? ']' : '[') === state.symb ? '{' : '}';
- },
- isComplete: function(state) {
- return state.index === 0 && state.nextCh === state.symb;
- }
- },
- comment: {
- isComplete: function(state) {
- var found = state.lastCh === '*' && state.nextCh === '/';
- state.lastCh = state.nextCh;
- return found;
- }
- },
- // TODO: The original Vim implementation only operates on level 1 and 2.
- // The current implementation doesn't check for code block level and
- // therefore it operates on any levels.
- method: {
- init: function(state) {
- state.symb = (state.symb === 'm' ? '{' : '}');
- state.reverseSymb = state.symb === '{' ? '}' : '{';
- },
- isComplete: function(state) {
- if (state.nextCh === state.symb)return true;
- return false;
- }
- },
- preprocess: {
- init: function(state) {
- state.index = 0;
- },
- isComplete: function(state) {
- if (state.nextCh === '#') {
- var token = state.lineText.match(/#(\w+)/)[1];
- if (token === 'endif') {
- if (state.forward && state.depth === 0) {
- return true;
- }
- state.depth++;
- } else if (token === 'if') {
- if (!state.forward && state.depth === 0) {
- return true;
- }
- state.depth--;
- }
- if (token === 'else' && state.depth === 0)return true;
- }
- return false;
- }
- }
- };
- function findSymbol(cm, repeat, forward, symb) {
- var cur = copyCursor(cm.getCursor());
- var increment = forward ? 1 : -1;
- var endLine = forward ? cm.lineCount() : -1;
- var curCh = cur.ch;
- var line = cur.line;
- var lineText = cm.getLine(line);
- var state = {
- lineText: lineText,
- nextCh: lineText.charAt(curCh),
- lastCh: null,
- index: curCh,
- symb: symb,
- reverseSymb: (forward ? { ')': '(', '}': '{' } : { '(': ')', '{': '}' })[symb],
- forward: forward,
- depth: 0,
- curMoveThrough: false
- };
- var mode = symbolToMode[symb];
- if (!mode)return cur;
- var init = findSymbolModes[mode].init;
- var isComplete = findSymbolModes[mode].isComplete;
- if (init) { init(state); }
- while (line !== endLine && repeat) {
- state.index += increment;
- state.nextCh = state.lineText.charAt(state.index);
- if (!state.nextCh) {
- line += increment;
- state.lineText = cm.getLine(line) || '';
- if (increment > 0) {
- state.index = 0;
- } else {
- var lineLen = state.lineText.length;
- state.index = (lineLen > 0) ? (lineLen-1) : 0;
- }
- state.nextCh = state.lineText.charAt(state.index);
- }
- if (isComplete(state)) {
- cur.line = line;
- cur.ch = state.index;
- repeat--;
- }
- }
- if (state.nextCh || state.curMoveThrough) {
- return Pos(line, state.index);
- }
- return cur;
- }
-
- /**
- * Returns the boundaries of the next word. If the cursor in the middle of
- * the word, then returns the boundaries of the current word, starting at
- * the cursor. If the cursor is at the start/end of a word, and we are going
- * forward/backward, respectively, find the boundaries of the next word.
- *
- * @param {CodeMirror} cm CodeMirror object.
- * @param {Cursor} cur The cursor position.
- * @param {boolean} forward True to search forward. False to search
- * backward.
- * @param {boolean} bigWord True if punctuation count as part of the word.
- * False if only [a-zA-Z0-9] characters count as part of the word.
- * @param {boolean} emptyLineIsWord True if empty lines should be treated
- * as words.
- * @return {Object{from:number, to:number, line: number}} The boundaries of
- * the word, or null if there are no more words.
- */
- function findWord(cm, cur, forward, bigWord, emptyLineIsWord) {
- var lineNum = cur.line;
- var pos = cur.ch;
- var line = cm.getLine(lineNum);
- var dir = forward ? 1 : -1;
- var charTests = bigWord ? bigWordCharTest: wordCharTest;
-
- if (emptyLineIsWord && line == '') {
- lineNum += dir;
- line = cm.getLine(lineNum);
- if (!isLine(cm, lineNum)) {
- return null;
- }
- pos = (forward) ? 0 : line.length;
- }
-
- while (true) {
- if (emptyLineIsWord && line == '') {
- return { from: 0, to: 0, line: lineNum };
- }
- var stop = (dir > 0) ? line.length : -1;
- var wordStart = stop, wordEnd = stop;
- // Find bounds of next word.
- while (pos != stop) {
- var foundWord = false;
- for (var i = 0; i < charTests.length && !foundWord; ++i) {
- if (charTests[i](line.charAt(pos))) {
- wordStart = pos;
- // Advance to end of word.
- while (pos != stop && charTests[i](line.charAt(pos))) {
- pos += dir;
- }
- wordEnd = pos;
- foundWord = wordStart != wordEnd;
- if (wordStart == cur.ch && lineNum == cur.line &&
- wordEnd == wordStart + dir) {
- // We started at the end of a word. Find the next one.
- continue;
- } else {
- return {
- from: Math.min(wordStart, wordEnd + 1),
- to: Math.max(wordStart, wordEnd),
- line: lineNum };
- }
- }
- }
- if (!foundWord) {
- pos += dir;
- }
- }
- // Advance to next/prev line.
- lineNum += dir;
- if (!isLine(cm, lineNum)) {
- return null;
- }
- line = cm.getLine(lineNum);
- pos = (dir > 0) ? 0 : line.length;
- }
- }
-
- /**
- * @param {CodeMirror} cm CodeMirror object.
- * @param {Pos} cur The position to start from.
- * @param {int} repeat Number of words to move past.
- * @param {boolean} forward True to search forward. False to search
- * backward.
- * @param {boolean} wordEnd True to move to end of word. False to move to
- * beginning of word.
- * @param {boolean} bigWord True if punctuation count as part of the word.
- * False if only alphabet characters count as part of the word.
- * @return {Cursor} The position the cursor should move to.
- */
- function moveToWord(cm, cur, repeat, forward, wordEnd, bigWord) {
- var curStart = copyCursor(cur);
- var words = [];
- if (forward && !wordEnd || !forward && wordEnd) {
- repeat++;
- }
- // For 'e', empty lines are not considered words, go figure.
- var emptyLineIsWord = !(forward && wordEnd);
- for (var i = 0; i < repeat; i++) {
- var word = findWord(cm, cur, forward, bigWord, emptyLineIsWord);
- if (!word) {
- var eodCh = lineLength(cm, cm.lastLine());
- words.push(forward
- ? {line: cm.lastLine(), from: eodCh, to: eodCh}
- : {line: 0, from: 0, to: 0});
- break;
- }
- words.push(word);
- cur = Pos(word.line, forward ? (word.to - 1) : word.from);
- }
- var shortCircuit = words.length != repeat;
- var firstWord = words[0];
- var lastWord = words.pop();
- if (forward && !wordEnd) {
- // w
- if (!shortCircuit && (firstWord.from != curStart.ch || firstWord.line != curStart.line)) {
- // We did not start in the middle of a word. Discard the extra word at the end.
- lastWord = words.pop();
- }
- return Pos(lastWord.line, lastWord.from);
- } else if (forward && wordEnd) {
- return Pos(lastWord.line, lastWord.to - 1);
- } else if (!forward && wordEnd) {
- // ge
- if (!shortCircuit && (firstWord.to != curStart.ch || firstWord.line != curStart.line)) {
- // We did not start in the middle of a word. Discard the extra word at the end.
- lastWord = words.pop();
- }
- return Pos(lastWord.line, lastWord.to);
- } else {
- // b
- return Pos(lastWord.line, lastWord.from);
- }
- }
-
- function moveToCharacter(cm, repeat, forward, character) {
- var cur = cm.getCursor();
- var start = cur.ch;
- var idx;
- for (var i = 0; i < repeat; i ++) {
- var line = cm.getLine(cur.line);
- idx = charIdxInLine(start, line, character, forward, true);
- if (idx == -1) {
- return null;
- }
- start = idx;
- }
- return Pos(cm.getCursor().line, idx);
- }
-
- function moveToColumn(cm, repeat) {
- // repeat is always >= 1, so repeat - 1 always corresponds
- // to the column we want to go to.
- var line = cm.getCursor().line;
- return clipCursorToContent(cm, Pos(line, repeat - 1));
- }
-
- function updateMark(cm, vim, markName, pos) {
- if (!inArray(markName, validMarks)) {
- return;
- }
- if (vim.marks[markName]) {
- vim.marks[markName].clear();
- }
- vim.marks[markName] = cm.setBookmark(pos);
- }
-
- function charIdxInLine(start, line, character, forward, includeChar) {
- // Search for char in line.
- // motion_options: {forward, includeChar}
- // If includeChar = true, include it too.
- // If forward = true, search forward, else search backwards.
- // If char is not found on this line, do nothing
- var idx;
- if (forward) {
- idx = line.indexOf(character, start + 1);
- if (idx != -1 && !includeChar) {
- idx -= 1;
- }
- } else {
- idx = line.lastIndexOf(character, start - 1);
- if (idx != -1 && !includeChar) {
- idx += 1;
- }
- }
- return idx;
- }
-
- function findParagraph(cm, head, repeat, dir, inclusive) {
- var line = head.line;
- var min = cm.firstLine();
- var max = cm.lastLine();
- var start, end, i = line;
- function isEmpty(i) { return !cm.getLine(i); }
- function isBoundary(i, dir, any) {
- if (any) { return isEmpty(i) != isEmpty(i + dir); }
- return !isEmpty(i) && isEmpty(i + dir);
- }
- if (dir) {
- while (min <= i && i <= max && repeat > 0) {
- if (isBoundary(i, dir)) { repeat--; }
- i += dir;
- }
- return new Pos(i, 0);
- }
-
- var vim = cm.state.vim;
- if (vim.visualLine && isBoundary(line, 1, true)) {
- var anchor = vim.sel.anchor;
- if (isBoundary(anchor.line, -1, true)) {
- if (!inclusive || anchor.line != line) {
- line += 1;
- }
- }
- }
- var startState = isEmpty(line);
- for (i = line; i <= max && repeat; i++) {
- if (isBoundary(i, 1, true)) {
- if (!inclusive || isEmpty(i) != startState) {
- repeat--;
- }
- }
- }
- end = new Pos(i, 0);
- // select boundary before paragraph for the last one
- if (i > max && !startState) { startState = true; }
- else { inclusive = false; }
- for (i = line; i > min; i--) {
- if (!inclusive || isEmpty(i) == startState || i == line) {
- if (isBoundary(i, -1, true)) { break; }
- }
- }
- start = new Pos(i, 0);
- return { start: start, end: end };
- }
-
- // TODO: perhaps this finagling of start and end positions belonds
- // in codemirror/replaceRange?
- function selectCompanionObject(cm, head, symb, inclusive) {
- var cur = head, start, end;
-
- var bracketRegexp = ({
- '(': /[()]/, ')': /[()]/,
- '[': /[[\]]/, ']': /[[\]]/,
- '{': /[{}]/, '}': /[{}]/})[symb];
- var openSym = ({
- '(': '(', ')': '(',
- '[': '[', ']': '[',
- '{': '{', '}': '{'})[symb];
- var curChar = cm.getLine(cur.line).charAt(cur.ch);
- // Due to the behavior of scanForBracket, we need to add an offset if the
- // cursor is on a matching open bracket.
- var offset = curChar === openSym ? 1 : 0;
-
- start = cm.scanForBracket(Pos(cur.line, cur.ch + offset), -1, null, {'bracketRegex': bracketRegexp});
- end = cm.scanForBracket(Pos(cur.line, cur.ch + offset), 1, null, {'bracketRegex': bracketRegexp});
-
- if (!start || !end) {
- return { start: cur, end: cur };
- }
-
- start = start.pos;
- end = end.pos;
-
- if ((start.line == end.line && start.ch > end.ch)
- || (start.line > end.line)) {
- var tmp = start;
- start = end;
- end = tmp;
- }
-
- if (inclusive) {
- end.ch += 1;
- } else {
- start.ch += 1;
- }
-
- return { start: start, end: end };
- }
-
- // Takes in a symbol and a cursor and tries to simulate text objects that
- // have identical opening and closing symbols
- // TODO support across multiple lines
- function findBeginningAndEnd(cm, head, symb, inclusive) {
- var cur = copyCursor(head);
- var line = cm.getLine(cur.line);
- var chars = line.split('');
- var start, end, i, len;
- var firstIndex = chars.indexOf(symb);
-
- // the decision tree is to always look backwards for the beginning first,
- // but if the cursor is in front of the first instance of the symb,
- // then move the cursor forward
- if (cur.ch < firstIndex) {
- cur.ch = firstIndex;
- // Why is this line even here???
- // cm.setCursor(cur.line, firstIndex+1);
- }
- // otherwise if the cursor is currently on the closing symbol
- else if (firstIndex < cur.ch && chars[cur.ch] == symb) {
- end = cur.ch; // assign end to the current cursor
- --cur.ch; // make sure to look backwards
- }
-
- // if we're currently on the symbol, we've got a start
- if (chars[cur.ch] == symb && !end) {
- start = cur.ch + 1; // assign start to ahead of the cursor
- } else {
- // go backwards to find the start
- for (i = cur.ch; i > -1 && !start; i--) {
- if (chars[i] == symb) {
- start = i + 1;
- }
- }
- }
-
- // look forwards for the end symbol
- if (start && !end) {
- for (i = start, len = chars.length; i < len && !end; i++) {
- if (chars[i] == symb) {
- end = i;
- }
- }
- }
-
- // nothing found
- if (!start || !end) {
- return { start: cur, end: cur };
- }
-
- // include the symbols
- if (inclusive) {
- --start; ++end;
- }
-
- return {
- start: Pos(cur.line, start),
- end: Pos(cur.line, end)
- };
- }
-
- // Search functions
- defineOption('pcre', true, 'boolean');
- function SearchState() {}
- SearchState.prototype = {
- getQuery: function() {
- return vimGlobalState.query;
- },
- setQuery: function(query) {
- vimGlobalState.query = query;
- },
- getOverlay: function() {
- return this.searchOverlay;
- },
- setOverlay: function(overlay) {
- this.searchOverlay = overlay;
- },
- isReversed: function() {
- return vimGlobalState.isReversed;
- },
- setReversed: function(reversed) {
- vimGlobalState.isReversed = reversed;
- },
- getScrollbarAnnotate: function() {
- return this.annotate;
- },
- setScrollbarAnnotate: function(annotate) {
- this.annotate = annotate;
- }
- };
- function getSearchState(cm) {
- var vim = cm.state.vim;
- return vim.searchState_ || (vim.searchState_ = new SearchState());
- }
- function dialog(cm, template, shortText, onClose, options) {
- if (cm.openDialog) {
- cm.openDialog(template, onClose, { bottom: true, value: options.value,
- onKeyDown: options.onKeyDown, onKeyUp: options.onKeyUp,
- selectValueOnOpen: false});
- }
- else {
- onClose(prompt(shortText, ''));
- }
- }
- function splitBySlash(argString) {
- var slashes = findUnescapedSlashes(argString) || [];
- if (!slashes.length) return [];
- var tokens = [];
- // in case of strings like foo/bar
- if (slashes[0] !== 0) return;
- for (var i = 0; i < slashes.length; i++) {
- if (typeof slashes[i] == 'number')
- tokens.push(argString.substring(slashes[i] + 1, slashes[i+1]));
- }
- return tokens;
- }
-
- function findUnescapedSlashes(str) {
- var escapeNextChar = false;
- var slashes = [];
- for (var i = 0; i < str.length; i++) {
- var c = str.charAt(i);
- if (!escapeNextChar && c == '/') {
- slashes.push(i);
- }
- escapeNextChar = !escapeNextChar && (c == '\\');
- }
- return slashes;
- }
-
- // Translates a search string from ex (vim) syntax into javascript form.
- function translateRegex(str) {
- // When these match, add a '\' if unescaped or remove one if escaped.
- var specials = '|(){';
- // Remove, but never add, a '\' for these.
- var unescape = '}';
- var escapeNextChar = false;
- var out = [];
- for (var i = -1; i < str.length; i++) {
- var c = str.charAt(i) || '';
- var n = str.charAt(i+1) || '';
- var specialComesNext = (n && specials.indexOf(n) != -1);
- if (escapeNextChar) {
- if (c !== '\\' || !specialComesNext) {
- out.push(c);
- }
- escapeNextChar = false;
- } else {
- if (c === '\\') {
- escapeNextChar = true;
- // Treat the unescape list as special for removing, but not adding '\'.
- if (n && unescape.indexOf(n) != -1) {
- specialComesNext = true;
- }
- // Not passing this test means removing a '\'.
- if (!specialComesNext || n === '\\') {
- out.push(c);
- }
- } else {
- out.push(c);
- if (specialComesNext && n !== '\\') {
- out.push('\\');
- }
- }
- }
- }
- return out.join('');
- }
-
- // Translates the replace part of a search and replace from ex (vim) syntax into
- // javascript form. Similar to translateRegex, but additionally fixes back references
- // (translates '\[0..9]' to '$[0..9]') and follows different rules for escaping '$'.
- var charUnescapes = {'\\n': '\n', '\\r': '\r', '\\t': '\t'};
- function translateRegexReplace(str) {
- var escapeNextChar = false;
- var out = [];
- for (var i = -1; i < str.length; i++) {
- var c = str.charAt(i) || '';
- var n = str.charAt(i+1) || '';
- if (charUnescapes[c + n]) {
- out.push(charUnescapes[c+n]);
- i++;
- } else if (escapeNextChar) {
- // At any point in the loop, escapeNextChar is true if the previous
- // character was a '\' and was not escaped.
- out.push(c);
- escapeNextChar = false;
- } else {
- if (c === '\\') {
- escapeNextChar = true;
- if ((isNumber(n) || n === '$')) {
- out.push('$');
- } else if (n !== '/' && n !== '\\') {
- out.push('\\');
- }
- } else {
- if (c === '$') {
- out.push('$');
- }
- out.push(c);
- if (n === '/') {
- out.push('\\');
- }
- }
- }
- }
- return out.join('');
- }
-
- // Unescape \ and / in the replace part, for PCRE mode.
- var unescapes = {'\\/': '/', '\\\\': '\\', '\\n': '\n', '\\r': '\r', '\\t': '\t'};
- function unescapeRegexReplace(str) {
- var stream = new CodeMirror.StringStream(str);
- var output = [];
- while (!stream.eol()) {
- // Search for \.
- while (stream.peek() && stream.peek() != '\\') {
- output.push(stream.next());
- }
- var matched = false;
- for (var matcher in unescapes) {
- if (stream.match(matcher, true)) {
- matched = true;
- output.push(unescapes[matcher]);
- break;
- }
- }
- if (!matched) {
- // Don't change anything
- output.push(stream.next());
- }
- }
- return output.join('');
- }
-
- /**
- * Extract the regular expression from the query and return a Regexp object.
- * Returns null if the query is blank.
- * If ignoreCase is passed in, the Regexp object will have the 'i' flag set.
- * If smartCase is passed in, and the query contains upper case letters,
- * then ignoreCase is overridden, and the 'i' flag will not be set.
- * If the query contains the /i in the flag part of the regular expression,
- * then both ignoreCase and smartCase are ignored, and 'i' will be passed
- * through to the Regex object.
- */
- function parseQuery(query, ignoreCase, smartCase) {
- // First update the last search register
- var lastSearchRegister = vimGlobalState.registerController.getRegister('/');
- lastSearchRegister.setText(query);
- // Check if the query is already a regex.
- if (query instanceof RegExp) { return query; }
- // First try to extract regex + flags from the input. If no flags found,
- // extract just the regex. IE does not accept flags directly defined in
- // the regex string in the form /regex/flags
- var slashes = findUnescapedSlashes(query);
- var regexPart;
- var forceIgnoreCase;
- if (!slashes.length) {
- // Query looks like 'regexp'
- regexPart = query;
- } else {
- // Query looks like 'regexp/...'
- regexPart = query.substring(0, slashes[0]);
- var flagsPart = query.substring(slashes[0]);
- forceIgnoreCase = (flagsPart.indexOf('i') != -1);
- }
- if (!regexPart) {
- return null;
- }
- if (!getOption('pcre')) {
- regexPart = translateRegex(regexPart);
- }
- if (smartCase) {
- ignoreCase = (/^[^A-Z]*$/).test(regexPart);
- }
- var regexp = new RegExp(regexPart,
- (ignoreCase || forceIgnoreCase) ? 'i' : undefined);
- return regexp;
- }
- function showConfirm(cm, text) {
- if (cm.openNotification) {
- cm.openNotification('' + text + ' ',
- {bottom: true, duration: 5000});
- } else {
- alert(text);
- }
- }
- function makePrompt(prefix, desc) {
- var raw = '' +
- (prefix || "") + ' ';
- if (desc)
- raw += ' ' + desc + ' ';
- return raw;
- }
- var searchPromptDesc = '(Javascript regexp)';
- function showPrompt(cm, options) {
- var shortText = (options.prefix || '') + ' ' + (options.desc || '');
- var prompt = makePrompt(options.prefix, options.desc);
- dialog(cm, prompt, shortText, options.onClose, options);
- }
- function regexEqual(r1, r2) {
- if (r1 instanceof RegExp && r2 instanceof RegExp) {
- var props = ['global', 'multiline', 'ignoreCase', 'source'];
- for (var i = 0; i < props.length; i++) {
- var prop = props[i];
- if (r1[prop] !== r2[prop]) {
- return false;
- }
- }
- return true;
- }
- return false;
- }
- // Returns true if the query is valid.
- function updateSearchQuery(cm, rawQuery, ignoreCase, smartCase) {
- if (!rawQuery) {
- return;
- }
- var state = getSearchState(cm);
- var query = parseQuery(rawQuery, !!ignoreCase, !!smartCase);
- if (!query) {
- return;
- }
- highlightSearchMatches(cm, query);
- if (regexEqual(query, state.getQuery())) {
- return query;
- }
- state.setQuery(query);
- return query;
- }
- function searchOverlay(query) {
- if (query.source.charAt(0) == '^') {
- var matchSol = true;
- }
- return {
- token: function(stream) {
- if (matchSol && !stream.sol()) {
- stream.skipToEnd();
- return;
- }
- var match = stream.match(query, false);
- if (match) {
- if (match[0].length == 0) {
- // Matched empty string, skip to next.
- stream.next();
- return 'searching';
- }
- if (!stream.sol()) {
- // Backtrack 1 to match \b
- stream.backUp(1);
- if (!query.exec(stream.next() + match[0])) {
- stream.next();
- return null;
- }
- }
- stream.match(query);
- return 'searching';
- }
- while (!stream.eol()) {
- stream.next();
- if (stream.match(query, false)) break;
- }
- },
- query: query
- };
- }
- function highlightSearchMatches(cm, query) {
- var searchState = getSearchState(cm);
- var overlay = searchState.getOverlay();
- if (!overlay || query != overlay.query) {
- if (overlay) {
- cm.removeOverlay(overlay);
- }
- overlay = searchOverlay(query);
- cm.addOverlay(overlay);
- if (cm.showMatchesOnScrollbar) {
- if (searchState.getScrollbarAnnotate()) {
- searchState.getScrollbarAnnotate().clear();
- }
- searchState.setScrollbarAnnotate(cm.showMatchesOnScrollbar(query));
- }
- searchState.setOverlay(overlay);
- }
- }
- function findNext(cm, prev, query, repeat) {
- if (repeat === undefined) { repeat = 1; }
- return cm.operation(function() {
- var pos = cm.getCursor();
- var cursor = cm.getSearchCursor(query, pos);
- for (var i = 0; i < repeat; i++) {
- var found = cursor.find(prev);
- if (i == 0 && found && cursorEqual(cursor.from(), pos)) { found = cursor.find(prev); }
- if (!found) {
- // SearchCursor may have returned null because it hit EOF, wrap
- // around and try again.
- cursor = cm.getSearchCursor(query,
- (prev) ? Pos(cm.lastLine()) : Pos(cm.firstLine(), 0) );
- if (!cursor.find(prev)) {
- return;
- }
- }
- }
- return cursor.from();
- });
- }
- function clearSearchHighlight(cm) {
- var state = getSearchState(cm);
- cm.removeOverlay(getSearchState(cm).getOverlay());
- state.setOverlay(null);
- if (state.getScrollbarAnnotate()) {
- state.getScrollbarAnnotate().clear();
- state.setScrollbarAnnotate(null);
- }
- }
- /**
- * Check if pos is in the specified range, INCLUSIVE.
- * Range can be specified with 1 or 2 arguments.
- * If the first range argument is an array, treat it as an array of line
- * numbers. Match pos against any of the lines.
- * If the first range argument is a number,
- * if there is only 1 range argument, check if pos has the same line
- * number
- * if there are 2 range arguments, then check if pos is in between the two
- * range arguments.
- */
- function isInRange(pos, start, end) {
- if (typeof pos != 'number') {
- // Assume it is a cursor position. Get the line number.
- pos = pos.line;
- }
- if (start instanceof Array) {
- return inArray(pos, start);
- } else {
- if (end) {
- return (pos >= start && pos <= end);
- } else {
- return pos == start;
- }
- }
- }
- function getUserVisibleLines(cm) {
- var scrollInfo = cm.getScrollInfo();
- var occludeToleranceTop = 6;
- var occludeToleranceBottom = 10;
- var from = cm.coordsChar({left:0, top: occludeToleranceTop + scrollInfo.top}, 'local');
- var bottomY = scrollInfo.clientHeight - occludeToleranceBottom + scrollInfo.top;
- var to = cm.coordsChar({left:0, top: bottomY}, 'local');
- return {top: from.line, bottom: to.line};
- }
-
- var ExCommandDispatcher = function() {
- this.buildCommandMap_();
- };
- ExCommandDispatcher.prototype = {
- processCommand: function(cm, input, opt_params) {
- var that = this;
- cm.operation(function () {
- cm.curOp.isVimOp = true;
- that._processCommand(cm, input, opt_params);
- });
- },
- _processCommand: function(cm, input, opt_params) {
- var vim = cm.state.vim;
- var commandHistoryRegister = vimGlobalState.registerController.getRegister(':');
- var previousCommand = commandHistoryRegister.toString();
- if (vim.visualMode) {
- exitVisualMode(cm);
- }
- var inputStream = new CodeMirror.StringStream(input);
- // update ": with the latest command whether valid or invalid
- commandHistoryRegister.setText(input);
- var params = opt_params || {};
- params.input = input;
- try {
- this.parseInput_(cm, inputStream, params);
- } catch(e) {
- showConfirm(cm, e);
- throw e;
- }
- var command;
- var commandName;
- if (!params.commandName) {
- // If only a line range is defined, move to the line.
- if (params.line !== undefined) {
- commandName = 'move';
- }
- } else {
- command = this.matchCommand_(params.commandName);
- if (command) {
- commandName = command.name;
- if (command.excludeFromCommandHistory) {
- commandHistoryRegister.setText(previousCommand);
- }
- this.parseCommandArgs_(inputStream, params, command);
- if (command.type == 'exToKey') {
- // Handle Ex to Key mapping.
- for (var i = 0; i < command.toKeys.length; i++) {
- CodeMirror.Vim.handleKey(cm, command.toKeys[i], 'mapping');
- }
- return;
- } else if (command.type == 'exToEx') {
- // Handle Ex to Ex mapping.
- this.processCommand(cm, command.toInput);
- return;
- }
- }
- }
- if (!commandName) {
- showConfirm(cm, 'Not an editor command ":' + input + '"');
- return;
- }
- try {
- exCommands[commandName](cm, params);
- // Possibly asynchronous commands (e.g. substitute, which might have a
- // user confirmation), are responsible for calling the callback when
- // done. All others have it taken care of for them here.
- if ((!command || !command.possiblyAsync) && params.callback) {
- params.callback();
- }
- } catch(e) {
- showConfirm(cm, e);
- throw e;
- }
- },
- parseInput_: function(cm, inputStream, result) {
- inputStream.eatWhile(':');
- // Parse range.
- if (inputStream.eat('%')) {
- result.line = cm.firstLine();
- result.lineEnd = cm.lastLine();
- } else {
- result.line = this.parseLineSpec_(cm, inputStream);
- if (result.line !== undefined && inputStream.eat(',')) {
- result.lineEnd = this.parseLineSpec_(cm, inputStream);
- }
- }
-
- // Parse command name.
- var commandMatch = inputStream.match(/^(\w+)/);
- if (commandMatch) {
- result.commandName = commandMatch[1];
- } else {
- result.commandName = inputStream.match(/.*/)[0];
- }
-
- return result;
- },
- parseLineSpec_: function(cm, inputStream) {
- var numberMatch = inputStream.match(/^(\d+)/);
- if (numberMatch) {
- return parseInt(numberMatch[1], 10) - 1;
- }
- switch (inputStream.next()) {
- case '.':
- return cm.getCursor().line;
- case '$':
- return cm.lastLine();
- case '\'':
- var mark = cm.state.vim.marks[inputStream.next()];
- if (mark && mark.find()) {
- return mark.find().line;
- }
- throw new Error('Mark not set');
- default:
- inputStream.backUp(1);
- return undefined;
- }
- },
- parseCommandArgs_: function(inputStream, params, command) {
- if (inputStream.eol()) {
- return;
- }
- params.argString = inputStream.match(/.*/)[0];
- // Parse command-line arguments
- var delim = command.argDelimiter || /\s+/;
- var args = trim(params.argString).split(delim);
- if (args.length && args[0]) {
- params.args = args;
- }
- },
- matchCommand_: function(commandName) {
- // Return the command in the command map that matches the shortest
- // prefix of the passed in command name. The match is guaranteed to be
- // unambiguous if the defaultExCommandMap's shortNames are set up
- // correctly. (see @code{defaultExCommandMap}).
- for (var i = commandName.length; i > 0; i--) {
- var prefix = commandName.substring(0, i);
- if (this.commandMap_[prefix]) {
- var command = this.commandMap_[prefix];
- if (command.name.indexOf(commandName) === 0) {
- return command;
- }
- }
- }
- return null;
- },
- buildCommandMap_: function() {
- this.commandMap_ = {};
- for (var i = 0; i < defaultExCommandMap.length; i++) {
- var command = defaultExCommandMap[i];
- var key = command.shortName || command.name;
- this.commandMap_[key] = command;
- }
- },
- map: function(lhs, rhs, ctx) {
- if (lhs != ':' && lhs.charAt(0) == ':') {
- if (ctx) { throw Error('Mode not supported for ex mappings'); }
- var commandName = lhs.substring(1);
- if (rhs != ':' && rhs.charAt(0) == ':') {
- // Ex to Ex mapping
- this.commandMap_[commandName] = {
- name: commandName,
- type: 'exToEx',
- toInput: rhs.substring(1),
- user: true
- };
- } else {
- // Ex to key mapping
- this.commandMap_[commandName] = {
- name: commandName,
- type: 'exToKey',
- toKeys: rhs,
- user: true
- };
- }
- } else {
- if (rhs != ':' && rhs.charAt(0) == ':') {
- // Key to Ex mapping.
- var mapping = {
- keys: lhs,
- type: 'keyToEx',
- exArgs: { input: rhs.substring(1) },
- user: true};
- if (ctx) { mapping.context = ctx; }
- defaultKeymap.unshift(mapping);
- } else {
- // Key to key mapping
- var mapping = {
- keys: lhs,
- type: 'keyToKey',
- toKeys: rhs,
- user: true
- };
- if (ctx) { mapping.context = ctx; }
- defaultKeymap.unshift(mapping);
- }
- }
- },
- unmap: function(lhs, ctx) {
- if (lhs != ':' && lhs.charAt(0) == ':') {
- // Ex to Ex or Ex to key mapping
- if (ctx) { throw Error('Mode not supported for ex mappings'); }
- var commandName = lhs.substring(1);
- if (this.commandMap_[commandName] && this.commandMap_[commandName].user) {
- delete this.commandMap_[commandName];
- return;
- }
- } else {
- // Key to Ex or key to key mapping
- var keys = lhs;
- for (var i = 0; i < defaultKeymap.length; i++) {
- if (keys == defaultKeymap[i].keys
- && defaultKeymap[i].context === ctx
- && defaultKeymap[i].user) {
- defaultKeymap.splice(i, 1);
- return;
- }
- }
- }
- throw Error('No such mapping.');
- }
- };
-
- var exCommands = {
- colorscheme: function(cm, params) {
- if (!params.args || params.args.length < 1) {
- showConfirm(cm, cm.getOption('theme'));
- return;
- }
- cm.setOption('theme', params.args[0]);
- },
- map: function(cm, params, ctx) {
- var mapArgs = params.args;
- if (!mapArgs || mapArgs.length < 2) {
- if (cm) {
- showConfirm(cm, 'Invalid mapping: ' + params.input);
- }
- return;
- }
- exCommandDispatcher.map(mapArgs[0], mapArgs[1], ctx);
- },
- imap: function(cm, params) { this.map(cm, params, 'insert'); },
- nmap: function(cm, params) { this.map(cm, params, 'normal'); },
- vmap: function(cm, params) { this.map(cm, params, 'visual'); },
- unmap: function(cm, params, ctx) {
- var mapArgs = params.args;
- if (!mapArgs || mapArgs.length < 1) {
- if (cm) {
- showConfirm(cm, 'No such mapping: ' + params.input);
- }
- return;
- }
- exCommandDispatcher.unmap(mapArgs[0], ctx);
- },
- move: function(cm, params) {
- commandDispatcher.processCommand(cm, cm.state.vim, {
- type: 'motion',
- motion: 'moveToLineOrEdgeOfDocument',
- motionArgs: { forward: false, explicitRepeat: true,
- linewise: true },
- repeatOverride: params.line+1});
- },
- set: function(cm, params) {
- var setArgs = params.args;
- // Options passed through to the setOption/getOption calls. May be passed in by the
- // local/global versions of the set command
- var setCfg = params.setCfg || {};
- if (!setArgs || setArgs.length < 1) {
- if (cm) {
- showConfirm(cm, 'Invalid mapping: ' + params.input);
- }
- return;
- }
- var expr = setArgs[0].split('=');
- var optionName = expr[0];
- var value = expr[1];
- var forceGet = false;
-
- if (optionName.charAt(optionName.length - 1) == '?') {
- // If post-fixed with ?, then the set is actually a get.
- if (value) { throw Error('Trailing characters: ' + params.argString); }
- optionName = optionName.substring(0, optionName.length - 1);
- forceGet = true;
- }
- if (value === undefined && optionName.substring(0, 2) == 'no') {
- // To set boolean options to false, the option name is prefixed with
- // 'no'.
- optionName = optionName.substring(2);
- value = false;
- }
-
- var optionIsBoolean = options[optionName] && options[optionName].type == 'boolean';
- if (optionIsBoolean && value == undefined) {
- // Calling set with a boolean option sets it to true.
- value = true;
- }
- // If no value is provided, then we assume this is a get.
- if (!optionIsBoolean && value === undefined || forceGet) {
- var oldValue = getOption(optionName, cm, setCfg);
- if (oldValue === true || oldValue === false) {
- showConfirm(cm, ' ' + (oldValue ? '' : 'no') + optionName);
- } else {
- showConfirm(cm, ' ' + optionName + '=' + oldValue);
- }
- } else {
- setOption(optionName, value, cm, setCfg);
- }
- },
- setlocal: function (cm, params) {
- // setCfg is passed through to setOption
- params.setCfg = {scope: 'local'};
- this.set(cm, params);
- },
- setglobal: function (cm, params) {
- // setCfg is passed through to setOption
- params.setCfg = {scope: 'global'};
- this.set(cm, params);
- },
- registers: function(cm, params) {
- var regArgs = params.args;
- var registers = vimGlobalState.registerController.registers;
- var regInfo = '----------Registers----------' + replaceWith + ' (y/n/a/q/l)',
- onKeyDown: onPromptKeyDown
- });
- }
-
- CodeMirror.keyMap.vim = {
- attach: attachVimMap,
- detach: detachVimMap,
- call: cmKey
- };
-
- function exitInsertMode(cm) {
- var vim = cm.state.vim;
- var macroModeState = vimGlobalState.macroModeState;
- var insertModeChangeRegister = vimGlobalState.registerController.getRegister('.');
- var isPlaying = macroModeState.isPlaying;
- var lastChange = macroModeState.lastInsertModeChanges;
- // In case of visual block, the insertModeChanges are not saved as a
- // single word, so we convert them to a single word
- // so as to update the ". register as expected in real vim.
- var text = [];
- if (!isPlaying) {
- var selLength = lastChange.inVisualBlock ? vim.lastSelection.visualBlock.height : 1;
- var changes = lastChange.changes;
- var text = [];
- var i = 0;
- // In case of multiple selections in blockwise visual,
- // the inserted text, for example: 'foo', is stored as
- // 'f', 'f', InsertModeKey 'o', 'o', 'o', 'o'. (if you have a block with 2 lines).
- // We push the contents of the changes array as per the following:
- // 1. In case of InsertModeKey, just increment by 1.
- // 2. In case of a character, jump by selLength (2 in the example).
- while (i < changes.length) {
- // This loop will convert 'ffoooo' to 'foo'.
- text.push(changes[i]);
- if (changes[i] instanceof InsertModeKey) {
- i++;
- } else {
- i+= selLength;
- }
- }
- lastChange.changes = text;
- cm.off('change', onChange);
- CodeMirror.off(cm.getInputField(), 'keydown', onKeyEventTargetKeyDown);
- }
- if (!isPlaying && vim.insertModeRepeat > 1) {
- // Perform insert mode repeat for commands like 3,a and 3,o.
- repeatLastEdit(cm, vim, vim.insertModeRepeat - 1,
- true /** repeatForInsert */);
- vim.lastEditInputState.repeatOverride = vim.insertModeRepeat;
- }
- delete vim.insertModeRepeat;
- vim.insertMode = false;
- cm.setCursor(cm.getCursor().line, cm.getCursor().ch-1);
- cm.setOption('keyMap', 'vim');
- cm.setOption('disableInput', true);
- cm.toggleOverwrite(false); // exit replace mode if we were in it.
- // update the ". register before exiting insert mode
- insertModeChangeRegister.setText(lastChange.changes.join(''));
- CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
- if (macroModeState.isRecording) {
- logInsertModeChange(macroModeState);
- }
- }
-
- function _mapCommand(command) {
- defaultKeymap.unshift(command);
- }
-
- function mapCommand(keys, type, name, args, extra) {
- var command = {keys: keys, type: type};
- command[type] = name;
- command[type + "Args"] = args;
- for (var key in extra)
- command[key] = extra[key];
- _mapCommand(command);
- }
-
- // The timeout in milliseconds for the two-character ESC keymap should be
- // adjusted according to your typing speed to prevent false positives.
- defineOption('insertModeEscKeysTimeout', 200, 'number');
-
- CodeMirror.keyMap['vim-insert'] = {
- // TODO: override navigation keys so that Esc will cancel automatic
- // indentation from o, O, i_
- fallthrough: ['default'],
- attach: attachVimMap,
- detach: detachVimMap,
- call: cmKey
- };
-
- CodeMirror.keyMap['vim-replace'] = {
- 'Backspace': 'goCharLeft',
- fallthrough: ['vim-insert'],
- attach: attachVimMap,
- detach: detachVimMap,
- call: cmKey
- };
-
- function executeMacroRegister(cm, vim, macroModeState, registerName) {
- var register = vimGlobalState.registerController.getRegister(registerName);
- if (registerName == ':') {
- // Read-only register containing last Ex command.
- if (register.keyBuffer[0]) {
- exCommandDispatcher.processCommand(cm, register.keyBuffer[0]);
- }
- macroModeState.isPlaying = false;
- return;
- }
- var keyBuffer = register.keyBuffer;
- var imc = 0;
- macroModeState.isPlaying = true;
- macroModeState.replaySearchQueries = register.searchQueries.slice(0);
- for (var i = 0; i < keyBuffer.length; i++) {
- var text = keyBuffer[i];
- var match, key;
- while (text) {
- // Pull off one command key, which is either a single character
- // or a special sequence wrapped in '<' and '>', e.g. ''.
- match = (/<\w+-.+?>|<\w+>|./).exec(text);
- key = match[0];
- text = text.substring(match.index + key.length);
- CodeMirror.Vim.handleKey(cm, key, 'macro');
- if (vim.insertMode) {
- var changes = register.insertModeChanges[imc++].changes;
- vimGlobalState.macroModeState.lastInsertModeChanges.changes =
- changes;
- repeatInsertModeChanges(cm, changes, 1);
- exitInsertMode(cm);
- }
- }
- };
- macroModeState.isPlaying = false;
- }
-
- function logKey(macroModeState, key) {
- if (macroModeState.isPlaying) { return; }
- var registerName = macroModeState.latestRegister;
- var register = vimGlobalState.registerController.getRegister(registerName);
- if (register) {
- register.pushText(key);
- }
- }
-
- function logInsertModeChange(macroModeState) {
- if (macroModeState.isPlaying) { return; }
- var registerName = macroModeState.latestRegister;
- var register = vimGlobalState.registerController.getRegister(registerName);
- if (register && register.pushInsertModeChanges) {
- register.pushInsertModeChanges(macroModeState.lastInsertModeChanges);
- }
- }
-
- function logSearchQuery(macroModeState, query) {
- if (macroModeState.isPlaying) { return; }
- var registerName = macroModeState.latestRegister;
- var register = vimGlobalState.registerController.getRegister(registerName);
- if (register && register.pushSearchQuery) {
- register.pushSearchQuery(query);
- }
- }
-
- /**
- * Listens for changes made in insert mode.
- * Should only be active in insert mode.
- */
- function onChange(_cm, changeObj) {
- var macroModeState = vimGlobalState.macroModeState;
- var lastChange = macroModeState.lastInsertModeChanges;
- if (!macroModeState.isPlaying) {
- while(changeObj) {
- lastChange.expectCursorActivityForChange = true;
- if (changeObj.origin == '+input' || changeObj.origin == 'paste'
- || changeObj.origin === undefined /* only in testing */) {
- var text = changeObj.text.join('\n');
- if (lastChange.maybeReset) {
- lastChange.changes = [];
- lastChange.maybeReset = false;
- }
- lastChange.changes.push(text);
- }
- // Change objects may be chained with next.
- changeObj = changeObj.next;
- }
- }
- }
-
- /**
- * Listens for any kind of cursor activity on CodeMirror.
- */
- function onCursorActivity(cm) {
- var vim = cm.state.vim;
- if (vim.insertMode) {
- // Tracking cursor activity in insert mode (for macro support).
- var macroModeState = vimGlobalState.macroModeState;
- if (macroModeState.isPlaying) { return; }
- var lastChange = macroModeState.lastInsertModeChanges;
- if (lastChange.expectCursorActivityForChange) {
- lastChange.expectCursorActivityForChange = false;
- } else {
- // Cursor moved outside the context of an edit. Reset the change.
- lastChange.maybeReset = true;
- }
- } else if (!cm.curOp.isVimOp) {
- handleExternalSelection(cm, vim);
- }
- if (vim.visualMode) {
- updateFakeCursor(cm);
- }
- }
- function updateFakeCursor(cm) {
- var vim = cm.state.vim;
- var from = clipCursorToContent(cm, copyCursor(vim.sel.head));
- var to = offsetCursor(from, 0, 1);
- if (vim.fakeCursor) {
- vim.fakeCursor.clear();
- }
- vim.fakeCursor = cm.markText(from, to, {className: 'cm-animate-fat-cursor'});
- }
- function handleExternalSelection(cm, vim) {
- var anchor = cm.getCursor('anchor');
- var head = cm.getCursor('head');
- // Enter or exit visual mode to match mouse selection.
- if (vim.visualMode && !cm.somethingSelected()) {
- exitVisualMode(cm, false);
- } else if (!vim.visualMode && !vim.insertMode && cm.somethingSelected()) {
- vim.visualMode = true;
- vim.visualLine = false;
- CodeMirror.signal(cm, "vim-mode-change", {mode: "visual"});
- }
- if (vim.visualMode) {
- // Bind CodeMirror selection model to vim selection model.
- // Mouse selections are considered visual characterwise.
- var headOffset = !cursorIsBefore(head, anchor) ? -1 : 0;
- var anchorOffset = cursorIsBefore(head, anchor) ? -1 : 0;
- head = offsetCursor(head, 0, headOffset);
- anchor = offsetCursor(anchor, 0, anchorOffset);
- vim.sel = {
- anchor: anchor,
- head: head
- };
- updateMark(cm, vim, '<', cursorMin(head, anchor));
- updateMark(cm, vim, '>', cursorMax(head, anchor));
- } else if (!vim.insertMode) {
- // Reset lastHPos if selection was modified by something outside of vim mode e.g. by mouse.
- vim.lastHPos = cm.getCursor().ch;
- }
- }
-
- /** Wrapper for special keys pressed in insert mode */
- function InsertModeKey(keyName) {
- this.keyName = keyName;
- }
-
- /**
- * Handles raw key down events from the text area.
- * - Should only be active in insert mode.
- * - For recording deletes in insert mode.
- */
- function onKeyEventTargetKeyDown(e) {
- var macroModeState = vimGlobalState.macroModeState;
- var lastChange = macroModeState.lastInsertModeChanges;
- var keyName = CodeMirror.keyName(e);
- if (!keyName) { return; }
- function onKeyFound() {
- if (lastChange.maybeReset) {
- lastChange.changes = [];
- lastChange.maybeReset = false;
- }
- lastChange.changes.push(new InsertModeKey(keyName));
- return true;
- }
- if (keyName.indexOf('Delete') != -1 || keyName.indexOf('Backspace') != -1) {
- CodeMirror.lookupKey(keyName, 'vim-insert', onKeyFound);
- }
- }
-
- /**
- * Repeats the last edit, which includes exactly 1 command and at most 1
- * insert. Operator and motion commands are read from lastEditInputState,
- * while action commands are read from lastEditActionCommand.
- *
- * If repeatForInsert is true, then the function was called by
- * exitInsertMode to repeat the insert mode changes the user just made. The
- * corresponding enterInsertMode call was made with a count.
- */
- function repeatLastEdit(cm, vim, repeat, repeatForInsert) {
- var macroModeState = vimGlobalState.macroModeState;
- macroModeState.isPlaying = true;
- var isAction = !!vim.lastEditActionCommand;
- var cachedInputState = vim.inputState;
- function repeatCommand() {
- if (isAction) {
- commandDispatcher.processAction(cm, vim, vim.lastEditActionCommand);
- } else {
- commandDispatcher.evalInput(cm, vim);
- }
- }
- function repeatInsert(repeat) {
- if (macroModeState.lastInsertModeChanges.changes.length > 0) {
- // For some reason, repeat cw in desktop VIM does not repeat
- // insert mode changes. Will conform to that behavior.
- repeat = !vim.lastEditActionCommand ? 1 : repeat;
- var changeObject = macroModeState.lastInsertModeChanges;
- repeatInsertModeChanges(cm, changeObject.changes, repeat);
- }
- }
- vim.inputState = vim.lastEditInputState;
- if (isAction && vim.lastEditActionCommand.interlaceInsertRepeat) {
- // o and O repeat have to be interlaced with insert repeats so that the
- // insertions appear on separate lines instead of the last line.
- for (var i = 0; i < repeat; i++) {
- repeatCommand();
- repeatInsert(1);
- }
- } else {
- if (!repeatForInsert) {
- // Hack to get the cursor to end up at the right place. If I is
- // repeated in insert mode repeat, cursor will be 1 insert
- // change set left of where it should be.
- repeatCommand();
- }
- repeatInsert(repeat);
- }
- vim.inputState = cachedInputState;
- if (vim.insertMode && !repeatForInsert) {
- // Don't exit insert mode twice. If repeatForInsert is set, then we
- // were called by an exitInsertMode call lower on the stack.
- exitInsertMode(cm);
- }
- macroModeState.isPlaying = false;
- };
-
- function repeatInsertModeChanges(cm, changes, repeat) {
- function keyHandler(binding) {
- if (typeof binding == 'string') {
- CodeMirror.commands[binding](cm);
- } else {
- binding(cm);
- }
- return true;
- }
- var head = cm.getCursor('head');
- var inVisualBlock = vimGlobalState.macroModeState.lastInsertModeChanges.inVisualBlock;
- if (inVisualBlock) {
- // Set up block selection again for repeating the changes.
- var vim = cm.state.vim;
- var lastSel = vim.lastSelection;
- var offset = getOffset(lastSel.anchor, lastSel.head);
- selectForInsert(cm, head, offset.line + 1);
- repeat = cm.listSelections().length;
- cm.setCursor(head);
- }
- for (var i = 0; i < repeat; i++) {
- if (inVisualBlock) {
- cm.setCursor(offsetCursor(head, i, 0));
- }
- for (var j = 0; j < changes.length; j++) {
- var change = changes[j];
- if (change instanceof InsertModeKey) {
- CodeMirror.lookupKey(change.keyName, 'vim-insert', keyHandler);
- } else {
- var cur = cm.getCursor();
- cm.replaceRange(change, cur, cur);
- }
- }
- }
- if (inVisualBlock) {
- cm.setCursor(offsetCursor(head, 0, 1));
- }
- }
-
- resetVimGlobalState();
- return vimApi;
- };
- // Initialize Vim and make it available as an API.
- CodeMirror.Vim = Vim();
-});
diff --git a/WebContent/addon/codemirror/lib/codemirror.css b/WebContent/addon/codemirror/lib/codemirror.css
deleted file mode 100644
index a262b91..0000000
--- a/WebContent/addon/codemirror/lib/codemirror.css
+++ /dev/null
@@ -1,341 +0,0 @@
-/* BASICS */
-
-.CodeMirror {
- /* Set height, width, borders, and global font properties here */
- font-family: 'Courier New', monospace;
- height: 300px;
- color: black;
-}
-
-/* PADDING */
-
-.CodeMirror-lines {
- padding: 4px 0; /* Vertical padding around content */
-}
-.CodeMirror pre {
- padding: 0 4px; /* Horizontal padding of content */
-}
-
-.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
- background-color: white; /* The little square between H and V scrollbars */
-}
-
-/* GUTTER */
-
-.CodeMirror-gutters {
- border-right: 1px solid #ddd;
- background-color: #f7f7f7;
- white-space: nowrap;
-}
-.CodeMirror-linenumbers {}
-.CodeMirror-linenumber {
- padding: 0 3px 0 5px;
- min-width: 20px;
- text-align: right;
- color: #999;
- white-space: nowrap;
-}
-
-.CodeMirror-guttermarker { color: black; }
-.CodeMirror-guttermarker-subtle { color: #999; }
-
-/* CURSOR */
-
-.CodeMirror-cursor {
- border-left: 1px solid black;
- border-right: none;
- width: 0;
-}
-/* Shown when moving in bi-directional text */
-.CodeMirror div.CodeMirror-secondarycursor {
- border-left: 1px solid silver;
-}
-.cm-fat-cursor .CodeMirror-cursor {
- width: auto;
- border: 0 !important;
- background: #7e7;
-}
-.cm-fat-cursor div.CodeMirror-cursors {
- z-index: 1;
-}
-
-.cm-animate-fat-cursor {
- width: auto;
- border: 0;
- -webkit-animation: blink 1.06s steps(1) infinite;
- -moz-animation: blink 1.06s steps(1) infinite;
- animation: blink 1.06s steps(1) infinite;
- background-color: #7e7;
-}
-@-moz-keyframes blink {
- 0% {}
- 50% { background-color: transparent; }
- 100% {}
-}
-@-webkit-keyframes blink {
- 0% {}
- 50% { background-color: transparent; }
- 100% {}
-}
-@keyframes blink {
- 0% {}
- 50% { background-color: transparent; }
- 100% {}
-}
-
-/* Can style cursor different in overwrite (non-insert) mode */
-.CodeMirror-overwrite .CodeMirror-cursor {}
-
-.cm-tab { display: inline-block; text-decoration: inherit; }
-
-.CodeMirror-rulers {
- position: absolute;
- left: 0; right: 0; top: -50px; bottom: -20px;
- overflow: hidden;
-}
-.CodeMirror-ruler {
- border-left: 1px solid #ccc;
- top: 0; bottom: 0;
- position: absolute;
-}
-
-/* DEFAULT THEME */
-
-.cm-s-default .cm-header {color: blue;}
-.cm-s-default .cm-quote {color: #090;}
-.cm-negative {color: #d44;}
-.cm-positive {color: #292;}
-.cm-header, .cm-strong {font-weight: bold;}
-.cm-em {font-style: italic;}
-.cm-link {text-decoration: underline;}
-.cm-strikethrough {text-decoration: line-through;}
-
-.cm-s-default .cm-keyword {color: #708;}
-.cm-s-default .cm-atom {color: #219;}
-.cm-s-default .cm-number {color: #164;}
-.cm-s-default .cm-def {color: #00f;}
-.cm-s-default .cm-variable,
-.cm-s-default .cm-punctuation,
-.cm-s-default .cm-property,
-.cm-s-default .cm-operator {}
-.cm-s-default .cm-variable-2 {color: #05a;}
-.cm-s-default .cm-variable-3 {color: #085;}
-.cm-s-default .cm-comment {color: #a50;}
-.cm-s-default .cm-string {color: #a11;}
-.cm-s-default .cm-string-2 {color: #f50;}
-.cm-s-default .cm-meta {color: #555;}
-.cm-s-default .cm-qualifier {color: #555;}
-.cm-s-default .cm-builtin {color: #30a;}
-.cm-s-default .cm-bracket {color: #997;}
-.cm-s-default .cm-tag {color: #170;}
-.cm-s-default .cm-attribute {color: #00c;}
-.cm-s-default .cm-hr {color: #999;}
-.cm-s-default .cm-link {color: #00c;}
-
-.cm-s-default .cm-error {color: #f00;}
-.cm-invalidchar {color: #f00;}
-
-.CodeMirror-composing { border-bottom: 2px solid; }
-
-/* Default styles for common addons */
-
-div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
-div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
-.CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); }
-.CodeMirror-activeline-background {background: #e8f2ff;}
-
-/* STOP */
-
-/* The rest of this file contains styles related to the mechanics of
- the editor. You probably shouldn't touch them. */
-
-.CodeMirror {
- position: relative;
- overflow: hidden;
- background: white;
-}
-
-.CodeMirror-scroll {
- overflow: scroll !important; /* Things will break if this is overridden */
- /* 30px is the magic margin used to hide the element's real scrollbars */
- /* See overflow: hidden in .CodeMirror */
- margin-bottom: -30px; margin-right: -30px;
- padding-bottom: 30px;
- height: 100%;
- outline: none; /* Prevent dragging from highlighting the element */
- position: relative;
-}
-.CodeMirror-sizer {
- position: relative;
- border-right: 30px solid transparent;
-}
-
-/* The fake, visible scrollbars. Used to force redraw during scrolling
- before actual scrolling happens, thus preventing shaking and
- flickering artifacts. */
-.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
- position: absolute;
- z-index: 6;
- display: none;
-}
-.CodeMirror-vscrollbar {
- right: 0; top: 0;
- overflow-x: hidden;
- overflow-y: scroll;
-}
-.CodeMirror-hscrollbar {
- bottom: 0; left: 0;
- overflow-y: hidden;
- overflow-x: scroll;
-}
-.CodeMirror-scrollbar-filler {
- right: 0; bottom: 0;
-}
-.CodeMirror-gutter-filler {
- left: 0; bottom: 0;
-}
-
-.CodeMirror-gutters {
- position: absolute; left: 0; top: 0;
- min-height: 100%;
- z-index: 3;
-}
-.CodeMirror-gutter {
- white-space: normal;
- height: 100%;
- display: inline-block;
- vertical-align: top;
- margin-bottom: -30px;
-}
-.CodeMirror-gutter-wrapper {
- position: absolute;
- z-index: 4;
- background: none !important;
- border: none !important;
-}
-.CodeMirror-gutter-background {
- position: absolute;
- top: 0; bottom: 0;
- z-index: 4;
-}
-.CodeMirror-gutter-elt {
- position: absolute;
- cursor: default;
- z-index: 4;
-}
-.CodeMirror-gutter-wrapper {
- -webkit-user-select: none;
- -moz-user-select: none;
- user-select: none;
-}
-
-.CodeMirror-lines {
- cursor: text;
- min-height: 1px; /* prevents collapsing before first draw */
-}
-.CodeMirror pre {
- /* Reset some styles that the rest of the page might have set */
- -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;
- border-width: 0;
- background: transparent;
- font-family: inherit;
- font-size: inherit;
- margin: 0;
- white-space: pre;
- word-wrap: normal;
- line-height: inherit;
- color: inherit;
- z-index: 2;
- position: relative;
- overflow: visible;
- -webkit-tap-highlight-color: transparent;
- -webkit-font-variant-ligatures: none;
- font-variant-ligatures: none;
-}
-.CodeMirror-wrap pre {
- word-wrap: break-word;
- white-space: pre-wrap;
- word-break: normal;
-}
-
-.CodeMirror-linebackground {
- position: absolute;
- left: 0; right: 0; top: 0; bottom: 0;
- z-index: 0;
-}
-
-.CodeMirror-linewidget {
- position: relative;
- z-index: 2;
- overflow: auto;
-}
-
-.CodeMirror-widget {}
-
-.CodeMirror-code {
- outline: none;
-}
-
-/* Force content-box sizing for the elements where we expect it */
-.CodeMirror-scroll,
-.CodeMirror-sizer,
-.CodeMirror-gutter,
-.CodeMirror-gutters,
-.CodeMirror-linenumber {
- -moz-box-sizing: content-box;
- box-sizing: content-box;
-}
-
-.CodeMirror-measure {
- position: absolute;
- width: 100%;
- height: 0;
- overflow: hidden;
- visibility: hidden;
-}
-
-.CodeMirror-cursor {
- position: absolute;
- pointer-events: none;
-}
-.CodeMirror-measure pre { position: static; }
-
-div.CodeMirror-cursors {
- visibility: hidden;
- position: relative;
- z-index: 3;
-}
-div.CodeMirror-dragcursors {
- visibility: visible;
-}
-
-.CodeMirror-focused div.CodeMirror-cursors {
- visibility: visible;
-}
-
-.CodeMirror-selected { background: #d9d9d9; }
-.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
-.CodeMirror-crosshair { cursor: crosshair; }
-.CodeMirror-line::selection, .CodeMirror-line > span::selection, .CodeMirror-line > span > span::selection { background: #d7d4f0; }
-.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection { background: #d7d4f0; }
-
-.cm-searching {
- background: #ffa;
- background: rgba(255, 255, 0, .4);
-}
-
-/* Used to force a border model for a node */
-.cm-force-border { padding-right: .1px; }
-
-@media print {
- /* Hide the cursor when printing */
- .CodeMirror div.CodeMirror-cursors {
- visibility: hidden;
- }
-}
-
-/* See issue #2901 */
-.cm-tab-wrap-hack:after { content: ''; }
-
-/* Help users use markselection to safely style text background */
-span.CodeMirror-selectedtext { background: none; }
diff --git a/WebContent/addon/codemirror/lib/codemirror.js b/WebContent/addon/codemirror/lib/codemirror.js
deleted file mode 100644
index 333a7e5..0000000
--- a/WebContent/addon/codemirror/lib/codemirror.js
+++ /dev/null
@@ -1,9096 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// This is CodeMirror (http://codemirror.net), a code editor
-// implemented in JavaScript on top of the browser's DOM.
-//
-// You can find some technical background for some of the code below
-// at http://marijnhaverbeke.nl/blog/#cm-internals .
-
-(function (global, factory) {
- typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
- typeof define === 'function' && define.amd ? define(factory) :
- (global.CodeMirror = factory());
-}(this, (function () { 'use strict';
-
-// Kludges for bugs and behavior differences that can't be feature
-// detected are enabled based on userAgent etc sniffing.
-var userAgent = navigator.userAgent
-var platform = navigator.platform
-
-var gecko = /gecko\/\d/i.test(userAgent)
-var ie_upto10 = /MSIE \d/.test(userAgent)
-var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(userAgent)
-var ie = ie_upto10 || ie_11up
-var ie_version = ie && (ie_upto10 ? document.documentMode || 6 : ie_11up[1])
-var webkit = /WebKit\//.test(userAgent)
-var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(userAgent)
-var chrome = /Chrome\//.test(userAgent)
-var presto = /Opera\//.test(userAgent)
-var safari = /Apple Computer/.test(navigator.vendor)
-var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(userAgent)
-var phantom = /PhantomJS/.test(userAgent)
-
-var ios = /AppleWebKit/.test(userAgent) && /Mobile\/\w+/.test(userAgent)
-// This is woefully incomplete. Suggestions for alternative methods welcome.
-var mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent)
-var mac = ios || /Mac/.test(platform)
-var chromeOS = /\bCrOS\b/.test(userAgent)
-var windows = /win/i.test(platform)
-
-var presto_version = presto && userAgent.match(/Version\/(\d*\.\d*)/)
-if (presto_version) { presto_version = Number(presto_version[1]) }
-if (presto_version && presto_version >= 15) { presto = false; webkit = true }
-// Some browsers use the wrong event properties to signal cmd/ctrl on OS X
-var flipCtrlCmd = mac && (qtwebkit || presto && (presto_version == null || presto_version < 12.11))
-var captureRightClick = gecko || (ie && ie_version >= 9)
-
-function classTest(cls) { return new RegExp("(^|\\s)" + cls + "(?:$|\\s)\\s*") }
-
-var rmClass = function(node, cls) {
- var current = node.className
- var match = classTest(cls).exec(current)
- if (match) {
- var after = current.slice(match.index + match[0].length)
- node.className = current.slice(0, match.index) + (after ? match[1] + after : "")
- }
-}
-
-function removeChildren(e) {
- for (var count = e.childNodes.length; count > 0; --count)
- { e.removeChild(e.firstChild) }
- return e
-}
-
-function removeChildrenAndAdd(parent, e) {
- return removeChildren(parent).appendChild(e)
-}
-
-function elt(tag, content, className, style) {
- var e = document.createElement(tag)
- if (className) { e.className = className }
- if (style) { e.style.cssText = style }
- if (typeof content == "string") { e.appendChild(document.createTextNode(content)) }
- else if (content) { for (var i = 0; i < content.length; ++i) { e.appendChild(content[i]) } }
- return e
-}
-
-var range
-if (document.createRange) { range = function(node, start, end, endNode) {
- var r = document.createRange()
- r.setEnd(endNode || node, end)
- r.setStart(node, start)
- return r
-} }
-else { range = function(node, start, end) {
- var r = document.body.createTextRange()
- try { r.moveToElementText(node.parentNode) }
- catch(e) { return r }
- r.collapse(true)
- r.moveEnd("character", end)
- r.moveStart("character", start)
- return r
-} }
-
-function contains(parent, child) {
- if (child.nodeType == 3) // Android browser always returns false when child is a textnode
- { child = child.parentNode }
- if (parent.contains)
- { return parent.contains(child) }
- do {
- if (child.nodeType == 11) { child = child.host }
- if (child == parent) { return true }
- } while (child = child.parentNode)
-}
-
-var activeElt = function() {
- var activeElement = document.activeElement
- while (activeElement && activeElement.root && activeElement.root.activeElement)
- { activeElement = activeElement.root.activeElement }
- return activeElement
-}
-// Older versions of IE throws unspecified error when touching
-// document.activeElement in some cases (during loading, in iframe)
-if (ie && ie_version < 11) { activeElt = function() {
- try { return document.activeElement }
- catch(e) { return document.body }
-} }
-
-function addClass(node, cls) {
- var current = node.className
- if (!classTest(cls).test(current)) { node.className += (current ? " " : "") + cls }
-}
-function joinClasses(a, b) {
- var as = a.split(" ")
- for (var i = 0; i < as.length; i++)
- { if (as[i] && !classTest(as[i]).test(b)) { b += " " + as[i] } }
- return b
-}
-
-var selectInput = function(node) { node.select() }
-if (ios) // Mobile Safari apparently has a bug where select() is broken.
- { selectInput = function(node) { node.selectionStart = 0; node.selectionEnd = node.value.length } }
-else if (ie) // Suppress mysterious IE10 errors
- { selectInput = function(node) { try { node.select() } catch(_e) {} } }
-
-function bind(f) {
- var args = Array.prototype.slice.call(arguments, 1)
- return function(){return f.apply(null, args)}
-}
-
-function copyObj(obj, target, overwrite) {
- if (!target) { target = {} }
- for (var prop in obj)
- { if (obj.hasOwnProperty(prop) && (overwrite !== false || !target.hasOwnProperty(prop)))
- { target[prop] = obj[prop] } }
- return target
-}
-
-// Counts the column offset in a string, taking tabs into account.
-// Used mostly to find indentation.
-function countColumn(string, end, tabSize, startIndex, startValue) {
- if (end == null) {
- end = string.search(/[^\s\u00a0]/)
- if (end == -1) { end = string.length }
- }
- for (var i = startIndex || 0, n = startValue || 0;;) {
- var nextTab = string.indexOf("\t", i)
- if (nextTab < 0 || nextTab >= end)
- { return n + (end - i) }
- n += nextTab - i
- n += tabSize - (n % tabSize)
- i = nextTab + 1
- }
-}
-
-function Delayed() {this.id = null}
-Delayed.prototype.set = function(ms, f) {
- clearTimeout(this.id)
- this.id = setTimeout(f, ms)
-}
-
-function indexOf(array, elt) {
- for (var i = 0; i < array.length; ++i)
- { if (array[i] == elt) { return i } }
- return -1
-}
-
-// Number of pixels added to scroller and sizer to hide scrollbar
-var scrollerGap = 30
-
-// Returned or thrown by various protocols to signal 'I'm not
-// handling this'.
-var Pass = {toString: function(){return "CodeMirror.Pass"}}
-
-// Reused option objects for setSelection & friends
-var sel_dontScroll = {scroll: false};
-var sel_mouse = {origin: "*mouse"};
-var sel_move = {origin: "+move"}
-
-// The inverse of countColumn -- find the offset that corresponds to
-// a particular column.
-function findColumn(string, goal, tabSize) {
- for (var pos = 0, col = 0;;) {
- var nextTab = string.indexOf("\t", pos)
- if (nextTab == -1) { nextTab = string.length }
- var skipped = nextTab - pos
- if (nextTab == string.length || col + skipped >= goal)
- { return pos + Math.min(skipped, goal - col) }
- col += nextTab - pos
- col += tabSize - (col % tabSize)
- pos = nextTab + 1
- if (col >= goal) { return pos }
- }
-}
-
-var spaceStrs = [""]
-function spaceStr(n) {
- while (spaceStrs.length <= n)
- { spaceStrs.push(lst(spaceStrs) + " ") }
- return spaceStrs[n]
-}
-
-function lst(arr) { return arr[arr.length-1] }
-
-function map(array, f) {
- var out = []
- for (var i = 0; i < array.length; i++) { out[i] = f(array[i], i) }
- return out
-}
-
-function insertSorted(array, value, score) {
- var pos = 0, priority = score(value)
- while (pos < array.length && score(array[pos]) <= priority) { pos++ }
- array.splice(pos, 0, value)
-}
-
-function nothing() {}
-
-function createObj(base, props) {
- var inst
- if (Object.create) {
- inst = Object.create(base)
- } else {
- nothing.prototype = base
- inst = new nothing()
- }
- if (props) { copyObj(props, inst) }
- return inst
-}
-
-var nonASCIISingleCaseWordChar = /[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/
-function isWordCharBasic(ch) {
- return /\w/.test(ch) || ch > "\x80" &&
- (ch.toUpperCase() != ch.toLowerCase() || nonASCIISingleCaseWordChar.test(ch))
-}
-function isWordChar(ch, helper) {
- if (!helper) { return isWordCharBasic(ch) }
- if (helper.source.indexOf("\\w") > -1 && isWordCharBasic(ch)) { return true }
- return helper.test(ch)
-}
-
-function isEmpty(obj) {
- for (var n in obj) { if (obj.hasOwnProperty(n) && obj[n]) { return false } }
- return true
-}
-
-// Extending unicode characters. A series of a non-extending char +
-// any number of extending chars is treated as a single unit as far
-// as editing and measuring is concerned. This is not fully correct,
-// since some scripts/fonts/browsers also treat other configurations
-// of code points as a group.
-var extendingChars = /[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/
-function isExtendingChar(ch) { return ch.charCodeAt(0) >= 768 && extendingChars.test(ch) }
-
-// The display handles the DOM integration, both for input reading
-// and content drawing. It holds references to DOM nodes and
-// display-related state.
-
-function Display(place, doc, input) {
- var d = this
- this.input = input
-
- // Covers bottom-right square when both scrollbars are present.
- d.scrollbarFiller = elt("div", null, "CodeMirror-scrollbar-filler")
- d.scrollbarFiller.setAttribute("cm-not-content", "true")
- // Covers bottom of gutter when coverGutterNextToScrollbar is on
- // and h scrollbar is present.
- d.gutterFiller = elt("div", null, "CodeMirror-gutter-filler")
- d.gutterFiller.setAttribute("cm-not-content", "true")
- // Will contain the actual code, positioned to cover the viewport.
- d.lineDiv = elt("div", null, "CodeMirror-code")
- // Elements are added to these to represent selection and cursors.
- d.selectionDiv = elt("div", null, null, "position: relative; z-index: 1")
- d.cursorDiv = elt("div", null, "CodeMirror-cursors")
- // A visibility: hidden element used to find the size of things.
- d.measure = elt("div", null, "CodeMirror-measure")
- // When lines outside of the viewport are measured, they are drawn in this.
- d.lineMeasure = elt("div", null, "CodeMirror-measure")
- // Wraps everything that needs to exist inside the vertically-padded coordinate system
- d.lineSpace = elt("div", [d.measure, d.lineMeasure, d.selectionDiv, d.cursorDiv, d.lineDiv],
- null, "position: relative; outline: none")
- // Moved around its parent to cover visible view.
- d.mover = elt("div", [elt("div", [d.lineSpace], "CodeMirror-lines")], null, "position: relative")
- // Set to the height of the document, allowing scrolling.
- d.sizer = elt("div", [d.mover], "CodeMirror-sizer")
- d.sizerWidth = null
- // Behavior of elts with overflow: auto and padding is
- // inconsistent across browsers. This is used to ensure the
- // scrollable area is big enough.
- d.heightForcer = elt("div", null, null, "position: absolute; height: " + scrollerGap + "px; width: 1px;")
- // Will contain the gutters, if any.
- d.gutters = elt("div", null, "CodeMirror-gutters")
- d.lineGutter = null
- // Actual scrollable element.
- d.scroller = elt("div", [d.sizer, d.heightForcer, d.gutters], "CodeMirror-scroll")
- d.scroller.setAttribute("tabIndex", "-1")
- // The element in which the editor lives.
- d.wrapper = elt("div", [d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror")
-
- // Work around IE7 z-index bug (not perfect, hence IE7 not really being supported)
- if (ie && ie_version < 8) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0 }
- if (!webkit && !(gecko && mobile)) { d.scroller.draggable = true }
-
- if (place) {
- if (place.appendChild) { place.appendChild(d.wrapper) }
- else { place(d.wrapper) }
- }
-
- // Current rendered range (may be bigger than the view window).
- d.viewFrom = d.viewTo = doc.first
- d.reportedViewFrom = d.reportedViewTo = doc.first
- // Information about the rendered lines.
- d.view = []
- d.renderedView = null
- // Holds info about a single rendered line when it was rendered
- // for measurement, while not in view.
- d.externalMeasured = null
- // Empty space (in pixels) above the view
- d.viewOffset = 0
- d.lastWrapHeight = d.lastWrapWidth = 0
- d.updateLineNumbers = null
-
- d.nativeBarWidth = d.barHeight = d.barWidth = 0
- d.scrollbarsClipped = false
-
- // Used to only resize the line number gutter when necessary (when
- // the amount of lines crosses a boundary that makes its width change)
- d.lineNumWidth = d.lineNumInnerWidth = d.lineNumChars = null
- // Set to true when a non-horizontal-scrolling line widget is
- // added. As an optimization, line widget aligning is skipped when
- // this is false.
- d.alignWidgets = false
-
- d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null
-
- // Tracks the maximum line length so that the horizontal scrollbar
- // can be kept static when scrolling.
- d.maxLine = null
- d.maxLineLength = 0
- d.maxLineChanged = false
-
- // Used for measuring wheel scrolling granularity
- d.wheelDX = d.wheelDY = d.wheelStartX = d.wheelStartY = null
-
- // True when shift is held down.
- d.shift = false
-
- // Used to track whether anything happened since the context menu
- // was opened.
- d.selForContextMenu = null
-
- d.activeTouch = null
-
- input.init(d)
-}
-
-// Find the line object corresponding to the given line number.
-function getLine(doc, n) {
- n -= doc.first
- if (n < 0 || n >= doc.size) { throw new Error("There is no line " + (n + doc.first) + " in the document.") }
- var chunk = doc
- while (!chunk.lines) {
- for (var i = 0;; ++i) {
- var child = chunk.children[i], sz = child.chunkSize()
- if (n < sz) { chunk = child; break }
- n -= sz
- }
- }
- return chunk.lines[n]
-}
-
-// Get the part of a document between two positions, as an array of
-// strings.
-function getBetween(doc, start, end) {
- var out = [], n = start.line
- doc.iter(start.line, end.line + 1, function (line) {
- var text = line.text
- if (n == end.line) { text = text.slice(0, end.ch) }
- if (n == start.line) { text = text.slice(start.ch) }
- out.push(text)
- ++n
- })
- return out
-}
-// Get the lines between from and to, as array of strings.
-function getLines(doc, from, to) {
- var out = []
- doc.iter(from, to, function (line) { out.push(line.text) }) // iter aborts when callback returns truthy value
- return out
-}
-
-// Update the height of a line, propagating the height change
-// upwards to parent nodes.
-function updateLineHeight(line, height) {
- var diff = height - line.height
- if (diff) { for (var n = line; n; n = n.parent) { n.height += diff } }
-}
-
-// Given a line object, find its line number by walking up through
-// its parent links.
-function lineNo(line) {
- if (line.parent == null) { return null }
- var cur = line.parent, no = indexOf(cur.lines, line)
- for (var chunk = cur.parent; chunk; cur = chunk, chunk = chunk.parent) {
- for (var i = 0;; ++i) {
- if (chunk.children[i] == cur) { break }
- no += chunk.children[i].chunkSize()
- }
- }
- return no + cur.first
-}
-
-// Find the line at the given vertical position, using the height
-// information in the document tree.
-function lineAtHeight(chunk, h) {
- var n = chunk.first
- outer: do {
- for (var i$1 = 0; i$1 < chunk.children.length; ++i$1) {
- var child = chunk.children[i$1], ch = child.height
- if (h < ch) { chunk = child; continue outer }
- h -= ch
- n += child.chunkSize()
- }
- return n
- } while (!chunk.lines)
- var i = 0
- for (; i < chunk.lines.length; ++i) {
- var line = chunk.lines[i], lh = line.height
- if (h < lh) { break }
- h -= lh
- }
- return n + i
-}
-
-function isLine(doc, l) {return l >= doc.first && l < doc.first + doc.size}
-
-function lineNumberFor(options, i) {
- return String(options.lineNumberFormatter(i + options.firstLineNumber))
-}
-
-// A Pos instance represents a position within the text.
-function Pos (line, ch) {
- if (!(this instanceof Pos)) { return new Pos(line, ch) }
- this.line = line; this.ch = ch
-}
-
-// Compare two positions, return 0 if they are the same, a negative
-// number when a is less, and a positive number otherwise.
-function cmp(a, b) { return a.line - b.line || a.ch - b.ch }
-
-function copyPos(x) {return Pos(x.line, x.ch)}
-function maxPos(a, b) { return cmp(a, b) < 0 ? b : a }
-function minPos(a, b) { return cmp(a, b) < 0 ? a : b }
-
-// Most of the external API clips given positions to make sure they
-// actually exist within the document.
-function clipLine(doc, n) {return Math.max(doc.first, Math.min(n, doc.first + doc.size - 1))}
-function clipPos(doc, pos) {
- if (pos.line < doc.first) { return Pos(doc.first, 0) }
- var last = doc.first + doc.size - 1
- if (pos.line > last) { return Pos(last, getLine(doc, last).text.length) }
- return clipToLen(pos, getLine(doc, pos.line).text.length)
-}
-function clipToLen(pos, linelen) {
- var ch = pos.ch
- if (ch == null || ch > linelen) { return Pos(pos.line, linelen) }
- else if (ch < 0) { return Pos(pos.line, 0) }
- else { return pos }
-}
-function clipPosArray(doc, array) {
- var out = []
- for (var i = 0; i < array.length; i++) { out[i] = clipPos(doc, array[i]) }
- return out
-}
-
-// Optimize some code when these features are not used.
-var sawReadOnlySpans = false;
-var sawCollapsedSpans = false
-
-function seeReadOnlySpans() {
- sawReadOnlySpans = true
-}
-
-function seeCollapsedSpans() {
- sawCollapsedSpans = true
-}
-
-// TEXTMARKER SPANS
-
-function MarkedSpan(marker, from, to) {
- this.marker = marker
- this.from = from; this.to = to
-}
-
-// Search an array of spans for a span matching the given marker.
-function getMarkedSpanFor(spans, marker) {
- if (spans) { for (var i = 0; i < spans.length; ++i) {
- var span = spans[i]
- if (span.marker == marker) { return span }
- } }
-}
-// Remove a span from an array, returning undefined if no spans are
-// left (we don't store arrays for lines without spans).
-function removeMarkedSpan(spans, span) {
- var r
- for (var i = 0; i < spans.length; ++i)
- { if (spans[i] != span) { (r || (r = [])).push(spans[i]) } }
- return r
-}
-// Add a span to a line.
-function addMarkedSpan(line, span) {
- line.markedSpans = line.markedSpans ? line.markedSpans.concat([span]) : [span]
- span.marker.attachLine(line)
-}
-
-// Used for the algorithm that adjusts markers for a change in the
-// document. These functions cut an array of spans at a given
-// character position, returning an array of remaining chunks (or
-// undefined if nothing remains).
-function markedSpansBefore(old, startCh, isInsert) {
- var nw
- if (old) { for (var i = 0; i < old.length; ++i) {
- var span = old[i], marker = span.marker
- var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh)
- if (startsBefore || span.from == startCh && marker.type == "bookmark" && (!isInsert || !span.marker.insertLeft)) {
- var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh);(nw || (nw = [])).push(new MarkedSpan(marker, span.from, endsAfter ? null : span.to))
- }
- } }
- return nw
-}
-function markedSpansAfter(old, endCh, isInsert) {
- var nw
- if (old) { for (var i = 0; i < old.length; ++i) {
- var span = old[i], marker = span.marker
- var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= endCh : span.to > endCh)
- if (endsAfter || span.from == endCh && marker.type == "bookmark" && (!isInsert || span.marker.insertLeft)) {
- var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= endCh : span.from < endCh);(nw || (nw = [])).push(new MarkedSpan(marker, startsBefore ? null : span.from - endCh,
- span.to == null ? null : span.to - endCh))
- }
- } }
- return nw
-}
-
-// Given a change object, compute the new set of marker spans that
-// cover the line in which the change took place. Removes spans
-// entirely within the change, reconnects spans belonging to the
-// same marker that appear on both sides of the change, and cuts off
-// spans partially within the change. Returns an array of span
-// arrays with one element for each line in (after) the change.
-function stretchSpansOverChange(doc, change) {
- if (change.full) { return null }
- var oldFirst = isLine(doc, change.from.line) && getLine(doc, change.from.line).markedSpans
- var oldLast = isLine(doc, change.to.line) && getLine(doc, change.to.line).markedSpans
- if (!oldFirst && !oldLast) { return null }
-
- var startCh = change.from.ch, endCh = change.to.ch, isInsert = cmp(change.from, change.to) == 0
- // Get the spans that 'stick out' on both sides
- var first = markedSpansBefore(oldFirst, startCh, isInsert)
- var last = markedSpansAfter(oldLast, endCh, isInsert)
-
- // Next, merge those two ends
- var sameLine = change.text.length == 1, offset = lst(change.text).length + (sameLine ? startCh : 0)
- if (first) {
- // Fix up .to properties of first
- for (var i = 0; i < first.length; ++i) {
- var span = first[i]
- if (span.to == null) {
- var found = getMarkedSpanFor(last, span.marker)
- if (!found) { span.to = startCh }
- else if (sameLine) { span.to = found.to == null ? null : found.to + offset }
- }
- }
- }
- if (last) {
- // Fix up .from in last (or move them into first in case of sameLine)
- for (var i$1 = 0; i$1 < last.length; ++i$1) {
- var span$1 = last[i$1]
- if (span$1.to != null) { span$1.to += offset }
- if (span$1.from == null) {
- var found$1 = getMarkedSpanFor(first, span$1.marker)
- if (!found$1) {
- span$1.from = offset
- if (sameLine) { (first || (first = [])).push(span$1) }
- }
- } else {
- span$1.from += offset
- if (sameLine) { (first || (first = [])).push(span$1) }
- }
- }
- }
- // Make sure we didn't create any zero-length spans
- if (first) { first = clearEmptySpans(first) }
- if (last && last != first) { last = clearEmptySpans(last) }
-
- var newMarkers = [first]
- if (!sameLine) {
- // Fill gap with whole-line-spans
- var gap = change.text.length - 2, gapMarkers
- if (gap > 0 && first)
- { for (var i$2 = 0; i$2 < first.length; ++i$2)
- { if (first[i$2].to == null)
- { (gapMarkers || (gapMarkers = [])).push(new MarkedSpan(first[i$2].marker, null, null)) } } }
- for (var i$3 = 0; i$3 < gap; ++i$3)
- { newMarkers.push(gapMarkers) }
- newMarkers.push(last)
- }
- return newMarkers
-}
-
-// Remove spans that are empty and don't have a clearWhenEmpty
-// option of false.
-function clearEmptySpans(spans) {
- for (var i = 0; i < spans.length; ++i) {
- var span = spans[i]
- if (span.from != null && span.from == span.to && span.marker.clearWhenEmpty !== false)
- { spans.splice(i--, 1) }
- }
- if (!spans.length) { return null }
- return spans
-}
-
-// Used to 'clip' out readOnly ranges when making a change.
-function removeReadOnlyRanges(doc, from, to) {
- var markers = null
- doc.iter(from.line, to.line + 1, function (line) {
- if (line.markedSpans) { for (var i = 0; i < line.markedSpans.length; ++i) {
- var mark = line.markedSpans[i].marker
- if (mark.readOnly && (!markers || indexOf(markers, mark) == -1))
- { (markers || (markers = [])).push(mark) }
- } }
- })
- if (!markers) { return null }
- var parts = [{from: from, to: to}]
- for (var i = 0; i < markers.length; ++i) {
- var mk = markers[i], m = mk.find(0)
- for (var j = 0; j < parts.length; ++j) {
- var p = parts[j]
- if (cmp(p.to, m.from) < 0 || cmp(p.from, m.to) > 0) { continue }
- var newParts = [j, 1], dfrom = cmp(p.from, m.from), dto = cmp(p.to, m.to)
- if (dfrom < 0 || !mk.inclusiveLeft && !dfrom)
- { newParts.push({from: p.from, to: m.from}) }
- if (dto > 0 || !mk.inclusiveRight && !dto)
- { newParts.push({from: m.to, to: p.to}) }
- parts.splice.apply(parts, newParts)
- j += newParts.length - 1
- }
- }
- return parts
-}
-
-// Connect or disconnect spans from a line.
-function detachMarkedSpans(line) {
- var spans = line.markedSpans
- if (!spans) { return }
- for (var i = 0; i < spans.length; ++i)
- { spans[i].marker.detachLine(line) }
- line.markedSpans = null
-}
-function attachMarkedSpans(line, spans) {
- if (!spans) { return }
- for (var i = 0; i < spans.length; ++i)
- { spans[i].marker.attachLine(line) }
- line.markedSpans = spans
-}
-
-// Helpers used when computing which overlapping collapsed span
-// counts as the larger one.
-function extraLeft(marker) { return marker.inclusiveLeft ? -1 : 0 }
-function extraRight(marker) { return marker.inclusiveRight ? 1 : 0 }
-
-// Returns a number indicating which of two overlapping collapsed
-// spans is larger (and thus includes the other). Falls back to
-// comparing ids when the spans cover exactly the same range.
-function compareCollapsedMarkers(a, b) {
- var lenDiff = a.lines.length - b.lines.length
- if (lenDiff != 0) { return lenDiff }
- var aPos = a.find(), bPos = b.find()
- var fromCmp = cmp(aPos.from, bPos.from) || extraLeft(a) - extraLeft(b)
- if (fromCmp) { return -fromCmp }
- var toCmp = cmp(aPos.to, bPos.to) || extraRight(a) - extraRight(b)
- if (toCmp) { return toCmp }
- return b.id - a.id
-}
-
-// Find out whether a line ends or starts in a collapsed span. If
-// so, return the marker for that span.
-function collapsedSpanAtSide(line, start) {
- var sps = sawCollapsedSpans && line.markedSpans, found
- if (sps) { for (var sp = void 0, i = 0; i < sps.length; ++i) {
- sp = sps[i]
- if (sp.marker.collapsed && (start ? sp.from : sp.to) == null &&
- (!found || compareCollapsedMarkers(found, sp.marker) < 0))
- { found = sp.marker }
- } }
- return found
-}
-function collapsedSpanAtStart(line) { return collapsedSpanAtSide(line, true) }
-function collapsedSpanAtEnd(line) { return collapsedSpanAtSide(line, false) }
-
-// Test whether there exists a collapsed span that partially
-// overlaps (covers the start or end, but not both) of a new span.
-// Such overlap is not allowed.
-function conflictingCollapsedRange(doc, lineNo$$1, from, to, marker) {
- var line = getLine(doc, lineNo$$1)
- var sps = sawCollapsedSpans && line.markedSpans
- if (sps) { for (var i = 0; i < sps.length; ++i) {
- var sp = sps[i]
- if (!sp.marker.collapsed) { continue }
- var found = sp.marker.find(0)
- var fromCmp = cmp(found.from, from) || extraLeft(sp.marker) - extraLeft(marker)
- var toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker)
- if (fromCmp >= 0 && toCmp <= 0 || fromCmp <= 0 && toCmp >= 0) { continue }
- if (fromCmp <= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.to, from) >= 0 : cmp(found.to, from) > 0) ||
- fromCmp >= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.from, to) <= 0 : cmp(found.from, to) < 0))
- { return true }
- } }
-}
-
-// A visual line is a line as drawn on the screen. Folding, for
-// example, can cause multiple logical lines to appear on the same
-// visual line. This finds the start of the visual line that the
-// given line is part of (usually that is the line itself).
-function visualLine(line) {
- var merged
- while (merged = collapsedSpanAtStart(line))
- { line = merged.find(-1, true).line }
- return line
-}
-
-// Returns an array of logical lines that continue the visual line
-// started by the argument, or undefined if there are no such lines.
-function visualLineContinued(line) {
- var merged, lines
- while (merged = collapsedSpanAtEnd(line)) {
- line = merged.find(1, true).line
- ;(lines || (lines = [])).push(line)
- }
- return lines
-}
-
-// Get the line number of the start of the visual line that the
-// given line number is part of.
-function visualLineNo(doc, lineN) {
- var line = getLine(doc, lineN), vis = visualLine(line)
- if (line == vis) { return lineN }
- return lineNo(vis)
-}
-
-// Get the line number of the start of the next visual line after
-// the given line.
-function visualLineEndNo(doc, lineN) {
- if (lineN > doc.lastLine()) { return lineN }
- var line = getLine(doc, lineN), merged
- if (!lineIsHidden(doc, line)) { return lineN }
- while (merged = collapsedSpanAtEnd(line))
- { line = merged.find(1, true).line }
- return lineNo(line) + 1
-}
-
-// Compute whether a line is hidden. Lines count as hidden when they
-// are part of a visual line that starts with another line, or when
-// they are entirely covered by collapsed, non-widget span.
-function lineIsHidden(doc, line) {
- var sps = sawCollapsedSpans && line.markedSpans
- if (sps) { for (var sp = void 0, i = 0; i < sps.length; ++i) {
- sp = sps[i]
- if (!sp.marker.collapsed) { continue }
- if (sp.from == null) { return true }
- if (sp.marker.widgetNode) { continue }
- if (sp.from == 0 && sp.marker.inclusiveLeft && lineIsHiddenInner(doc, line, sp))
- { return true }
- } }
-}
-function lineIsHiddenInner(doc, line, span) {
- if (span.to == null) {
- var end = span.marker.find(1, true)
- return lineIsHiddenInner(doc, end.line, getMarkedSpanFor(end.line.markedSpans, span.marker))
- }
- if (span.marker.inclusiveRight && span.to == line.text.length)
- { return true }
- for (var sp = void 0, i = 0; i < line.markedSpans.length; ++i) {
- sp = line.markedSpans[i]
- if (sp.marker.collapsed && !sp.marker.widgetNode && sp.from == span.to &&
- (sp.to == null || sp.to != span.from) &&
- (sp.marker.inclusiveLeft || span.marker.inclusiveRight) &&
- lineIsHiddenInner(doc, line, sp)) { return true }
- }
-}
-
-// Find the height above the given line.
-function heightAtLine(lineObj) {
- lineObj = visualLine(lineObj)
-
- var h = 0, chunk = lineObj.parent
- for (var i = 0; i < chunk.lines.length; ++i) {
- var line = chunk.lines[i]
- if (line == lineObj) { break }
- else { h += line.height }
- }
- for (var p = chunk.parent; p; chunk = p, p = chunk.parent) {
- for (var i$1 = 0; i$1 < p.children.length; ++i$1) {
- var cur = p.children[i$1]
- if (cur == chunk) { break }
- else { h += cur.height }
- }
- }
- return h
-}
-
-// Compute the character length of a line, taking into account
-// collapsed ranges (see markText) that might hide parts, and join
-// other lines onto it.
-function lineLength(line) {
- if (line.height == 0) { return 0 }
- var len = line.text.length, merged, cur = line
- while (merged = collapsedSpanAtStart(cur)) {
- var found = merged.find(0, true)
- cur = found.from.line
- len += found.from.ch - found.to.ch
- }
- cur = line
- while (merged = collapsedSpanAtEnd(cur)) {
- var found$1 = merged.find(0, true)
- len -= cur.text.length - found$1.from.ch
- cur = found$1.to.line
- len += cur.text.length - found$1.to.ch
- }
- return len
-}
-
-// Find the longest line in the document.
-function findMaxLine(cm) {
- var d = cm.display, doc = cm.doc
- d.maxLine = getLine(doc, doc.first)
- d.maxLineLength = lineLength(d.maxLine)
- d.maxLineChanged = true
- doc.iter(function (line) {
- var len = lineLength(line)
- if (len > d.maxLineLength) {
- d.maxLineLength = len
- d.maxLine = line
- }
- })
-}
-
-// BIDI HELPERS
-
-function iterateBidiSections(order, from, to, f) {
- if (!order) { return f(from, to, "ltr") }
- var found = false
- for (var i = 0; i < order.length; ++i) {
- var part = order[i]
- if (part.from < to && part.to > from || from == to && part.to == from) {
- f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? "rtl" : "ltr")
- found = true
- }
- }
- if (!found) { f(from, to, "ltr") }
-}
-
-function bidiLeft(part) { return part.level % 2 ? part.to : part.from }
-function bidiRight(part) { return part.level % 2 ? part.from : part.to }
-
-function lineLeft(line) { var order = getOrder(line); return order ? bidiLeft(order[0]) : 0 }
-function lineRight(line) {
- var order = getOrder(line)
- if (!order) { return line.text.length }
- return bidiRight(lst(order))
-}
-
-function compareBidiLevel(order, a, b) {
- var linedir = order[0].level
- if (a == linedir) { return true }
- if (b == linedir) { return false }
- return a < b
-}
-
-var bidiOther = null
-function getBidiPartAt(order, pos) {
- var found
- bidiOther = null
- for (var i = 0; i < order.length; ++i) {
- var cur = order[i]
- if (cur.from < pos && cur.to > pos) { return i }
- if ((cur.from == pos || cur.to == pos)) {
- if (found == null) {
- found = i
- } else if (compareBidiLevel(order, cur.level, order[found].level)) {
- if (cur.from != cur.to) { bidiOther = found }
- return i
- } else {
- if (cur.from != cur.to) { bidiOther = i }
- return found
- }
- }
- }
- return found
-}
-
-function moveInLine(line, pos, dir, byUnit) {
- if (!byUnit) { return pos + dir }
- do { pos += dir }
- while (pos > 0 && isExtendingChar(line.text.charAt(pos)))
- return pos
-}
-
-// This is needed in order to move 'visually' through bi-directional
-// text -- i.e., pressing left should make the cursor go left, even
-// when in RTL text. The tricky part is the 'jumps', where RTL and
-// LTR text touch each other. This often requires the cursor offset
-// to move more than one unit, in order to visually move one unit.
-function moveVisually(line, start, dir, byUnit) {
- var bidi = getOrder(line)
- if (!bidi) { return moveLogically(line, start, dir, byUnit) }
- var pos = getBidiPartAt(bidi, start), part = bidi[pos]
- var target = moveInLine(line, start, part.level % 2 ? -dir : dir, byUnit)
-
- for (;;) {
- if (target > part.from && target < part.to) { return target }
- if (target == part.from || target == part.to) {
- if (getBidiPartAt(bidi, target) == pos) { return target }
- part = bidi[pos += dir]
- return (dir > 0) == part.level % 2 ? part.to : part.from
- } else {
- part = bidi[pos += dir]
- if (!part) { return null }
- if ((dir > 0) == part.level % 2)
- { target = moveInLine(line, part.to, -1, byUnit) }
- else
- { target = moveInLine(line, part.from, 1, byUnit) }
- }
- }
-}
-
-function moveLogically(line, start, dir, byUnit) {
- var target = start + dir
- if (byUnit) { while (target > 0 && isExtendingChar(line.text.charAt(target))) { target += dir } }
- return target < 0 || target > line.text.length ? null : target
-}
-
-// Bidirectional ordering algorithm
-// See http://unicode.org/reports/tr9/tr9-13.html for the algorithm
-// that this (partially) implements.
-
-// One-char codes used for character types:
-// L (L): Left-to-Right
-// R (R): Right-to-Left
-// r (AL): Right-to-Left Arabic
-// 1 (EN): European Number
-// + (ES): European Number Separator
-// % (ET): European Number Terminator
-// n (AN): Arabic Number
-// , (CS): Common Number Separator
-// m (NSM): Non-Spacing Mark
-// b (BN): Boundary Neutral
-// s (B): Paragraph Separator
-// t (S): Segment Separator
-// w (WS): Whitespace
-// N (ON): Other Neutrals
-
-// Returns null if characters are ordered as they appear
-// (left-to-right), or an array of sections ({from, to, level}
-// objects) in the order in which they occur visually.
-var bidiOrdering = (function() {
- // Character types for codepoints 0 to 0xff
- var lowTypes = "bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN"
- // Character types for codepoints 0x600 to 0x6ff
- var arabicTypes = "rrrrrrrrrrrr,rNNmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmrrrrrrrnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmNmmmm"
- function charType(code) {
- if (code <= 0xf7) { return lowTypes.charAt(code) }
- else if (0x590 <= code && code <= 0x5f4) { return "R" }
- else if (0x600 <= code && code <= 0x6ed) { return arabicTypes.charAt(code - 0x600) }
- else if (0x6ee <= code && code <= 0x8ac) { return "r" }
- else if (0x2000 <= code && code <= 0x200b) { return "w" }
- else if (code == 0x200c) { return "b" }
- else { return "L" }
- }
-
- var bidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/
- var isNeutral = /[stwN]/, isStrong = /[LRr]/, countsAsLeft = /[Lb1n]/, countsAsNum = /[1n]/
- // Browsers seem to always treat the boundaries of block elements as being L.
- var outerType = "L"
-
- function BidiSpan(level, from, to) {
- this.level = level
- this.from = from; this.to = to
- }
-
- return function(str) {
- if (!bidiRE.test(str)) { return false }
- var len = str.length, types = []
- for (var i = 0; i < len; ++i)
- { types.push(charType(str.charCodeAt(i))) }
-
- // W1. Examine each non-spacing mark (NSM) in the level run, and
- // change the type of the NSM to the type of the previous
- // character. If the NSM is at the start of the level run, it will
- // get the type of sor.
- for (var i$1 = 0, prev = outerType; i$1 < len; ++i$1) {
- var type = types[i$1]
- if (type == "m") { types[i$1] = prev }
- else { prev = type }
- }
-
- // W2. Search backwards from each instance of a European number
- // until the first strong type (R, L, AL, or sor) is found. If an
- // AL is found, change the type of the European number to Arabic
- // number.
- // W3. Change all ALs to R.
- for (var i$2 = 0, cur = outerType; i$2 < len; ++i$2) {
- var type$1 = types[i$2]
- if (type$1 == "1" && cur == "r") { types[i$2] = "n" }
- else if (isStrong.test(type$1)) { cur = type$1; if (type$1 == "r") { types[i$2] = "R" } }
- }
-
- // W4. A single European separator between two European numbers
- // changes to a European number. A single common separator between
- // two numbers of the same type changes to that type.
- for (var i$3 = 1, prev$1 = types[0]; i$3 < len - 1; ++i$3) {
- var type$2 = types[i$3]
- if (type$2 == "+" && prev$1 == "1" && types[i$3+1] == "1") { types[i$3] = "1" }
- else if (type$2 == "," && prev$1 == types[i$3+1] &&
- (prev$1 == "1" || prev$1 == "n")) { types[i$3] = prev$1 }
- prev$1 = type$2
- }
-
- // W5. A sequence of European terminators adjacent to European
- // numbers changes to all European numbers.
- // W6. Otherwise, separators and terminators change to Other
- // Neutral.
- for (var i$4 = 0; i$4 < len; ++i$4) {
- var type$3 = types[i$4]
- if (type$3 == ",") { types[i$4] = "N" }
- else if (type$3 == "%") {
- var end = void 0
- for (end = i$4 + 1; end < len && types[end] == "%"; ++end) {}
- var replace = (i$4 && types[i$4-1] == "!") || (end < len && types[end] == "1") ? "1" : "N"
- for (var j = i$4; j < end; ++j) { types[j] = replace }
- i$4 = end - 1
- }
- }
-
- // W7. Search backwards from each instance of a European number
- // until the first strong type (R, L, or sor) is found. If an L is
- // found, then change the type of the European number to L.
- for (var i$5 = 0, cur$1 = outerType; i$5 < len; ++i$5) {
- var type$4 = types[i$5]
- if (cur$1 == "L" && type$4 == "1") { types[i$5] = "L" }
- else if (isStrong.test(type$4)) { cur$1 = type$4 }
- }
-
- // N1. A sequence of neutrals takes the direction of the
- // surrounding strong text if the text on both sides has the same
- // direction. European and Arabic numbers act as if they were R in
- // terms of their influence on neutrals. Start-of-level-run (sor)
- // and end-of-level-run (eor) are used at level run boundaries.
- // N2. Any remaining neutrals take the embedding direction.
- for (var i$6 = 0; i$6 < len; ++i$6) {
- if (isNeutral.test(types[i$6])) {
- var end$1 = void 0
- for (end$1 = i$6 + 1; end$1 < len && isNeutral.test(types[end$1]); ++end$1) {}
- var before = (i$6 ? types[i$6-1] : outerType) == "L"
- var after = (end$1 < len ? types[end$1] : outerType) == "L"
- var replace$1 = before || after ? "L" : "R"
- for (var j$1 = i$6; j$1 < end$1; ++j$1) { types[j$1] = replace$1 }
- i$6 = end$1 - 1
- }
- }
-
- // Here we depart from the documented algorithm, in order to avoid
- // building up an actual levels array. Since there are only three
- // levels (0, 1, 2) in an implementation that doesn't take
- // explicit embedding into account, we can build up the order on
- // the fly, without following the level-based algorithm.
- var order = [], m
- for (var i$7 = 0; i$7 < len;) {
- if (countsAsLeft.test(types[i$7])) {
- var start = i$7
- for (++i$7; i$7 < len && countsAsLeft.test(types[i$7]); ++i$7) {}
- order.push(new BidiSpan(0, start, i$7))
- } else {
- var pos = i$7, at = order.length
- for (++i$7; i$7 < len && types[i$7] != "L"; ++i$7) {}
- for (var j$2 = pos; j$2 < i$7;) {
- if (countsAsNum.test(types[j$2])) {
- if (pos < j$2) { order.splice(at, 0, new BidiSpan(1, pos, j$2)) }
- var nstart = j$2
- for (++j$2; j$2 < i$7 && countsAsNum.test(types[j$2]); ++j$2) {}
- order.splice(at, 0, new BidiSpan(2, nstart, j$2))
- pos = j$2
- } else { ++j$2 }
- }
- if (pos < i$7) { order.splice(at, 0, new BidiSpan(1, pos, i$7)) }
- }
- }
- if (order[0].level == 1 && (m = str.match(/^\s+/))) {
- order[0].from = m[0].length
- order.unshift(new BidiSpan(0, 0, m[0].length))
- }
- if (lst(order).level == 1 && (m = str.match(/\s+$/))) {
- lst(order).to -= m[0].length
- order.push(new BidiSpan(0, len - m[0].length, len))
- }
- if (order[0].level == 2)
- { order.unshift(new BidiSpan(1, order[0].to, order[0].to)) }
- if (order[0].level != lst(order).level)
- { order.push(new BidiSpan(order[0].level, len, len)) }
-
- return order
- }
-})()
-
-// Get the bidi ordering for the given line (and cache it). Returns
-// false for lines that are fully left-to-right, and an array of
-// BidiSpan objects otherwise.
-function getOrder(line) {
- var order = line.order
- if (order == null) { order = line.order = bidiOrdering(line.text) }
- return order
-}
-
-// EVENT HANDLING
-
-// Lightweight event framework. on/off also work on DOM nodes,
-// registering native DOM handlers.
-
-var on = function(emitter, type, f) {
- if (emitter.addEventListener)
- { emitter.addEventListener(type, f, false) }
- else if (emitter.attachEvent)
- { emitter.attachEvent("on" + type, f) }
- else {
- var map$$1 = emitter._handlers || (emitter._handlers = {})
- var arr = map$$1[type] || (map$$1[type] = [])
- arr.push(f)
- }
-}
-
-var noHandlers = []
-function getHandlers(emitter, type, copy) {
- var arr = emitter._handlers && emitter._handlers[type]
- if (copy) { return arr && arr.length > 0 ? arr.slice() : noHandlers }
- else { return arr || noHandlers }
-}
-
-function off(emitter, type, f) {
- if (emitter.removeEventListener)
- { emitter.removeEventListener(type, f, false) }
- else if (emitter.detachEvent)
- { emitter.detachEvent("on" + type, f) }
- else {
- var handlers = getHandlers(emitter, type, false)
- for (var i = 0; i < handlers.length; ++i)
- { if (handlers[i] == f) { handlers.splice(i, 1); break } }
- }
-}
-
-function signal(emitter, type /*, values...*/) {
- var handlers = getHandlers(emitter, type, true)
- if (!handlers.length) { return }
- var args = Array.prototype.slice.call(arguments, 2)
- for (var i = 0; i < handlers.length; ++i) { handlers[i].apply(null, args) }
-}
-
-// The DOM events that CodeMirror handles can be overridden by
-// registering a (non-DOM) handler on the editor for the event name,
-// and preventDefault-ing the event in that handler.
-function signalDOMEvent(cm, e, override) {
- if (typeof e == "string")
- { e = {type: e, preventDefault: function() { this.defaultPrevented = true }} }
- signal(cm, override || e.type, cm, e)
- return e_defaultPrevented(e) || e.codemirrorIgnore
-}
-
-function signalCursorActivity(cm) {
- var arr = cm._handlers && cm._handlers.cursorActivity
- if (!arr) { return }
- var set = cm.curOp.cursorActivityHandlers || (cm.curOp.cursorActivityHandlers = [])
- for (var i = 0; i < arr.length; ++i) { if (indexOf(set, arr[i]) == -1)
- { set.push(arr[i]) } }
-}
-
-function hasHandler(emitter, type) {
- return getHandlers(emitter, type).length > 0
-}
-
-// Add on and off methods to a constructor's prototype, to make
-// registering events on such objects more convenient.
-function eventMixin(ctor) {
- ctor.prototype.on = function(type, f) {on(this, type, f)}
- ctor.prototype.off = function(type, f) {off(this, type, f)}
-}
-
-// Due to the fact that we still support jurassic IE versions, some
-// compatibility wrappers are needed.
-
-function e_preventDefault(e) {
- if (e.preventDefault) { e.preventDefault() }
- else { e.returnValue = false }
-}
-function e_stopPropagation(e) {
- if (e.stopPropagation) { e.stopPropagation() }
- else { e.cancelBubble = true }
-}
-function e_defaultPrevented(e) {
- return e.defaultPrevented != null ? e.defaultPrevented : e.returnValue == false
-}
-function e_stop(e) {e_preventDefault(e); e_stopPropagation(e)}
-
-function e_target(e) {return e.target || e.srcElement}
-function e_button(e) {
- var b = e.which
- if (b == null) {
- if (e.button & 1) { b = 1 }
- else if (e.button & 2) { b = 3 }
- else if (e.button & 4) { b = 2 }
- }
- if (mac && e.ctrlKey && b == 1) { b = 3 }
- return b
-}
-
-// Detect drag-and-drop
-var dragAndDrop = function() {
- // There is *some* kind of drag-and-drop support in IE6-8, but I
- // couldn't get it to work yet.
- if (ie && ie_version < 9) { return false }
- var div = elt('div')
- return "draggable" in div || "dragDrop" in div
-}()
-
-var zwspSupported
-function zeroWidthElement(measure) {
- if (zwspSupported == null) {
- var test = elt("span", "\u200b")
- removeChildrenAndAdd(measure, elt("span", [test, document.createTextNode("x")]))
- if (measure.firstChild.offsetHeight != 0)
- { zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !(ie && ie_version < 8) }
- }
- var node = zwspSupported ? elt("span", "\u200b") :
- elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px")
- node.setAttribute("cm-text", "")
- return node
-}
-
-// Feature-detect IE's crummy client rect reporting for bidi text
-var badBidiRects
-function hasBadBidiRects(measure) {
- if (badBidiRects != null) { return badBidiRects }
- var txt = removeChildrenAndAdd(measure, document.createTextNode("A\u062eA"))
- var r0 = range(txt, 0, 1).getBoundingClientRect()
- var r1 = range(txt, 1, 2).getBoundingClientRect()
- removeChildren(measure)
- if (!r0 || r0.left == r0.right) { return false } // Safari returns null in some cases (#2780)
- return badBidiRects = (r1.right - r0.right < 3)
-}
-
-// See if "".split is the broken IE version, if so, provide an
-// alternative way to split lines.
-var splitLinesAuto = "\n\nb".split(/\n/).length != 3 ? function (string) {
- var pos = 0, result = [], l = string.length
- while (pos <= l) {
- var nl = string.indexOf("\n", pos)
- if (nl == -1) { nl = string.length }
- var line = string.slice(pos, string.charAt(nl - 1) == "\r" ? nl - 1 : nl)
- var rt = line.indexOf("\r")
- if (rt != -1) {
- result.push(line.slice(0, rt))
- pos += rt + 1
- } else {
- result.push(line)
- pos = nl + 1
- }
- }
- return result
-} : function (string) { return string.split(/\r\n?|\n/); }
-
-var hasSelection = window.getSelection ? function (te) {
- try { return te.selectionStart != te.selectionEnd }
- catch(e) { return false }
-} : function (te) {
- var range$$1
- try {range$$1 = te.ownerDocument.selection.createRange()}
- catch(e) {}
- if (!range$$1 || range$$1.parentElement() != te) { return false }
- return range$$1.compareEndPoints("StartToEnd", range$$1) != 0
-}
-
-var hasCopyEvent = (function () {
- var e = elt("div")
- if ("oncopy" in e) { return true }
- e.setAttribute("oncopy", "return;")
- return typeof e.oncopy == "function"
-})()
-
-var badZoomedRects = null
-function hasBadZoomedRects(measure) {
- if (badZoomedRects != null) { return badZoomedRects }
- var node = removeChildrenAndAdd(measure, elt("span", "x"))
- var normal = node.getBoundingClientRect()
- var fromRange = range(node, 0, 1).getBoundingClientRect()
- return badZoomedRects = Math.abs(normal.left - fromRange.left) > 1
-}
-
-// Known modes, by name and by MIME
-var modes = {};
-var mimeModes = {}
-
-// Extra arguments are stored as the mode's dependencies, which is
-// used by (legacy) mechanisms like loadmode.js to automatically
-// load a mode. (Preferred mechanism is the require/define calls.)
-function defineMode(name, mode) {
- if (arguments.length > 2)
- { mode.dependencies = Array.prototype.slice.call(arguments, 2) }
- modes[name] = mode
-}
-
-function defineMIME(mime, spec) {
- mimeModes[mime] = spec
-}
-
-// Given a MIME type, a {name, ...options} config object, or a name
-// string, return a mode config object.
-function resolveMode(spec) {
- if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) {
- spec = mimeModes[spec]
- } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) {
- var found = mimeModes[spec.name]
- if (typeof found == "string") { found = {name: found} }
- spec = createObj(found, spec)
- spec.name = found.name
- } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+xml$/.test(spec)) {
- return resolveMode("application/xml")
- } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+json$/.test(spec)) {
- return resolveMode("application/json")
- }
- if (typeof spec == "string") { return {name: spec} }
- else { return spec || {name: "null"} }
-}
-
-// Given a mode spec (anything that resolveMode accepts), find and
-// initialize an actual mode object.
-function getMode(options, spec) {
- spec = resolveMode(spec)
- var mfactory = modes[spec.name]
- if (!mfactory) { return getMode(options, "text/plain") }
- var modeObj = mfactory(options, spec)
- if (modeExtensions.hasOwnProperty(spec.name)) {
- var exts = modeExtensions[spec.name]
- for (var prop in exts) {
- if (!exts.hasOwnProperty(prop)) { continue }
- if (modeObj.hasOwnProperty(prop)) { modeObj["_" + prop] = modeObj[prop] }
- modeObj[prop] = exts[prop]
- }
- }
- modeObj.name = spec.name
- if (spec.helperType) { modeObj.helperType = spec.helperType }
- if (spec.modeProps) { for (var prop$1 in spec.modeProps)
- { modeObj[prop$1] = spec.modeProps[prop$1] } }
-
- return modeObj
-}
-
-// This can be used to attach properties to mode objects from
-// outside the actual mode definition.
-var modeExtensions = {}
-function extendMode(mode, properties) {
- var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {})
- copyObj(properties, exts)
-}
-
-function copyState(mode, state) {
- if (state === true) { return state }
- if (mode.copyState) { return mode.copyState(state) }
- var nstate = {}
- for (var n in state) {
- var val = state[n]
- if (val instanceof Array) { val = val.concat([]) }
- nstate[n] = val
- }
- return nstate
-}
-
-// Given a mode and a state (for that mode), find the inner mode and
-// state at the position that the state refers to.
-function innerMode(mode, state) {
- var info
- while (mode.innerMode) {
- info = mode.innerMode(state)
- if (!info || info.mode == mode) { break }
- state = info.state
- mode = info.mode
- }
- return info || {mode: mode, state: state}
-}
-
-function startState(mode, a1, a2) {
- return mode.startState ? mode.startState(a1, a2) : true
-}
-
-// STRING STREAM
-
-// Fed to the mode parsers, provides helper functions to make
-// parsers more succinct.
-
-var StringStream = function(string, tabSize) {
- this.pos = this.start = 0
- this.string = string
- this.tabSize = tabSize || 8
- this.lastColumnPos = this.lastColumnValue = 0
- this.lineStart = 0
-}
-
-StringStream.prototype = {
- eol: function() {return this.pos >= this.string.length},
- sol: function() {return this.pos == this.lineStart},
- peek: function() {return this.string.charAt(this.pos) || undefined},
- next: function() {
- if (this.pos < this.string.length)
- { return this.string.charAt(this.pos++) }
- },
- eat: function(match) {
- var ch = this.string.charAt(this.pos)
- var ok
- if (typeof match == "string") { ok = ch == match }
- else { ok = ch && (match.test ? match.test(ch) : match(ch)) }
- if (ok) {++this.pos; return ch}
- },
- eatWhile: function(match) {
- var start = this.pos
- while (this.eat(match)){}
- return this.pos > start
- },
- eatSpace: function() {
- var this$1 = this;
-
- var start = this.pos
- while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) { ++this$1.pos }
- return this.pos > start
- },
- skipToEnd: function() {this.pos = this.string.length},
- skipTo: function(ch) {
- var found = this.string.indexOf(ch, this.pos)
- if (found > -1) {this.pos = found; return true}
- },
- backUp: function(n) {this.pos -= n},
- column: function() {
- if (this.lastColumnPos < this.start) {
- this.lastColumnValue = countColumn(this.string, this.start, this.tabSize, this.lastColumnPos, this.lastColumnValue)
- this.lastColumnPos = this.start
- }
- return this.lastColumnValue - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0)
- },
- indentation: function() {
- return countColumn(this.string, null, this.tabSize) -
- (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0)
- },
- match: function(pattern, consume, caseInsensitive) {
- if (typeof pattern == "string") {
- var cased = function (str) { return caseInsensitive ? str.toLowerCase() : str; }
- var substr = this.string.substr(this.pos, pattern.length)
- if (cased(substr) == cased(pattern)) {
- if (consume !== false) { this.pos += pattern.length }
- return true
- }
- } else {
- var match = this.string.slice(this.pos).match(pattern)
- if (match && match.index > 0) { return null }
- if (match && consume !== false) { this.pos += match[0].length }
- return match
- }
- },
- current: function(){return this.string.slice(this.start, this.pos)},
- hideFirstChars: function(n, inner) {
- this.lineStart += n
- try { return inner() }
- finally { this.lineStart -= n }
- }
-}
-
-// Compute a style array (an array starting with a mode generation
-// -- for invalidation -- followed by pairs of end positions and
-// style strings), which is used to highlight the tokens on the
-// line.
-function highlightLine(cm, line, state, forceToEnd) {
- // A styles array always starts with a number identifying the
- // mode/overlays that it is based on (for easy invalidation).
- var st = [cm.state.modeGen], lineClasses = {}
- // Compute the base array of styles
- runMode(cm, line.text, cm.doc.mode, state, function (end, style) { return st.push(end, style); },
- lineClasses, forceToEnd)
-
- // Run overlays, adjust style array.
- var loop = function ( o ) {
- var overlay = cm.state.overlays[o], i = 1, at = 0
- runMode(cm, line.text, overlay.mode, true, function (end, style) {
- var start = i
- // Ensure there's a token end at the current position, and that i points at it
- while (at < end) {
- var i_end = st[i]
- if (i_end > end)
- { st.splice(i, 1, end, st[i+1], i_end) }
- i += 2
- at = Math.min(end, i_end)
- }
- if (!style) { return }
- if (overlay.opaque) {
- st.splice(start, i - start, end, "overlay " + style)
- i = start + 2
- } else {
- for (; start < i; start += 2) {
- var cur = st[start+1]
- st[start+1] = (cur ? cur + " " : "") + "overlay " + style
- }
- }
- }, lineClasses)
- };
-
- for (var o = 0; o < cm.state.overlays.length; ++o) loop( o );
-
- return {styles: st, classes: lineClasses.bgClass || lineClasses.textClass ? lineClasses : null}
-}
-
-function getLineStyles(cm, line, updateFrontier) {
- if (!line.styles || line.styles[0] != cm.state.modeGen) {
- var state = getStateBefore(cm, lineNo(line))
- var result = highlightLine(cm, line, line.text.length > cm.options.maxHighlightLength ? copyState(cm.doc.mode, state) : state)
- line.stateAfter = state
- line.styles = result.styles
- if (result.classes) { line.styleClasses = result.classes }
- else if (line.styleClasses) { line.styleClasses = null }
- if (updateFrontier === cm.doc.frontier) { cm.doc.frontier++ }
- }
- return line.styles
-}
-
-function getStateBefore(cm, n, precise) {
- var doc = cm.doc, display = cm.display
- if (!doc.mode.startState) { return true }
- var pos = findStartLine(cm, n, precise), state = pos > doc.first && getLine(doc, pos-1).stateAfter
- if (!state) { state = startState(doc.mode) }
- else { state = copyState(doc.mode, state) }
- doc.iter(pos, n, function (line) {
- processLine(cm, line.text, state)
- var save = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo
- line.stateAfter = save ? copyState(doc.mode, state) : null
- ++pos
- })
- if (precise) { doc.frontier = pos }
- return state
-}
-
-// Lightweight form of highlight -- proceed over this line and
-// update state, but don't save a style array. Used for lines that
-// aren't currently visible.
-function processLine(cm, text, state, startAt) {
- var mode = cm.doc.mode
- var stream = new StringStream(text, cm.options.tabSize)
- stream.start = stream.pos = startAt || 0
- if (text == "") { callBlankLine(mode, state) }
- while (!stream.eol()) {
- readToken(mode, stream, state)
- stream.start = stream.pos
- }
-}
-
-function callBlankLine(mode, state) {
- if (mode.blankLine) { return mode.blankLine(state) }
- if (!mode.innerMode) { return }
- var inner = innerMode(mode, state)
- if (inner.mode.blankLine) { return inner.mode.blankLine(inner.state) }
-}
-
-function readToken(mode, stream, state, inner) {
- for (var i = 0; i < 10; i++) {
- if (inner) { inner[0] = innerMode(mode, state).mode }
- var style = mode.token(stream, state)
- if (stream.pos > stream.start) { return style }
- }
- throw new Error("Mode " + mode.name + " failed to advance stream.")
-}
-
-// Utility for getTokenAt and getLineTokens
-function takeToken(cm, pos, precise, asArray) {
- var getObj = function (copy) { return ({
- start: stream.start, end: stream.pos,
- string: stream.current(),
- type: style || null,
- state: copy ? copyState(doc.mode, state) : state
- }); }
-
- var doc = cm.doc, mode = doc.mode, style
- pos = clipPos(doc, pos)
- var line = getLine(doc, pos.line), state = getStateBefore(cm, pos.line, precise)
- var stream = new StringStream(line.text, cm.options.tabSize), tokens
- if (asArray) { tokens = [] }
- while ((asArray || stream.pos < pos.ch) && !stream.eol()) {
- stream.start = stream.pos
- style = readToken(mode, stream, state)
- if (asArray) { tokens.push(getObj(true)) }
- }
- return asArray ? tokens : getObj()
-}
-
-function extractLineClasses(type, output) {
- if (type) { for (;;) {
- var lineClass = type.match(/(?:^|\s+)line-(background-)?(\S+)/)
- if (!lineClass) { break }
- type = type.slice(0, lineClass.index) + type.slice(lineClass.index + lineClass[0].length)
- var prop = lineClass[1] ? "bgClass" : "textClass"
- if (output[prop] == null)
- { output[prop] = lineClass[2] }
- else if (!(new RegExp("(?:^|\s)" + lineClass[2] + "(?:$|\s)")).test(output[prop]))
- { output[prop] += " " + lineClass[2] }
- } }
- return type
-}
-
-// Run the given mode's parser over a line, calling f for each token.
-function runMode(cm, text, mode, state, f, lineClasses, forceToEnd) {
- var flattenSpans = mode.flattenSpans
- if (flattenSpans == null) { flattenSpans = cm.options.flattenSpans }
- var curStart = 0, curStyle = null
- var stream = new StringStream(text, cm.options.tabSize), style
- var inner = cm.options.addModeClass && [null]
- if (text == "") { extractLineClasses(callBlankLine(mode, state), lineClasses) }
- while (!stream.eol()) {
- if (stream.pos > cm.options.maxHighlightLength) {
- flattenSpans = false
- if (forceToEnd) { processLine(cm, text, state, stream.pos) }
- stream.pos = text.length
- style = null
- } else {
- style = extractLineClasses(readToken(mode, stream, state, inner), lineClasses)
- }
- if (inner) {
- var mName = inner[0].name
- if (mName) { style = "m-" + (style ? mName + " " + style : mName) }
- }
- if (!flattenSpans || curStyle != style) {
- while (curStart < stream.start) {
- curStart = Math.min(stream.start, curStart + 5000)
- f(curStart, curStyle)
- }
- curStyle = style
- }
- stream.start = stream.pos
- }
- while (curStart < stream.pos) {
- // Webkit seems to refuse to render text nodes longer than 57444
- // characters, and returns inaccurate measurements in nodes
- // starting around 5000 chars.
- var pos = Math.min(stream.pos, curStart + 5000)
- f(pos, curStyle)
- curStart = pos
- }
-}
-
-// Finds the line to start with when starting a parse. Tries to
-// find a line with a stateAfter, so that it can start with a
-// valid state. If that fails, it returns the line with the
-// smallest indentation, which tends to need the least context to
-// parse correctly.
-function findStartLine(cm, n, precise) {
- var minindent, minline, doc = cm.doc
- var lim = precise ? -1 : n - (cm.doc.mode.innerMode ? 1000 : 100)
- for (var search = n; search > lim; --search) {
- if (search <= doc.first) { return doc.first }
- var line = getLine(doc, search - 1)
- if (line.stateAfter && (!precise || search <= doc.frontier)) { return search }
- var indented = countColumn(line.text, null, cm.options.tabSize)
- if (minline == null || minindent > indented) {
- minline = search - 1
- minindent = indented
- }
- }
- return minline
-}
-
-// LINE DATA STRUCTURE
-
-// Line objects. These hold state related to a line, including
-// highlighting info (the styles array).
-function Line(text, markedSpans, estimateHeight) {
- this.text = text
- attachMarkedSpans(this, markedSpans)
- this.height = estimateHeight ? estimateHeight(this) : 1
-}
-eventMixin(Line)
-Line.prototype.lineNo = function() { return lineNo(this) }
-
-// Change the content (text, markers) of a line. Automatically
-// invalidates cached information and tries to re-estimate the
-// line's height.
-function updateLine(line, text, markedSpans, estimateHeight) {
- line.text = text
- if (line.stateAfter) { line.stateAfter = null }
- if (line.styles) { line.styles = null }
- if (line.order != null) { line.order = null }
- detachMarkedSpans(line)
- attachMarkedSpans(line, markedSpans)
- var estHeight = estimateHeight ? estimateHeight(line) : 1
- if (estHeight != line.height) { updateLineHeight(line, estHeight) }
-}
-
-// Detach a line from the document tree and its markers.
-function cleanUpLine(line) {
- line.parent = null
- detachMarkedSpans(line)
-}
-
-// Convert a style as returned by a mode (either null, or a string
-// containing one or more styles) to a CSS style. This is cached,
-// and also looks for line-wide styles.
-var styleToClassCache = {};
-var styleToClassCacheWithMode = {}
-function interpretTokenStyle(style, options) {
- if (!style || /^\s*$/.test(style)) { return null }
- var cache = options.addModeClass ? styleToClassCacheWithMode : styleToClassCache
- return cache[style] ||
- (cache[style] = style.replace(/\S+/g, "cm-$&"))
-}
-
-// Render the DOM representation of the text of a line. Also builds
-// up a 'line map', which points at the DOM nodes that represent
-// specific stretches of text, and is used by the measuring code.
-// The returned object contains the DOM node, this map, and
-// information about line-wide styles that were set by the mode.
-function buildLineContent(cm, lineView) {
- // The padding-right forces the element to have a 'border', which
- // is needed on Webkit to be able to get line-level bounding
- // rectangles for it (in measureChar).
- var content = elt("span", null, null, webkit ? "padding-right: .1px" : null)
- var builder = {pre: elt("pre", [content], "CodeMirror-line"), content: content,
- col: 0, pos: 0, cm: cm,
- trailingSpace: false,
- splitSpaces: (ie || webkit) && cm.getOption("lineWrapping")}
- lineView.measure = {}
-
- // Iterate over the logical lines that make up this visual line.
- for (var i = 0; i <= (lineView.rest ? lineView.rest.length : 0); i++) {
- var line = i ? lineView.rest[i - 1] : lineView.line, order = void 0
- builder.pos = 0
- builder.addToken = buildToken
- // Optionally wire in some hacks into the token-rendering
- // algorithm, to deal with browser quirks.
- if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line)))
- { builder.addToken = buildTokenBadBidi(builder.addToken, order) }
- builder.map = []
- var allowFrontierUpdate = lineView != cm.display.externalMeasured && lineNo(line)
- insertLineContent(line, builder, getLineStyles(cm, line, allowFrontierUpdate))
- if (line.styleClasses) {
- if (line.styleClasses.bgClass)
- { builder.bgClass = joinClasses(line.styleClasses.bgClass, builder.bgClass || "") }
- if (line.styleClasses.textClass)
- { builder.textClass = joinClasses(line.styleClasses.textClass, builder.textClass || "") }
- }
-
- // Ensure at least a single node is present, for measuring.
- if (builder.map.length == 0)
- { builder.map.push(0, 0, builder.content.appendChild(zeroWidthElement(cm.display.measure))) }
-
- // Store the map and a cache object for the current logical line
- if (i == 0) {
- lineView.measure.map = builder.map
- lineView.measure.cache = {}
- } else {
- (lineView.measure.maps || (lineView.measure.maps = [])).push(builder.map)
- ;(lineView.measure.caches || (lineView.measure.caches = [])).push({})
- }
- }
-
- // See issue #2901
- if (webkit) {
- var last = builder.content.lastChild
- if (/\bcm-tab\b/.test(last.className) || (last.querySelector && last.querySelector(".cm-tab")))
- { builder.content.className = "cm-tab-wrap-hack" }
- }
-
- signal(cm, "renderLine", cm, lineView.line, builder.pre)
- if (builder.pre.className)
- { builder.textClass = joinClasses(builder.pre.className, builder.textClass || "") }
-
- return builder
-}
-
-function defaultSpecialCharPlaceholder(ch) {
- var token = elt("span", "\u2022", "cm-invalidchar")
- token.title = "\\u" + ch.charCodeAt(0).toString(16)
- token.setAttribute("aria-label", token.title)
- return token
-}
-
-// Build up the DOM representation for a single token, and add it to
-// the line map. Takes care to render special characters separately.
-function buildToken(builder, text, style, startStyle, endStyle, title, css) {
- if (!text) { return }
- var displayText = builder.splitSpaces ? splitSpaces(text, builder.trailingSpace) : text
- var special = builder.cm.state.specialChars, mustWrap = false
- var content
- if (!special.test(text)) {
- builder.col += text.length
- content = document.createTextNode(displayText)
- builder.map.push(builder.pos, builder.pos + text.length, content)
- if (ie && ie_version < 9) { mustWrap = true }
- builder.pos += text.length
- } else {
- content = document.createDocumentFragment()
- var pos = 0
- while (true) {
- special.lastIndex = pos
- var m = special.exec(text)
- var skipped = m ? m.index - pos : text.length - pos
- if (skipped) {
- var txt = document.createTextNode(displayText.slice(pos, pos + skipped))
- if (ie && ie_version < 9) { content.appendChild(elt("span", [txt])) }
- else { content.appendChild(txt) }
- builder.map.push(builder.pos, builder.pos + skipped, txt)
- builder.col += skipped
- builder.pos += skipped
- }
- if (!m) { break }
- pos += skipped + 1
- var txt$1 = void 0
- if (m[0] == "\t") {
- var tabSize = builder.cm.options.tabSize, tabWidth = tabSize - builder.col % tabSize
- txt$1 = content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab"))
- txt$1.setAttribute("role", "presentation")
- txt$1.setAttribute("cm-text", "\t")
- builder.col += tabWidth
- } else if (m[0] == "\r" || m[0] == "\n") {
- txt$1 = content.appendChild(elt("span", m[0] == "\r" ? "\u240d" : "\u2424", "cm-invalidchar"))
- txt$1.setAttribute("cm-text", m[0])
- builder.col += 1
- } else {
- txt$1 = builder.cm.options.specialCharPlaceholder(m[0])
- txt$1.setAttribute("cm-text", m[0])
- if (ie && ie_version < 9) { content.appendChild(elt("span", [txt$1])) }
- else { content.appendChild(txt$1) }
- builder.col += 1
- }
- builder.map.push(builder.pos, builder.pos + 1, txt$1)
- builder.pos++
- }
- }
- builder.trailingSpace = displayText.charCodeAt(text.length - 1) == 32
- if (style || startStyle || endStyle || mustWrap || css) {
- var fullStyle = style || ""
- if (startStyle) { fullStyle += startStyle }
- if (endStyle) { fullStyle += endStyle }
- var token = elt("span", [content], fullStyle, css)
- if (title) { token.title = title }
- return builder.content.appendChild(token)
- }
- builder.content.appendChild(content)
-}
-
-function splitSpaces(text, trailingBefore) {
- if (text.length > 1 && !/ /.test(text)) { return text }
- var spaceBefore = trailingBefore, result = ""
- for (var i = 0; i < text.length; i++) {
- var ch = text.charAt(i)
- if (ch == " " && spaceBefore && (i == text.length - 1 || text.charCodeAt(i + 1) == 32))
- { ch = "\u00a0" }
- result += ch
- spaceBefore = ch == " "
- }
- return result
-}
-
-// Work around nonsense dimensions being reported for stretches of
-// right-to-left text.
-function buildTokenBadBidi(inner, order) {
- return function (builder, text, style, startStyle, endStyle, title, css) {
- style = style ? style + " cm-force-border" : "cm-force-border"
- var start = builder.pos, end = start + text.length
- for (;;) {
- // Find the part that overlaps with the start of this text
- var part = void 0
- for (var i = 0; i < order.length; i++) {
- part = order[i]
- if (part.to > start && part.from <= start) { break }
- }
- if (part.to >= end) { return inner(builder, text, style, startStyle, endStyle, title, css) }
- inner(builder, text.slice(0, part.to - start), style, startStyle, null, title, css)
- startStyle = null
- text = text.slice(part.to - start)
- start = part.to
- }
- }
-}
-
-function buildCollapsedSpan(builder, size, marker, ignoreWidget) {
- var widget = !ignoreWidget && marker.widgetNode
- if (widget) { builder.map.push(builder.pos, builder.pos + size, widget) }
- if (!ignoreWidget && builder.cm.display.input.needsContentAttribute) {
- if (!widget)
- { widget = builder.content.appendChild(document.createElement("span")) }
- widget.setAttribute("cm-marker", marker.id)
- }
- if (widget) {
- builder.cm.display.input.setUneditable(widget)
- builder.content.appendChild(widget)
- }
- builder.pos += size
- builder.trailingSpace = false
-}
-
-// Outputs a number of spans to make up a line, taking highlighting
-// and marked text into account.
-function insertLineContent(line, builder, styles) {
- var spans = line.markedSpans, allText = line.text, at = 0
- if (!spans) {
- for (var i$1 = 1; i$1 < styles.length; i$1+=2)
- { builder.addToken(builder, allText.slice(at, at = styles[i$1]), interpretTokenStyle(styles[i$1+1], builder.cm.options)) }
- return
- }
-
- var len = allText.length, pos = 0, i = 1, text = "", style, css
- var nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, title, collapsed
- for (;;) {
- if (nextChange == pos) { // Update current marker set
- spanStyle = spanEndStyle = spanStartStyle = title = css = ""
- collapsed = null; nextChange = Infinity
- var foundBookmarks = [], endStyles = void 0
- for (var j = 0; j < spans.length; ++j) {
- var sp = spans[j], m = sp.marker
- if (m.type == "bookmark" && sp.from == pos && m.widgetNode) {
- foundBookmarks.push(m)
- } else if (sp.from <= pos && (sp.to == null || sp.to > pos || m.collapsed && sp.to == pos && sp.from == pos)) {
- if (sp.to != null && sp.to != pos && nextChange > sp.to) {
- nextChange = sp.to
- spanEndStyle = ""
- }
- if (m.className) { spanStyle += " " + m.className }
- if (m.css) { css = (css ? css + ";" : "") + m.css }
- if (m.startStyle && sp.from == pos) { spanStartStyle += " " + m.startStyle }
- if (m.endStyle && sp.to == nextChange) { (endStyles || (endStyles = [])).push(m.endStyle, sp.to) }
- if (m.title && !title) { title = m.title }
- if (m.collapsed && (!collapsed || compareCollapsedMarkers(collapsed.marker, m) < 0))
- { collapsed = sp }
- } else if (sp.from > pos && nextChange > sp.from) {
- nextChange = sp.from
- }
- }
- if (endStyles) { for (var j$1 = 0; j$1 < endStyles.length; j$1 += 2)
- { if (endStyles[j$1 + 1] == nextChange) { spanEndStyle += " " + endStyles[j$1] } } }
-
- if (!collapsed || collapsed.from == pos) { for (var j$2 = 0; j$2 < foundBookmarks.length; ++j$2)
- { buildCollapsedSpan(builder, 0, foundBookmarks[j$2]) } }
- if (collapsed && (collapsed.from || 0) == pos) {
- buildCollapsedSpan(builder, (collapsed.to == null ? len + 1 : collapsed.to) - pos,
- collapsed.marker, collapsed.from == null)
- if (collapsed.to == null) { return }
- if (collapsed.to == pos) { collapsed = false }
- }
- }
- if (pos >= len) { break }
-
- var upto = Math.min(len, nextChange)
- while (true) {
- if (text) {
- var end = pos + text.length
- if (!collapsed) {
- var tokenText = end > upto ? text.slice(0, upto - pos) : text
- builder.addToken(builder, tokenText, style ? style + spanStyle : spanStyle,
- spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "", title, css)
- }
- if (end >= upto) {text = text.slice(upto - pos); pos = upto; break}
- pos = end
- spanStartStyle = ""
- }
- text = allText.slice(at, at = styles[i++])
- style = interpretTokenStyle(styles[i++], builder.cm.options)
- }
- }
-}
-
-
-// These objects are used to represent the visible (currently drawn)
-// part of the document. A LineView may correspond to multiple
-// logical lines, if those are connected by collapsed ranges.
-function LineView(doc, line, lineN) {
- // The starting line
- this.line = line
- // Continuing lines, if any
- this.rest = visualLineContinued(line)
- // Number of logical lines in this visual line
- this.size = this.rest ? lineNo(lst(this.rest)) - lineN + 1 : 1
- this.node = this.text = null
- this.hidden = lineIsHidden(doc, line)
-}
-
-// Create a range of LineView objects for the given lines.
-function buildViewArray(cm, from, to) {
- var array = [], nextPos
- for (var pos = from; pos < to; pos = nextPos) {
- var view = new LineView(cm.doc, getLine(cm.doc, pos), pos)
- nextPos = pos + view.size
- array.push(view)
- }
- return array
-}
-
-var operationGroup = null
-
-function pushOperation(op) {
- if (operationGroup) {
- operationGroup.ops.push(op)
- } else {
- op.ownsGroup = operationGroup = {
- ops: [op],
- delayedCallbacks: []
- }
- }
-}
-
-function fireCallbacksForOps(group) {
- // Calls delayed callbacks and cursorActivity handlers until no
- // new ones appear
- var callbacks = group.delayedCallbacks, i = 0
- do {
- for (; i < callbacks.length; i++)
- { callbacks[i].call(null) }
- for (var j = 0; j < group.ops.length; j++) {
- var op = group.ops[j]
- if (op.cursorActivityHandlers)
- { while (op.cursorActivityCalled < op.cursorActivityHandlers.length)
- { op.cursorActivityHandlers[op.cursorActivityCalled++].call(null, op.cm) } }
- }
- } while (i < callbacks.length)
-}
-
-function finishOperation(op, endCb) {
- var group = op.ownsGroup
- if (!group) { return }
-
- try { fireCallbacksForOps(group) }
- finally {
- operationGroup = null
- endCb(group)
- }
-}
-
-var orphanDelayedCallbacks = null
-
-// Often, we want to signal events at a point where we are in the
-// middle of some work, but don't want the handler to start calling
-// other methods on the editor, which might be in an inconsistent
-// state or simply not expect any other events to happen.
-// signalLater looks whether there are any handlers, and schedules
-// them to be executed when the last operation ends, or, if no
-// operation is active, when a timeout fires.
-function signalLater(emitter, type /*, values...*/) {
- var arr = getHandlers(emitter, type, false)
- if (!arr.length) { return }
- var args = Array.prototype.slice.call(arguments, 2), list
- if (operationGroup) {
- list = operationGroup.delayedCallbacks
- } else if (orphanDelayedCallbacks) {
- list = orphanDelayedCallbacks
- } else {
- list = orphanDelayedCallbacks = []
- setTimeout(fireOrphanDelayed, 0)
- }
- var loop = function ( i ) {
- list.push(function () { return arr[i].apply(null, args); })
- };
-
- for (var i = 0; i < arr.length; ++i)
- loop( i );
-}
-
-function fireOrphanDelayed() {
- var delayed = orphanDelayedCallbacks
- orphanDelayedCallbacks = null
- for (var i = 0; i < delayed.length; ++i) { delayed[i]() }
-}
-
-// When an aspect of a line changes, a string is added to
-// lineView.changes. This updates the relevant part of the line's
-// DOM structure.
-function updateLineForChanges(cm, lineView, lineN, dims) {
- for (var j = 0; j < lineView.changes.length; j++) {
- var type = lineView.changes[j]
- if (type == "text") { updateLineText(cm, lineView) }
- else if (type == "gutter") { updateLineGutter(cm, lineView, lineN, dims) }
- else if (type == "class") { updateLineClasses(lineView) }
- else if (type == "widget") { updateLineWidgets(cm, lineView, dims) }
- }
- lineView.changes = null
-}
-
-// Lines with gutter elements, widgets or a background class need to
-// be wrapped, and have the extra elements added to the wrapper div
-function ensureLineWrapped(lineView) {
- if (lineView.node == lineView.text) {
- lineView.node = elt("div", null, null, "position: relative")
- if (lineView.text.parentNode)
- { lineView.text.parentNode.replaceChild(lineView.node, lineView.text) }
- lineView.node.appendChild(lineView.text)
- if (ie && ie_version < 8) { lineView.node.style.zIndex = 2 }
- }
- return lineView.node
-}
-
-function updateLineBackground(lineView) {
- var cls = lineView.bgClass ? lineView.bgClass + " " + (lineView.line.bgClass || "") : lineView.line.bgClass
- if (cls) { cls += " CodeMirror-linebackground" }
- if (lineView.background) {
- if (cls) { lineView.background.className = cls }
- else { lineView.background.parentNode.removeChild(lineView.background); lineView.background = null }
- } else if (cls) {
- var wrap = ensureLineWrapped(lineView)
- lineView.background = wrap.insertBefore(elt("div", null, cls), wrap.firstChild)
- }
-}
-
-// Wrapper around buildLineContent which will reuse the structure
-// in display.externalMeasured when possible.
-function getLineContent(cm, lineView) {
- var ext = cm.display.externalMeasured
- if (ext && ext.line == lineView.line) {
- cm.display.externalMeasured = null
- lineView.measure = ext.measure
- return ext.built
- }
- return buildLineContent(cm, lineView)
-}
-
-// Redraw the line's text. Interacts with the background and text
-// classes because the mode may output tokens that influence these
-// classes.
-function updateLineText(cm, lineView) {
- var cls = lineView.text.className
- var built = getLineContent(cm, lineView)
- if (lineView.text == lineView.node) { lineView.node = built.pre }
- lineView.text.parentNode.replaceChild(built.pre, lineView.text)
- lineView.text = built.pre
- if (built.bgClass != lineView.bgClass || built.textClass != lineView.textClass) {
- lineView.bgClass = built.bgClass
- lineView.textClass = built.textClass
- updateLineClasses(lineView)
- } else if (cls) {
- lineView.text.className = cls
- }
-}
-
-function updateLineClasses(lineView) {
- updateLineBackground(lineView)
- if (lineView.line.wrapClass)
- { ensureLineWrapped(lineView).className = lineView.line.wrapClass }
- else if (lineView.node != lineView.text)
- { lineView.node.className = "" }
- var textClass = lineView.textClass ? lineView.textClass + " " + (lineView.line.textClass || "") : lineView.line.textClass
- lineView.text.className = textClass || ""
-}
-
-function updateLineGutter(cm, lineView, lineN, dims) {
- if (lineView.gutter) {
- lineView.node.removeChild(lineView.gutter)
- lineView.gutter = null
- }
- if (lineView.gutterBackground) {
- lineView.node.removeChild(lineView.gutterBackground)
- lineView.gutterBackground = null
- }
- if (lineView.line.gutterClass) {
- var wrap = ensureLineWrapped(lineView)
- lineView.gutterBackground = elt("div", null, "CodeMirror-gutter-background " + lineView.line.gutterClass,
- ("left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px; width: " + (dims.gutterTotalWidth) + "px"))
- wrap.insertBefore(lineView.gutterBackground, lineView.text)
- }
- var markers = lineView.line.gutterMarkers
- if (cm.options.lineNumbers || markers) {
- var wrap$1 = ensureLineWrapped(lineView)
- var gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", ("left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px"))
- cm.display.input.setUneditable(gutterWrap)
- wrap$1.insertBefore(gutterWrap, lineView.text)
- if (lineView.line.gutterClass)
- { gutterWrap.className += " " + lineView.line.gutterClass }
- if (cm.options.lineNumbers && (!markers || !markers["CodeMirror-linenumbers"]))
- { lineView.lineNumber = gutterWrap.appendChild(
- elt("div", lineNumberFor(cm.options, lineN),
- "CodeMirror-linenumber CodeMirror-gutter-elt",
- ("left: " + (dims.gutterLeft["CodeMirror-linenumbers"]) + "px; width: " + (cm.display.lineNumInnerWidth) + "px"))) }
- if (markers) { for (var k = 0; k < cm.options.gutters.length; ++k) {
- var id = cm.options.gutters[k], found = markers.hasOwnProperty(id) && markers[id]
- if (found)
- { gutterWrap.appendChild(elt("div", [found], "CodeMirror-gutter-elt",
- ("left: " + (dims.gutterLeft[id]) + "px; width: " + (dims.gutterWidth[id]) + "px"))) }
- } }
- }
-}
-
-function updateLineWidgets(cm, lineView, dims) {
- if (lineView.alignable) { lineView.alignable = null }
- for (var node = lineView.node.firstChild, next = void 0; node; node = next) {
- next = node.nextSibling
- if (node.className == "CodeMirror-linewidget")
- { lineView.node.removeChild(node) }
- }
- insertLineWidgets(cm, lineView, dims)
-}
-
-// Build a line's DOM representation from scratch
-function buildLineElement(cm, lineView, lineN, dims) {
- var built = getLineContent(cm, lineView)
- lineView.text = lineView.node = built.pre
- if (built.bgClass) { lineView.bgClass = built.bgClass }
- if (built.textClass) { lineView.textClass = built.textClass }
-
- updateLineClasses(lineView)
- updateLineGutter(cm, lineView, lineN, dims)
- insertLineWidgets(cm, lineView, dims)
- return lineView.node
-}
-
-// A lineView may contain multiple logical lines (when merged by
-// collapsed spans). The widgets for all of them need to be drawn.
-function insertLineWidgets(cm, lineView, dims) {
- insertLineWidgetsFor(cm, lineView.line, lineView, dims, true)
- if (lineView.rest) { for (var i = 0; i < lineView.rest.length; i++)
- { insertLineWidgetsFor(cm, lineView.rest[i], lineView, dims, false) } }
-}
-
-function insertLineWidgetsFor(cm, line, lineView, dims, allowAbove) {
- if (!line.widgets) { return }
- var wrap = ensureLineWrapped(lineView)
- for (var i = 0, ws = line.widgets; i < ws.length; ++i) {
- var widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget")
- if (!widget.handleMouseEvents) { node.setAttribute("cm-ignore-events", "true") }
- positionLineWidget(widget, node, lineView, dims)
- cm.display.input.setUneditable(node)
- if (allowAbove && widget.above)
- { wrap.insertBefore(node, lineView.gutter || lineView.text) }
- else
- { wrap.appendChild(node) }
- signalLater(widget, "redraw")
- }
-}
-
-function positionLineWidget(widget, node, lineView, dims) {
- if (widget.noHScroll) {
- (lineView.alignable || (lineView.alignable = [])).push(node)
- var width = dims.wrapperWidth
- node.style.left = dims.fixedPos + "px"
- if (!widget.coverGutter) {
- width -= dims.gutterTotalWidth
- node.style.paddingLeft = dims.gutterTotalWidth + "px"
- }
- node.style.width = width + "px"
- }
- if (widget.coverGutter) {
- node.style.zIndex = 5
- node.style.position = "relative"
- if (!widget.noHScroll) { node.style.marginLeft = -dims.gutterTotalWidth + "px" }
- }
-}
-
-function widgetHeight(widget) {
- if (widget.height != null) { return widget.height }
- var cm = widget.doc.cm
- if (!cm) { return 0 }
- if (!contains(document.body, widget.node)) {
- var parentStyle = "position: relative;"
- if (widget.coverGutter)
- { parentStyle += "margin-left: -" + cm.display.gutters.offsetWidth + "px;" }
- if (widget.noHScroll)
- { parentStyle += "width: " + cm.display.wrapper.clientWidth + "px;" }
- removeChildrenAndAdd(cm.display.measure, elt("div", [widget.node], null, parentStyle))
- }
- return widget.height = widget.node.parentNode.offsetHeight
-}
-
-// Return true when the given mouse event happened in a widget
-function eventInWidget(display, e) {
- for (var n = e_target(e); n != display.wrapper; n = n.parentNode) {
- if (!n || (n.nodeType == 1 && n.getAttribute("cm-ignore-events") == "true") ||
- (n.parentNode == display.sizer && n != display.mover))
- { return true }
- }
-}
-
-// POSITION MEASUREMENT
-
-function paddingTop(display) {return display.lineSpace.offsetTop}
-function paddingVert(display) {return display.mover.offsetHeight - display.lineSpace.offsetHeight}
-function paddingH(display) {
- if (display.cachedPaddingH) { return display.cachedPaddingH }
- var e = removeChildrenAndAdd(display.measure, elt("pre", "x"))
- var style = window.getComputedStyle ? window.getComputedStyle(e) : e.currentStyle
- var data = {left: parseInt(style.paddingLeft), right: parseInt(style.paddingRight)}
- if (!isNaN(data.left) && !isNaN(data.right)) { display.cachedPaddingH = data }
- return data
-}
-
-function scrollGap(cm) { return scrollerGap - cm.display.nativeBarWidth }
-function displayWidth(cm) {
- return cm.display.scroller.clientWidth - scrollGap(cm) - cm.display.barWidth
-}
-function displayHeight(cm) {
- return cm.display.scroller.clientHeight - scrollGap(cm) - cm.display.barHeight
-}
-
-// Ensure the lineView.wrapping.heights array is populated. This is
-// an array of bottom offsets for the lines that make up a drawn
-// line. When lineWrapping is on, there might be more than one
-// height.
-function ensureLineHeights(cm, lineView, rect) {
- var wrapping = cm.options.lineWrapping
- var curWidth = wrapping && displayWidth(cm)
- if (!lineView.measure.heights || wrapping && lineView.measure.width != curWidth) {
- var heights = lineView.measure.heights = []
- if (wrapping) {
- lineView.measure.width = curWidth
- var rects = lineView.text.firstChild.getClientRects()
- for (var i = 0; i < rects.length - 1; i++) {
- var cur = rects[i], next = rects[i + 1]
- if (Math.abs(cur.bottom - next.bottom) > 2)
- { heights.push((cur.bottom + next.top) / 2 - rect.top) }
- }
- }
- heights.push(rect.bottom - rect.top)
- }
-}
-
-// Find a line map (mapping character offsets to text nodes) and a
-// measurement cache for the given line number. (A line view might
-// contain multiple lines when collapsed ranges are present.)
-function mapFromLineView(lineView, line, lineN) {
- if (lineView.line == line)
- { return {map: lineView.measure.map, cache: lineView.measure.cache} }
- for (var i = 0; i < lineView.rest.length; i++)
- { if (lineView.rest[i] == line)
- { return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i]} } }
- for (var i$1 = 0; i$1 < lineView.rest.length; i$1++)
- { if (lineNo(lineView.rest[i$1]) > lineN)
- { return {map: lineView.measure.maps[i$1], cache: lineView.measure.caches[i$1], before: true} } }
-}
-
-// Render a line into the hidden node display.externalMeasured. Used
-// when measurement is needed for a line that's not in the viewport.
-function updateExternalMeasurement(cm, line) {
- line = visualLine(line)
- var lineN = lineNo(line)
- var view = cm.display.externalMeasured = new LineView(cm.doc, line, lineN)
- view.lineN = lineN
- var built = view.built = buildLineContent(cm, view)
- view.text = built.pre
- removeChildrenAndAdd(cm.display.lineMeasure, built.pre)
- return view
-}
-
-// Get a {top, bottom, left, right} box (in line-local coordinates)
-// for a given character.
-function measureChar(cm, line, ch, bias) {
- return measureCharPrepared(cm, prepareMeasureForLine(cm, line), ch, bias)
-}
-
-// Find a line view that corresponds to the given line number.
-function findViewForLine(cm, lineN) {
- if (lineN >= cm.display.viewFrom && lineN < cm.display.viewTo)
- { return cm.display.view[findViewIndex(cm, lineN)] }
- var ext = cm.display.externalMeasured
- if (ext && lineN >= ext.lineN && lineN < ext.lineN + ext.size)
- { return ext }
-}
-
-// Measurement can be split in two steps, the set-up work that
-// applies to the whole line, and the measurement of the actual
-// character. Functions like coordsChar, that need to do a lot of
-// measurements in a row, can thus ensure that the set-up work is
-// only done once.
-function prepareMeasureForLine(cm, line) {
- var lineN = lineNo(line)
- var view = findViewForLine(cm, lineN)
- if (view && !view.text) {
- view = null
- } else if (view && view.changes) {
- updateLineForChanges(cm, view, lineN, getDimensions(cm))
- cm.curOp.forceUpdate = true
- }
- if (!view)
- { view = updateExternalMeasurement(cm, line) }
-
- var info = mapFromLineView(view, line, lineN)
- return {
- line: line, view: view, rect: null,
- map: info.map, cache: info.cache, before: info.before,
- hasHeights: false
- }
-}
-
-// Given a prepared measurement object, measures the position of an
-// actual character (or fetches it from the cache).
-function measureCharPrepared(cm, prepared, ch, bias, varHeight) {
- if (prepared.before) { ch = -1 }
- var key = ch + (bias || ""), found
- if (prepared.cache.hasOwnProperty(key)) {
- found = prepared.cache[key]
- } else {
- if (!prepared.rect)
- { prepared.rect = prepared.view.text.getBoundingClientRect() }
- if (!prepared.hasHeights) {
- ensureLineHeights(cm, prepared.view, prepared.rect)
- prepared.hasHeights = true
- }
- found = measureCharInner(cm, prepared, ch, bias)
- if (!found.bogus) { prepared.cache[key] = found }
- }
- return {left: found.left, right: found.right,
- top: varHeight ? found.rtop : found.top,
- bottom: varHeight ? found.rbottom : found.bottom}
-}
-
-var nullRect = {left: 0, right: 0, top: 0, bottom: 0}
-
-function nodeAndOffsetInLineMap(map$$1, ch, bias) {
- var node, start, end, collapse, mStart, mEnd
- // First, search the line map for the text node corresponding to,
- // or closest to, the target character.
- for (var i = 0; i < map$$1.length; i += 3) {
- mStart = map$$1[i]
- mEnd = map$$1[i + 1]
- if (ch < mStart) {
- start = 0; end = 1
- collapse = "left"
- } else if (ch < mEnd) {
- start = ch - mStart
- end = start + 1
- } else if (i == map$$1.length - 3 || ch == mEnd && map$$1[i + 3] > ch) {
- end = mEnd - mStart
- start = end - 1
- if (ch >= mEnd) { collapse = "right" }
- }
- if (start != null) {
- node = map$$1[i + 2]
- if (mStart == mEnd && bias == (node.insertLeft ? "left" : "right"))
- { collapse = bias }
- if (bias == "left" && start == 0)
- { while (i && map$$1[i - 2] == map$$1[i - 3] && map$$1[i - 1].insertLeft) {
- node = map$$1[(i -= 3) + 2]
- collapse = "left"
- } }
- if (bias == "right" && start == mEnd - mStart)
- { while (i < map$$1.length - 3 && map$$1[i + 3] == map$$1[i + 4] && !map$$1[i + 5].insertLeft) {
- node = map$$1[(i += 3) + 2]
- collapse = "right"
- } }
- break
- }
- }
- return {node: node, start: start, end: end, collapse: collapse, coverStart: mStart, coverEnd: mEnd}
-}
-
-function getUsefulRect(rects, bias) {
- var rect = nullRect
- if (bias == "left") { for (var i = 0; i < rects.length; i++) {
- if ((rect = rects[i]).left != rect.right) { break }
- } } else { for (var i$1 = rects.length - 1; i$1 >= 0; i$1--) {
- if ((rect = rects[i$1]).left != rect.right) { break }
- } }
- return rect
-}
-
-function measureCharInner(cm, prepared, ch, bias) {
- var place = nodeAndOffsetInLineMap(prepared.map, ch, bias)
- var node = place.node, start = place.start, end = place.end, collapse = place.collapse
-
- var rect
- if (node.nodeType == 3) { // If it is a text node, use a range to retrieve the coordinates.
- for (var i$1 = 0; i$1 < 4; i$1++) { // Retry a maximum of 4 times when nonsense rectangles are returned
- while (start && isExtendingChar(prepared.line.text.charAt(place.coverStart + start))) { --start }
- while (place.coverStart + end < place.coverEnd && isExtendingChar(prepared.line.text.charAt(place.coverStart + end))) { ++end }
- if (ie && ie_version < 9 && start == 0 && end == place.coverEnd - place.coverStart)
- { rect = node.parentNode.getBoundingClientRect() }
- else
- { rect = getUsefulRect(range(node, start, end).getClientRects(), bias) }
- if (rect.left || rect.right || start == 0) { break }
- end = start
- start = start - 1
- collapse = "right"
- }
- if (ie && ie_version < 11) { rect = maybeUpdateRectForZooming(cm.display.measure, rect) }
- } else { // If it is a widget, simply get the box for the whole widget.
- if (start > 0) { collapse = bias = "right" }
- var rects
- if (cm.options.lineWrapping && (rects = node.getClientRects()).length > 1)
- { rect = rects[bias == "right" ? rects.length - 1 : 0] }
- else
- { rect = node.getBoundingClientRect() }
- }
- if (ie && ie_version < 9 && !start && (!rect || !rect.left && !rect.right)) {
- var rSpan = node.parentNode.getClientRects()[0]
- if (rSpan)
- { rect = {left: rSpan.left, right: rSpan.left + charWidth(cm.display), top: rSpan.top, bottom: rSpan.bottom} }
- else
- { rect = nullRect }
- }
-
- var rtop = rect.top - prepared.rect.top, rbot = rect.bottom - prepared.rect.top
- var mid = (rtop + rbot) / 2
- var heights = prepared.view.measure.heights
- var i = 0
- for (; i < heights.length - 1; i++)
- { if (mid < heights[i]) { break } }
- var top = i ? heights[i - 1] : 0, bot = heights[i]
- var result = {left: (collapse == "right" ? rect.right : rect.left) - prepared.rect.left,
- right: (collapse == "left" ? rect.left : rect.right) - prepared.rect.left,
- top: top, bottom: bot}
- if (!rect.left && !rect.right) { result.bogus = true }
- if (!cm.options.singleCursorHeightPerLine) { result.rtop = rtop; result.rbottom = rbot }
-
- return result
-}
-
-// Work around problem with bounding client rects on ranges being
-// returned incorrectly when zoomed on IE10 and below.
-function maybeUpdateRectForZooming(measure, rect) {
- if (!window.screen || screen.logicalXDPI == null ||
- screen.logicalXDPI == screen.deviceXDPI || !hasBadZoomedRects(measure))
- { return rect }
- var scaleX = screen.logicalXDPI / screen.deviceXDPI
- var scaleY = screen.logicalYDPI / screen.deviceYDPI
- return {left: rect.left * scaleX, right: rect.right * scaleX,
- top: rect.top * scaleY, bottom: rect.bottom * scaleY}
-}
-
-function clearLineMeasurementCacheFor(lineView) {
- if (lineView.measure) {
- lineView.measure.cache = {}
- lineView.measure.heights = null
- if (lineView.rest) { for (var i = 0; i < lineView.rest.length; i++)
- { lineView.measure.caches[i] = {} } }
- }
-}
-
-function clearLineMeasurementCache(cm) {
- cm.display.externalMeasure = null
- removeChildren(cm.display.lineMeasure)
- for (var i = 0; i < cm.display.view.length; i++)
- { clearLineMeasurementCacheFor(cm.display.view[i]) }
-}
-
-function clearCaches(cm) {
- clearLineMeasurementCache(cm)
- cm.display.cachedCharWidth = cm.display.cachedTextHeight = cm.display.cachedPaddingH = null
- if (!cm.options.lineWrapping) { cm.display.maxLineChanged = true }
- cm.display.lineNumChars = null
-}
-
-function pageScrollX() { return window.pageXOffset || (document.documentElement || document.body).scrollLeft }
-function pageScrollY() { return window.pageYOffset || (document.documentElement || document.body).scrollTop }
-
-// Converts a {top, bottom, left, right} box from line-local
-// coordinates into another coordinate system. Context may be one of
-// "line", "div" (display.lineDiv), "local"./null (editor), "window",
-// or "page".
-function intoCoordSystem(cm, lineObj, rect, context) {
- if (lineObj.widgets) { for (var i = 0; i < lineObj.widgets.length; ++i) { if (lineObj.widgets[i].above) {
- var size = widgetHeight(lineObj.widgets[i])
- rect.top += size; rect.bottom += size
- } } }
- if (context == "line") { return rect }
- if (!context) { context = "local" }
- var yOff = heightAtLine(lineObj)
- if (context == "local") { yOff += paddingTop(cm.display) }
- else { yOff -= cm.display.viewOffset }
- if (context == "page" || context == "window") {
- var lOff = cm.display.lineSpace.getBoundingClientRect()
- yOff += lOff.top + (context == "window" ? 0 : pageScrollY())
- var xOff = lOff.left + (context == "window" ? 0 : pageScrollX())
- rect.left += xOff; rect.right += xOff
- }
- rect.top += yOff; rect.bottom += yOff
- return rect
-}
-
-// Coverts a box from "div" coords to another coordinate system.
-// Context may be "window", "page", "div", or "local"./null.
-function fromCoordSystem(cm, coords, context) {
- if (context == "div") { return coords }
- var left = coords.left, top = coords.top
- // First move into "page" coordinate system
- if (context == "page") {
- left -= pageScrollX()
- top -= pageScrollY()
- } else if (context == "local" || !context) {
- var localBox = cm.display.sizer.getBoundingClientRect()
- left += localBox.left
- top += localBox.top
- }
-
- var lineSpaceBox = cm.display.lineSpace.getBoundingClientRect()
- return {left: left - lineSpaceBox.left, top: top - lineSpaceBox.top}
-}
-
-function charCoords(cm, pos, context, lineObj, bias) {
- if (!lineObj) { lineObj = getLine(cm.doc, pos.line) }
- return intoCoordSystem(cm, lineObj, measureChar(cm, lineObj, pos.ch, bias), context)
-}
-
-// Returns a box for a given cursor position, which may have an
-// 'other' property containing the position of the secondary cursor
-// on a bidi boundary.
-function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeight) {
- lineObj = lineObj || getLine(cm.doc, pos.line)
- if (!preparedMeasure) { preparedMeasure = prepareMeasureForLine(cm, lineObj) }
- function get(ch, right) {
- var m = measureCharPrepared(cm, preparedMeasure, ch, right ? "right" : "left", varHeight)
- if (right) { m.left = m.right; } else { m.right = m.left }
- return intoCoordSystem(cm, lineObj, m, context)
- }
- function getBidi(ch, partPos) {
- var part = order[partPos], right = part.level % 2
- if (ch == bidiLeft(part) && partPos && part.level < order[partPos - 1].level) {
- part = order[--partPos]
- ch = bidiRight(part) - (part.level % 2 ? 0 : 1)
- right = true
- } else if (ch == bidiRight(part) && partPos < order.length - 1 && part.level < order[partPos + 1].level) {
- part = order[++partPos]
- ch = bidiLeft(part) - part.level % 2
- right = false
- }
- if (right && ch == part.to && ch > part.from) { return get(ch - 1) }
- return get(ch, right)
- }
- var order = getOrder(lineObj), ch = pos.ch
- if (!order) { return get(ch) }
- var partPos = getBidiPartAt(order, ch)
- var val = getBidi(ch, partPos)
- if (bidiOther != null) { val.other = getBidi(ch, bidiOther) }
- return val
-}
-
-// Used to cheaply estimate the coordinates for a position. Used for
-// intermediate scroll updates.
-function estimateCoords(cm, pos) {
- var left = 0
- pos = clipPos(cm.doc, pos)
- if (!cm.options.lineWrapping) { left = charWidth(cm.display) * pos.ch }
- var lineObj = getLine(cm.doc, pos.line)
- var top = heightAtLine(lineObj) + paddingTop(cm.display)
- return {left: left, right: left, top: top, bottom: top + lineObj.height}
-}
-
-// Positions returned by coordsChar contain some extra information.
-// xRel is the relative x position of the input coordinates compared
-// to the found position (so xRel > 0 means the coordinates are to
-// the right of the character position, for example). When outside
-// is true, that means the coordinates lie outside the line's
-// vertical range.
-function PosWithInfo(line, ch, outside, xRel) {
- var pos = Pos(line, ch)
- pos.xRel = xRel
- if (outside) { pos.outside = true }
- return pos
-}
-
-// Compute the character position closest to the given coordinates.
-// Input must be lineSpace-local ("div" coordinate system).
-function coordsChar(cm, x, y) {
- var doc = cm.doc
- y += cm.display.viewOffset
- if (y < 0) { return PosWithInfo(doc.first, 0, true, -1) }
- var lineN = lineAtHeight(doc, y), last = doc.first + doc.size - 1
- if (lineN > last)
- { return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, true, 1) }
- if (x < 0) { x = 0 }
-
- var lineObj = getLine(doc, lineN)
- for (;;) {
- var found = coordsCharInner(cm, lineObj, lineN, x, y)
- var merged = collapsedSpanAtEnd(lineObj)
- var mergedPos = merged && merged.find(0, true)
- if (merged && (found.ch > mergedPos.from.ch || found.ch == mergedPos.from.ch && found.xRel > 0))
- { lineN = lineNo(lineObj = mergedPos.to.line) }
- else
- { return found }
- }
-}
-
-function coordsCharInner(cm, lineObj, lineNo$$1, x, y) {
- var innerOff = y - heightAtLine(lineObj)
- var wrongLine = false, adjust = 2 * cm.display.wrapper.clientWidth
- var preparedMeasure = prepareMeasureForLine(cm, lineObj)
-
- function getX(ch) {
- var sp = cursorCoords(cm, Pos(lineNo$$1, ch), "line", lineObj, preparedMeasure)
- wrongLine = true
- if (innerOff > sp.bottom) { return sp.left - adjust }
- else if (innerOff < sp.top) { return sp.left + adjust }
- else { wrongLine = false }
- return sp.left
- }
-
- var bidi = getOrder(lineObj), dist = lineObj.text.length
- var from = lineLeft(lineObj), to = lineRight(lineObj)
- var fromX = getX(from), fromOutside = wrongLine, toX = getX(to), toOutside = wrongLine
-
- if (x > toX) { return PosWithInfo(lineNo$$1, to, toOutside, 1) }
- // Do a binary search between these bounds.
- for (;;) {
- if (bidi ? to == from || to == moveVisually(lineObj, from, 1) : to - from <= 1) {
- var ch = x < fromX || x - fromX <= toX - x ? from : to
- var outside = ch == from ? fromOutside : toOutside
- var xDiff = x - (ch == from ? fromX : toX)
- // This is a kludge to handle the case where the coordinates
- // are after a line-wrapped line. We should replace it with a
- // more general handling of cursor positions around line
- // breaks. (Issue #4078)
- if (toOutside && !bidi && !/\s/.test(lineObj.text.charAt(ch)) && xDiff > 0 &&
- ch < lineObj.text.length && preparedMeasure.view.measure.heights.length > 1) {
- var charSize = measureCharPrepared(cm, preparedMeasure, ch, "right")
- if (innerOff <= charSize.bottom && innerOff >= charSize.top && Math.abs(x - charSize.right) < xDiff) {
- outside = false
- ch++
- xDiff = x - charSize.right
- }
- }
- while (isExtendingChar(lineObj.text.charAt(ch))) { ++ch }
- var pos = PosWithInfo(lineNo$$1, ch, outside, xDiff < -1 ? -1 : xDiff > 1 ? 1 : 0)
- return pos
- }
- var step = Math.ceil(dist / 2), middle = from + step
- if (bidi) {
- middle = from
- for (var i = 0; i < step; ++i) { middle = moveVisually(lineObj, middle, 1) }
- }
- var middleX = getX(middle)
- if (middleX > x) {to = middle; toX = middleX; if (toOutside = wrongLine) { toX += 1000; } dist = step}
- else {from = middle; fromX = middleX; fromOutside = wrongLine; dist -= step}
- }
-}
-
-var measureText
-// Compute the default text height.
-function textHeight(display) {
- if (display.cachedTextHeight != null) { return display.cachedTextHeight }
- if (measureText == null) {
- measureText = elt("pre")
- // Measure a bunch of lines, for browsers that compute
- // fractional heights.
- for (var i = 0; i < 49; ++i) {
- measureText.appendChild(document.createTextNode("x"))
- measureText.appendChild(elt("br"))
- }
- measureText.appendChild(document.createTextNode("x"))
- }
- removeChildrenAndAdd(display.measure, measureText)
- var height = measureText.offsetHeight / 50
- if (height > 3) { display.cachedTextHeight = height }
- removeChildren(display.measure)
- return height || 1
-}
-
-// Compute the default character width.
-function charWidth(display) {
- if (display.cachedCharWidth != null) { return display.cachedCharWidth }
- var anchor = elt("span", "xxxxxxxxxx")
- var pre = elt("pre", [anchor])
- removeChildrenAndAdd(display.measure, pre)
- var rect = anchor.getBoundingClientRect(), width = (rect.right - rect.left) / 10
- if (width > 2) { display.cachedCharWidth = width }
- return width || 10
-}
-
-// Do a bulk-read of the DOM positions and sizes needed to draw the
-// view, so that we don't interleave reading and writing to the DOM.
-function getDimensions(cm) {
- var d = cm.display, left = {}, width = {}
- var gutterLeft = d.gutters.clientLeft
- for (var n = d.gutters.firstChild, i = 0; n; n = n.nextSibling, ++i) {
- left[cm.options.gutters[i]] = n.offsetLeft + n.clientLeft + gutterLeft
- width[cm.options.gutters[i]] = n.clientWidth
- }
- return {fixedPos: compensateForHScroll(d),
- gutterTotalWidth: d.gutters.offsetWidth,
- gutterLeft: left,
- gutterWidth: width,
- wrapperWidth: d.wrapper.clientWidth}
-}
-
-// Computes display.scroller.scrollLeft + display.gutters.offsetWidth,
-// but using getBoundingClientRect to get a sub-pixel-accurate
-// result.
-function compensateForHScroll(display) {
- return display.scroller.getBoundingClientRect().left - display.sizer.getBoundingClientRect().left
-}
-
-// Returns a function that estimates the height of a line, to use as
-// first approximation until the line becomes visible (and is thus
-// properly measurable).
-function estimateHeight(cm) {
- var th = textHeight(cm.display), wrapping = cm.options.lineWrapping
- var perLine = wrapping && Math.max(5, cm.display.scroller.clientWidth / charWidth(cm.display) - 3)
- return function (line) {
- if (lineIsHidden(cm.doc, line)) { return 0 }
-
- var widgetsHeight = 0
- if (line.widgets) { for (var i = 0; i < line.widgets.length; i++) {
- if (line.widgets[i].height) { widgetsHeight += line.widgets[i].height }
- } }
-
- if (wrapping)
- { return widgetsHeight + (Math.ceil(line.text.length / perLine) || 1) * th }
- else
- { return widgetsHeight + th }
- }
-}
-
-function estimateLineHeights(cm) {
- var doc = cm.doc, est = estimateHeight(cm)
- doc.iter(function (line) {
- var estHeight = est(line)
- if (estHeight != line.height) { updateLineHeight(line, estHeight) }
- })
-}
-
-// Given a mouse event, find the corresponding position. If liberal
-// is false, it checks whether a gutter or scrollbar was clicked,
-// and returns null if it was. forRect is used by rectangular
-// selections, and tries to estimate a character position even for
-// coordinates beyond the right of the text.
-function posFromMouse(cm, e, liberal, forRect) {
- var display = cm.display
- if (!liberal && e_target(e).getAttribute("cm-not-content") == "true") { return null }
-
- var x, y, space = display.lineSpace.getBoundingClientRect()
- // Fails unpredictably on IE[67] when mouse is dragged around quickly.
- try { x = e.clientX - space.left; y = e.clientY - space.top }
- catch (e) { return null }
- var coords = coordsChar(cm, x, y), line
- if (forRect && coords.xRel == 1 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) {
- var colDiff = countColumn(line, line.length, cm.options.tabSize) - line.length
- coords = Pos(coords.line, Math.max(0, Math.round((x - paddingH(cm.display).left) / charWidth(cm.display)) - colDiff))
- }
- return coords
-}
-
-// Find the view element corresponding to a given line. Return null
-// when the line isn't visible.
-function findViewIndex(cm, n) {
- if (n >= cm.display.viewTo) { return null }
- n -= cm.display.viewFrom
- if (n < 0) { return null }
- var view = cm.display.view
- for (var i = 0; i < view.length; i++) {
- n -= view[i].size
- if (n < 0) { return i }
- }
-}
-
-function updateSelection(cm) {
- cm.display.input.showSelection(cm.display.input.prepareSelection())
-}
-
-function prepareSelection(cm, primary) {
- var doc = cm.doc, result = {}
- var curFragment = result.cursors = document.createDocumentFragment()
- var selFragment = result.selection = document.createDocumentFragment()
-
- for (var i = 0; i < doc.sel.ranges.length; i++) {
- if (primary === false && i == doc.sel.primIndex) { continue }
- var range$$1 = doc.sel.ranges[i]
- if (range$$1.from().line >= cm.display.viewTo || range$$1.to().line < cm.display.viewFrom) { continue }
- var collapsed = range$$1.empty()
- if (collapsed || cm.options.showCursorWhenSelecting)
- { drawSelectionCursor(cm, range$$1.head, curFragment) }
- if (!collapsed)
- { drawSelectionRange(cm, range$$1, selFragment) }
- }
- return result
-}
-
-// Draws a cursor for the given range
-function drawSelectionCursor(cm, head, output) {
- var pos = cursorCoords(cm, head, "div", null, null, !cm.options.singleCursorHeightPerLine)
-
- var cursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor"))
- cursor.style.left = pos.left + "px"
- cursor.style.top = pos.top + "px"
- cursor.style.height = Math.max(0, pos.bottom - pos.top) * cm.options.cursorHeight + "px"
-
- if (pos.other) {
- // Secondary cursor, shown when on a 'jump' in bi-directional text
- var otherCursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor CodeMirror-secondarycursor"))
- otherCursor.style.display = ""
- otherCursor.style.left = pos.other.left + "px"
- otherCursor.style.top = pos.other.top + "px"
- otherCursor.style.height = (pos.other.bottom - pos.other.top) * .85 + "px"
- }
-}
-
-// Draws the given range as a highlighted selection
-function drawSelectionRange(cm, range$$1, output) {
- var display = cm.display, doc = cm.doc
- var fragment = document.createDocumentFragment()
- var padding = paddingH(cm.display), leftSide = padding.left
- var rightSide = Math.max(display.sizerWidth, displayWidth(cm) - display.sizer.offsetLeft) - padding.right
-
- function add(left, top, width, bottom) {
- if (top < 0) { top = 0 }
- top = Math.round(top)
- bottom = Math.round(bottom)
- fragment.appendChild(elt("div", null, "CodeMirror-selected", ("position: absolute; left: " + left + "px;\n top: " + top + "px; width: " + (width == null ? rightSide - left : width) + "px;\n height: " + (bottom - top) + "px")))
- }
-
- function drawForLine(line, fromArg, toArg) {
- var lineObj = getLine(doc, line)
- var lineLen = lineObj.text.length
- var start, end
- function coords(ch, bias) {
- return charCoords(cm, Pos(line, ch), "div", lineObj, bias)
- }
-
- iterateBidiSections(getOrder(lineObj), fromArg || 0, toArg == null ? lineLen : toArg, function (from, to, dir) {
- var leftPos = coords(from, "left"), rightPos, left, right
- if (from == to) {
- rightPos = leftPos
- left = right = leftPos.left
- } else {
- rightPos = coords(to - 1, "right")
- if (dir == "rtl") { var tmp = leftPos; leftPos = rightPos; rightPos = tmp }
- left = leftPos.left
- right = rightPos.right
- }
- if (fromArg == null && from == 0) { left = leftSide }
- if (rightPos.top - leftPos.top > 3) { // Different lines, draw top part
- add(left, leftPos.top, null, leftPos.bottom)
- left = leftSide
- if (leftPos.bottom < rightPos.top) { add(left, leftPos.bottom, null, rightPos.top) }
- }
- if (toArg == null && to == lineLen) { right = rightSide }
- if (!start || leftPos.top < start.top || leftPos.top == start.top && leftPos.left < start.left)
- { start = leftPos }
- if (!end || rightPos.bottom > end.bottom || rightPos.bottom == end.bottom && rightPos.right > end.right)
- { end = rightPos }
- if (left < leftSide + 1) { left = leftSide }
- add(left, rightPos.top, right - left, rightPos.bottom)
- })
- return {start: start, end: end}
- }
-
- var sFrom = range$$1.from(), sTo = range$$1.to()
- if (sFrom.line == sTo.line) {
- drawForLine(sFrom.line, sFrom.ch, sTo.ch)
- } else {
- var fromLine = getLine(doc, sFrom.line), toLine = getLine(doc, sTo.line)
- var singleVLine = visualLine(fromLine) == visualLine(toLine)
- var leftEnd = drawForLine(sFrom.line, sFrom.ch, singleVLine ? fromLine.text.length + 1 : null).end
- var rightStart = drawForLine(sTo.line, singleVLine ? 0 : null, sTo.ch).start
- if (singleVLine) {
- if (leftEnd.top < rightStart.top - 2) {
- add(leftEnd.right, leftEnd.top, null, leftEnd.bottom)
- add(leftSide, rightStart.top, rightStart.left, rightStart.bottom)
- } else {
- add(leftEnd.right, leftEnd.top, rightStart.left - leftEnd.right, leftEnd.bottom)
- }
- }
- if (leftEnd.bottom < rightStart.top)
- { add(leftSide, leftEnd.bottom, null, rightStart.top) }
- }
-
- output.appendChild(fragment)
-}
-
-// Cursor-blinking
-function restartBlink(cm) {
- if (!cm.state.focused) { return }
- var display = cm.display
- clearInterval(display.blinker)
- var on = true
- display.cursorDiv.style.visibility = ""
- if (cm.options.cursorBlinkRate > 0)
- { display.blinker = setInterval(function () { return display.cursorDiv.style.visibility = (on = !on) ? "" : "hidden"; },
- cm.options.cursorBlinkRate) }
- else if (cm.options.cursorBlinkRate < 0)
- { display.cursorDiv.style.visibility = "hidden" }
-}
-
-function ensureFocus(cm) {
- if (!cm.state.focused) { cm.display.input.focus(); onFocus(cm) }
-}
-
-function delayBlurEvent(cm) {
- cm.state.delayingBlurEvent = true
- setTimeout(function () { if (cm.state.delayingBlurEvent) {
- cm.state.delayingBlurEvent = false
- onBlur(cm)
- } }, 100)
-}
-
-function onFocus(cm, e) {
- if (cm.state.delayingBlurEvent) { cm.state.delayingBlurEvent = false }
-
- if (cm.options.readOnly == "nocursor") { return }
- if (!cm.state.focused) {
- signal(cm, "focus", cm, e)
- cm.state.focused = true
- addClass(cm.display.wrapper, "CodeMirror-focused")
- // This test prevents this from firing when a context
- // menu is closed (since the input reset would kill the
- // select-all detection hack)
- if (!cm.curOp && cm.display.selForContextMenu != cm.doc.sel) {
- cm.display.input.reset()
- if (webkit) { setTimeout(function () { return cm.display.input.reset(true); }, 20) } // Issue #1730
- }
- cm.display.input.receivedFocus()
- }
- restartBlink(cm)
-}
-function onBlur(cm, e) {
- if (cm.state.delayingBlurEvent) { return }
-
- if (cm.state.focused) {
- signal(cm, "blur", cm, e)
- cm.state.focused = false
- rmClass(cm.display.wrapper, "CodeMirror-focused")
- }
- clearInterval(cm.display.blinker)
- setTimeout(function () { if (!cm.state.focused) { cm.display.shift = false } }, 150)
-}
-
-// Re-align line numbers and gutter marks to compensate for
-// horizontal scrolling.
-function alignHorizontally(cm) {
- var display = cm.display, view = display.view
- if (!display.alignWidgets && (!display.gutters.firstChild || !cm.options.fixedGutter)) { return }
- var comp = compensateForHScroll(display) - display.scroller.scrollLeft + cm.doc.scrollLeft
- var gutterW = display.gutters.offsetWidth, left = comp + "px"
- for (var i = 0; i < view.length; i++) { if (!view[i].hidden) {
- if (cm.options.fixedGutter) {
- if (view[i].gutter)
- { view[i].gutter.style.left = left }
- if (view[i].gutterBackground)
- { view[i].gutterBackground.style.left = left }
- }
- var align = view[i].alignable
- if (align) { for (var j = 0; j < align.length; j++)
- { align[j].style.left = left } }
- } }
- if (cm.options.fixedGutter)
- { display.gutters.style.left = (comp + gutterW) + "px" }
-}
-
-// Used to ensure that the line number gutter is still the right
-// size for the current document size. Returns true when an update
-// is needed.
-function maybeUpdateLineNumberWidth(cm) {
- if (!cm.options.lineNumbers) { return false }
- var doc = cm.doc, last = lineNumberFor(cm.options, doc.first + doc.size - 1), display = cm.display
- if (last.length != display.lineNumChars) {
- var test = display.measure.appendChild(elt("div", [elt("div", last)],
- "CodeMirror-linenumber CodeMirror-gutter-elt"))
- var innerW = test.firstChild.offsetWidth, padding = test.offsetWidth - innerW
- display.lineGutter.style.width = ""
- display.lineNumInnerWidth = Math.max(innerW, display.lineGutter.offsetWidth - padding) + 1
- display.lineNumWidth = display.lineNumInnerWidth + padding
- display.lineNumChars = display.lineNumInnerWidth ? last.length : -1
- display.lineGutter.style.width = display.lineNumWidth + "px"
- updateGutterSpace(cm)
- return true
- }
- return false
-}
-
-// Read the actual heights of the rendered lines, and update their
-// stored heights to match.
-function updateHeightsInViewport(cm) {
- var display = cm.display
- var prevBottom = display.lineDiv.offsetTop
- for (var i = 0; i < display.view.length; i++) {
- var cur = display.view[i], height = void 0
- if (cur.hidden) { continue }
- if (ie && ie_version < 8) {
- var bot = cur.node.offsetTop + cur.node.offsetHeight
- height = bot - prevBottom
- prevBottom = bot
- } else {
- var box = cur.node.getBoundingClientRect()
- height = box.bottom - box.top
- }
- var diff = cur.line.height - height
- if (height < 2) { height = textHeight(display) }
- if (diff > .001 || diff < -.001) {
- updateLineHeight(cur.line, height)
- updateWidgetHeight(cur.line)
- if (cur.rest) { for (var j = 0; j < cur.rest.length; j++)
- { updateWidgetHeight(cur.rest[j]) } }
- }
- }
-}
-
-// Read and store the height of line widgets associated with the
-// given line.
-function updateWidgetHeight(line) {
- if (line.widgets) { for (var i = 0; i < line.widgets.length; ++i)
- { line.widgets[i].height = line.widgets[i].node.parentNode.offsetHeight } }
-}
-
-// Compute the lines that are visible in a given viewport (defaults
-// the the current scroll position). viewport may contain top,
-// height, and ensure (see op.scrollToPos) properties.
-function visibleLines(display, doc, viewport) {
- var top = viewport && viewport.top != null ? Math.max(0, viewport.top) : display.scroller.scrollTop
- top = Math.floor(top - paddingTop(display))
- var bottom = viewport && viewport.bottom != null ? viewport.bottom : top + display.wrapper.clientHeight
-
- var from = lineAtHeight(doc, top), to = lineAtHeight(doc, bottom)
- // Ensure is a {from: {line, ch}, to: {line, ch}} object, and
- // forces those lines into the viewport (if possible).
- if (viewport && viewport.ensure) {
- var ensureFrom = viewport.ensure.from.line, ensureTo = viewport.ensure.to.line
- if (ensureFrom < from) {
- from = ensureFrom
- to = lineAtHeight(doc, heightAtLine(getLine(doc, ensureFrom)) + display.wrapper.clientHeight)
- } else if (Math.min(ensureTo, doc.lastLine()) >= to) {
- from = lineAtHeight(doc, heightAtLine(getLine(doc, ensureTo)) - display.wrapper.clientHeight)
- to = ensureTo
- }
- }
- return {from: from, to: Math.max(to, from + 1)}
-}
-
-// Sync the scrollable area and scrollbars, ensure the viewport
-// covers the visible area.
-function setScrollTop(cm, val) {
- if (Math.abs(cm.doc.scrollTop - val) < 2) { return }
- cm.doc.scrollTop = val
- if (!gecko) { updateDisplaySimple(cm, {top: val}) }
- if (cm.display.scroller.scrollTop != val) { cm.display.scroller.scrollTop = val }
- cm.display.scrollbars.setScrollTop(val)
- if (gecko) { updateDisplaySimple(cm) }
- startWorker(cm, 100)
-}
-// Sync scroller and scrollbar, ensure the gutter elements are
-// aligned.
-function setScrollLeft(cm, val, isScroller) {
- if (isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) { return }
- val = Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth)
- cm.doc.scrollLeft = val
- alignHorizontally(cm)
- if (cm.display.scroller.scrollLeft != val) { cm.display.scroller.scrollLeft = val }
- cm.display.scrollbars.setScrollLeft(val)
-}
-
-// Since the delta values reported on mouse wheel events are
-// unstandardized between browsers and even browser versions, and
-// generally horribly unpredictable, this code starts by measuring
-// the scroll effect that the first few mouse wheel events have,
-// and, from that, detects the way it can convert deltas to pixel
-// offsets afterwards.
-//
-// The reason we want to know the amount a wheel event will scroll
-// is that it gives us a chance to update the display before the
-// actual scrolling happens, reducing flickering.
-
-var wheelSamples = 0;
-var wheelPixelsPerUnit = null
-// Fill in a browser-detected starting value on browsers where we
-// know one. These don't have to be accurate -- the result of them
-// being wrong would just be a slight flicker on the first wheel
-// scroll (if it is large enough).
-if (ie) { wheelPixelsPerUnit = -.53 }
-else if (gecko) { wheelPixelsPerUnit = 15 }
-else if (chrome) { wheelPixelsPerUnit = -.7 }
-else if (safari) { wheelPixelsPerUnit = -1/3 }
-
-function wheelEventDelta(e) {
- var dx = e.wheelDeltaX, dy = e.wheelDeltaY
- if (dx == null && e.detail && e.axis == e.HORIZONTAL_AXIS) { dx = e.detail }
- if (dy == null && e.detail && e.axis == e.VERTICAL_AXIS) { dy = e.detail }
- else if (dy == null) { dy = e.wheelDelta }
- return {x: dx, y: dy}
-}
-function wheelEventPixels(e) {
- var delta = wheelEventDelta(e)
- delta.x *= wheelPixelsPerUnit
- delta.y *= wheelPixelsPerUnit
- return delta
-}
-
-function onScrollWheel(cm, e) {
- var delta = wheelEventDelta(e), dx = delta.x, dy = delta.y
-
- var display = cm.display, scroll = display.scroller
- // Quit if there's nothing to scroll here
- var canScrollX = scroll.scrollWidth > scroll.clientWidth
- var canScrollY = scroll.scrollHeight > scroll.clientHeight
- if (!(dx && canScrollX || dy && canScrollY)) { return }
-
- // Webkit browsers on OS X abort momentum scrolls when the target
- // of the scroll event is removed from the scrollable element.
- // This hack (see related code in patchDisplay) makes sure the
- // element is kept around.
- if (dy && mac && webkit) {
- outer: for (var cur = e.target, view = display.view; cur != scroll; cur = cur.parentNode) {
- for (var i = 0; i < view.length; i++) {
- if (view[i].node == cur) {
- cm.display.currentWheelTarget = cur
- break outer
- }
- }
- }
- }
-
- // On some browsers, horizontal scrolling will cause redraws to
- // happen before the gutter has been realigned, causing it to
- // wriggle around in a most unseemly way. When we have an
- // estimated pixels/delta value, we just handle horizontal
- // scrolling entirely here. It'll be slightly off from native, but
- // better than glitching out.
- if (dx && !gecko && !presto && wheelPixelsPerUnit != null) {
- if (dy && canScrollY)
- { setScrollTop(cm, Math.max(0, Math.min(scroll.scrollTop + dy * wheelPixelsPerUnit, scroll.scrollHeight - scroll.clientHeight))) }
- setScrollLeft(cm, Math.max(0, Math.min(scroll.scrollLeft + dx * wheelPixelsPerUnit, scroll.scrollWidth - scroll.clientWidth)))
- // Only prevent default scrolling if vertical scrolling is
- // actually possible. Otherwise, it causes vertical scroll
- // jitter on OSX trackpads when deltaX is small and deltaY
- // is large (issue #3579)
- if (!dy || (dy && canScrollY))
- { e_preventDefault(e) }
- display.wheelStartX = null // Abort measurement, if in progress
- return
- }
-
- // 'Project' the visible viewport to cover the area that is being
- // scrolled into view (if we know enough to estimate it).
- if (dy && wheelPixelsPerUnit != null) {
- var pixels = dy * wheelPixelsPerUnit
- var top = cm.doc.scrollTop, bot = top + display.wrapper.clientHeight
- if (pixels < 0) { top = Math.max(0, top + pixels - 50) }
- else { bot = Math.min(cm.doc.height, bot + pixels + 50) }
- updateDisplaySimple(cm, {top: top, bottom: bot})
- }
-
- if (wheelSamples < 20) {
- if (display.wheelStartX == null) {
- display.wheelStartX = scroll.scrollLeft; display.wheelStartY = scroll.scrollTop
- display.wheelDX = dx; display.wheelDY = dy
- setTimeout(function () {
- if (display.wheelStartX == null) { return }
- var movedX = scroll.scrollLeft - display.wheelStartX
- var movedY = scroll.scrollTop - display.wheelStartY
- var sample = (movedY && display.wheelDY && movedY / display.wheelDY) ||
- (movedX && display.wheelDX && movedX / display.wheelDX)
- display.wheelStartX = display.wheelStartY = null
- if (!sample) { return }
- wheelPixelsPerUnit = (wheelPixelsPerUnit * wheelSamples + sample) / (wheelSamples + 1)
- ++wheelSamples
- }, 200)
- } else {
- display.wheelDX += dx; display.wheelDY += dy
- }
- }
-}
-
-// SCROLLBARS
-
-// Prepare DOM reads needed to update the scrollbars. Done in one
-// shot to minimize update/measure roundtrips.
-function measureForScrollbars(cm) {
- var d = cm.display, gutterW = d.gutters.offsetWidth
- var docH = Math.round(cm.doc.height + paddingVert(cm.display))
- return {
- clientHeight: d.scroller.clientHeight,
- viewHeight: d.wrapper.clientHeight,
- scrollWidth: d.scroller.scrollWidth, clientWidth: d.scroller.clientWidth,
- viewWidth: d.wrapper.clientWidth,
- barLeft: cm.options.fixedGutter ? gutterW : 0,
- docHeight: docH,
- scrollHeight: docH + scrollGap(cm) + d.barHeight,
- nativeBarWidth: d.nativeBarWidth,
- gutterWidth: gutterW
- }
-}
-
-function NativeScrollbars(place, scroll, cm) {
- this.cm = cm
- var vert = this.vert = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar")
- var horiz = this.horiz = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar")
- place(vert); place(horiz)
-
- on(vert, "scroll", function () {
- if (vert.clientHeight) { scroll(vert.scrollTop, "vertical") }
- })
- on(horiz, "scroll", function () {
- if (horiz.clientWidth) { scroll(horiz.scrollLeft, "horizontal") }
- })
-
- this.checkedZeroWidth = false
- // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
- if (ie && ie_version < 8) { this.horiz.style.minHeight = this.vert.style.minWidth = "18px" }
-}
-
-NativeScrollbars.prototype = copyObj({
- update: function(measure) {
- var needsH = measure.scrollWidth > measure.clientWidth + 1
- var needsV = measure.scrollHeight > measure.clientHeight + 1
- var sWidth = measure.nativeBarWidth
-
- if (needsV) {
- this.vert.style.display = "block"
- this.vert.style.bottom = needsH ? sWidth + "px" : "0"
- var totalHeight = measure.viewHeight - (needsH ? sWidth : 0)
- // A bug in IE8 can cause this value to be negative, so guard it.
- this.vert.firstChild.style.height =
- Math.max(0, measure.scrollHeight - measure.clientHeight + totalHeight) + "px"
- } else {
- this.vert.style.display = ""
- this.vert.firstChild.style.height = "0"
- }
-
- if (needsH) {
- this.horiz.style.display = "block"
- this.horiz.style.right = needsV ? sWidth + "px" : "0"
- this.horiz.style.left = measure.barLeft + "px"
- var totalWidth = measure.viewWidth - measure.barLeft - (needsV ? sWidth : 0)
- this.horiz.firstChild.style.width =
- (measure.scrollWidth - measure.clientWidth + totalWidth) + "px"
- } else {
- this.horiz.style.display = ""
- this.horiz.firstChild.style.width = "0"
- }
-
- if (!this.checkedZeroWidth && measure.clientHeight > 0) {
- if (sWidth == 0) { this.zeroWidthHack() }
- this.checkedZeroWidth = true
- }
-
- return {right: needsV ? sWidth : 0, bottom: needsH ? sWidth : 0}
- },
- setScrollLeft: function(pos) {
- if (this.horiz.scrollLeft != pos) { this.horiz.scrollLeft = pos }
- if (this.disableHoriz) { this.enableZeroWidthBar(this.horiz, this.disableHoriz) }
- },
- setScrollTop: function(pos) {
- if (this.vert.scrollTop != pos) { this.vert.scrollTop = pos }
- if (this.disableVert) { this.enableZeroWidthBar(this.vert, this.disableVert) }
- },
- zeroWidthHack: function() {
- var w = mac && !mac_geMountainLion ? "12px" : "18px"
- this.horiz.style.height = this.vert.style.width = w
- this.horiz.style.pointerEvents = this.vert.style.pointerEvents = "none"
- this.disableHoriz = new Delayed
- this.disableVert = new Delayed
- },
- enableZeroWidthBar: function(bar, delay) {
- bar.style.pointerEvents = "auto"
- function maybeDisable() {
- // To find out whether the scrollbar is still visible, we
- // check whether the element under the pixel in the bottom
- // left corner of the scrollbar box is the scrollbar box
- // itself (when the bar is still visible) or its filler child
- // (when the bar is hidden). If it is still visible, we keep
- // it enabled, if it's hidden, we disable pointer events.
- var box = bar.getBoundingClientRect()
- var elt$$1 = document.elementFromPoint(box.left + 1, box.bottom - 1)
- if (elt$$1 != bar) { bar.style.pointerEvents = "none" }
- else { delay.set(1000, maybeDisable) }
- }
- delay.set(1000, maybeDisable)
- },
- clear: function() {
- var parent = this.horiz.parentNode
- parent.removeChild(this.horiz)
- parent.removeChild(this.vert)
- }
-}, NativeScrollbars.prototype)
-
-function NullScrollbars() {}
-
-NullScrollbars.prototype = copyObj({
- update: function() { return {bottom: 0, right: 0} },
- setScrollLeft: function() {},
- setScrollTop: function() {},
- clear: function() {}
-}, NullScrollbars.prototype)
-
-function updateScrollbars(cm, measure) {
- if (!measure) { measure = measureForScrollbars(cm) }
- var startWidth = cm.display.barWidth, startHeight = cm.display.barHeight
- updateScrollbarsInner(cm, measure)
- for (var i = 0; i < 4 && startWidth != cm.display.barWidth || startHeight != cm.display.barHeight; i++) {
- if (startWidth != cm.display.barWidth && cm.options.lineWrapping)
- { updateHeightsInViewport(cm) }
- updateScrollbarsInner(cm, measureForScrollbars(cm))
- startWidth = cm.display.barWidth; startHeight = cm.display.barHeight
- }
-}
-
-// Re-synchronize the fake scrollbars with the actual size of the
-// content.
-function updateScrollbarsInner(cm, measure) {
- var d = cm.display
- var sizes = d.scrollbars.update(measure)
-
- d.sizer.style.paddingRight = (d.barWidth = sizes.right) + "px"
- d.sizer.style.paddingBottom = (d.barHeight = sizes.bottom) + "px"
- d.heightForcer.style.borderBottom = sizes.bottom + "px solid transparent"
-
- if (sizes.right && sizes.bottom) {
- d.scrollbarFiller.style.display = "block"
- d.scrollbarFiller.style.height = sizes.bottom + "px"
- d.scrollbarFiller.style.width = sizes.right + "px"
- } else { d.scrollbarFiller.style.display = "" }
- if (sizes.bottom && cm.options.coverGutterNextToScrollbar && cm.options.fixedGutter) {
- d.gutterFiller.style.display = "block"
- d.gutterFiller.style.height = sizes.bottom + "px"
- d.gutterFiller.style.width = measure.gutterWidth + "px"
- } else { d.gutterFiller.style.display = "" }
-}
-
-var scrollbarModel = {"native": NativeScrollbars, "null": NullScrollbars}
-
-function initScrollbars(cm) {
- if (cm.display.scrollbars) {
- cm.display.scrollbars.clear()
- if (cm.display.scrollbars.addClass)
- { rmClass(cm.display.wrapper, cm.display.scrollbars.addClass) }
- }
-
- cm.display.scrollbars = new scrollbarModel[cm.options.scrollbarStyle](function (node) {
- cm.display.wrapper.insertBefore(node, cm.display.scrollbarFiller)
- // Prevent clicks in the scrollbars from killing focus
- on(node, "mousedown", function () {
- if (cm.state.focused) { setTimeout(function () { return cm.display.input.focus(); }, 0) }
- })
- node.setAttribute("cm-not-content", "true")
- }, function (pos, axis) {
- if (axis == "horizontal") { setScrollLeft(cm, pos) }
- else { setScrollTop(cm, pos) }
- }, cm)
- if (cm.display.scrollbars.addClass)
- { addClass(cm.display.wrapper, cm.display.scrollbars.addClass) }
-}
-
-// SCROLLING THINGS INTO VIEW
-
-// If an editor sits on the top or bottom of the window, partially
-// scrolled out of view, this ensures that the cursor is visible.
-function maybeScrollWindow(cm, coords) {
- if (signalDOMEvent(cm, "scrollCursorIntoView")) { return }
-
- var display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null
- if (coords.top + box.top < 0) { doScroll = true }
- else if (coords.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) { doScroll = false }
- if (doScroll != null && !phantom) {
- var scrollNode = elt("div", "\u200b", null, ("position: absolute;\n top: " + (coords.top - display.viewOffset - paddingTop(cm.display)) + "px;\n height: " + (coords.bottom - coords.top + scrollGap(cm) + display.barHeight) + "px;\n left: " + (coords.left) + "px; width: 2px;"))
- cm.display.lineSpace.appendChild(scrollNode)
- scrollNode.scrollIntoView(doScroll)
- cm.display.lineSpace.removeChild(scrollNode)
- }
-}
-
-// Scroll a given position into view (immediately), verifying that
-// it actually became visible (as line heights are accurately
-// measured, the position of something may 'drift' during drawing).
-function scrollPosIntoView(cm, pos, end, margin) {
- if (margin == null) { margin = 0 }
- var coords
- for (var limit = 0; limit < 5; limit++) {
- var changed = false
- coords = cursorCoords(cm, pos)
- var endCoords = !end || end == pos ? coords : cursorCoords(cm, end)
- var scrollPos = calculateScrollPos(cm, Math.min(coords.left, endCoords.left),
- Math.min(coords.top, endCoords.top) - margin,
- Math.max(coords.left, endCoords.left),
- Math.max(coords.bottom, endCoords.bottom) + margin)
- var startTop = cm.doc.scrollTop, startLeft = cm.doc.scrollLeft
- if (scrollPos.scrollTop != null) {
- setScrollTop(cm, scrollPos.scrollTop)
- if (Math.abs(cm.doc.scrollTop - startTop) > 1) { changed = true }
- }
- if (scrollPos.scrollLeft != null) {
- setScrollLeft(cm, scrollPos.scrollLeft)
- if (Math.abs(cm.doc.scrollLeft - startLeft) > 1) { changed = true }
- }
- if (!changed) { break }
- }
- return coords
-}
-
-// Scroll a given set of coordinates into view (immediately).
-function scrollIntoView(cm, x1, y1, x2, y2) {
- var scrollPos = calculateScrollPos(cm, x1, y1, x2, y2)
- if (scrollPos.scrollTop != null) { setScrollTop(cm, scrollPos.scrollTop) }
- if (scrollPos.scrollLeft != null) { setScrollLeft(cm, scrollPos.scrollLeft) }
-}
-
-// Calculate a new scroll position needed to scroll the given
-// rectangle into view. Returns an object with scrollTop and
-// scrollLeft properties. When these are undefined, the
-// vertical/horizontal position does not need to be adjusted.
-function calculateScrollPos(cm, x1, y1, x2, y2) {
- var display = cm.display, snapMargin = textHeight(cm.display)
- if (y1 < 0) { y1 = 0 }
- var screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop
- var screen = displayHeight(cm), result = {}
- if (y2 - y1 > screen) { y2 = y1 + screen }
- var docBottom = cm.doc.height + paddingVert(display)
- var atTop = y1 < snapMargin, atBottom = y2 > docBottom - snapMargin
- if (y1 < screentop) {
- result.scrollTop = atTop ? 0 : y1
- } else if (y2 > screentop + screen) {
- var newTop = Math.min(y1, (atBottom ? docBottom : y2) - screen)
- if (newTop != screentop) { result.scrollTop = newTop }
- }
-
- var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft
- var screenw = displayWidth(cm) - (cm.options.fixedGutter ? display.gutters.offsetWidth : 0)
- var tooWide = x2 - x1 > screenw
- if (tooWide) { x2 = x1 + screenw }
- if (x1 < 10)
- { result.scrollLeft = 0 }
- else if (x1 < screenleft)
- { result.scrollLeft = Math.max(0, x1 - (tooWide ? 0 : 10)) }
- else if (x2 > screenw + screenleft - 3)
- { result.scrollLeft = x2 + (tooWide ? 0 : 10) - screenw }
- return result
-}
-
-// Store a relative adjustment to the scroll position in the current
-// operation (to be applied when the operation finishes).
-function addToScrollPos(cm, left, top) {
- if (left != null || top != null) { resolveScrollToPos(cm) }
- if (left != null)
- { cm.curOp.scrollLeft = (cm.curOp.scrollLeft == null ? cm.doc.scrollLeft : cm.curOp.scrollLeft) + left }
- if (top != null)
- { cm.curOp.scrollTop = (cm.curOp.scrollTop == null ? cm.doc.scrollTop : cm.curOp.scrollTop) + top }
-}
-
-// Make sure that at the end of the operation the current cursor is
-// shown.
-function ensureCursorVisible(cm) {
- resolveScrollToPos(cm)
- var cur = cm.getCursor(), from = cur, to = cur
- if (!cm.options.lineWrapping) {
- from = cur.ch ? Pos(cur.line, cur.ch - 1) : cur
- to = Pos(cur.line, cur.ch + 1)
- }
- cm.curOp.scrollToPos = {from: from, to: to, margin: cm.options.cursorScrollMargin, isCursor: true}
-}
-
-// When an operation has its scrollToPos property set, and another
-// scroll action is applied before the end of the operation, this
-// 'simulates' scrolling that position into view in a cheap way, so
-// that the effect of intermediate scroll commands is not ignored.
-function resolveScrollToPos(cm) {
- var range$$1 = cm.curOp.scrollToPos
- if (range$$1) {
- cm.curOp.scrollToPos = null
- var from = estimateCoords(cm, range$$1.from), to = estimateCoords(cm, range$$1.to)
- var sPos = calculateScrollPos(cm, Math.min(from.left, to.left),
- Math.min(from.top, to.top) - range$$1.margin,
- Math.max(from.right, to.right),
- Math.max(from.bottom, to.bottom) + range$$1.margin)
- cm.scrollTo(sPos.scrollLeft, sPos.scrollTop)
- }
-}
-
-// Operations are used to wrap a series of changes to the editor
-// state in such a way that each change won't have to update the
-// cursor and display (which would be awkward, slow, and
-// error-prone). Instead, display updates are batched and then all
-// combined and executed at once.
-
-var nextOpId = 0
-// Start a new operation.
-function startOperation(cm) {
- cm.curOp = {
- cm: cm,
- viewChanged: false, // Flag that indicates that lines might need to be redrawn
- startHeight: cm.doc.height, // Used to detect need to update scrollbar
- forceUpdate: false, // Used to force a redraw
- updateInput: null, // Whether to reset the input textarea
- typing: false, // Whether this reset should be careful to leave existing text (for compositing)
- changeObjs: null, // Accumulated changes, for firing change events
- cursorActivityHandlers: null, // Set of handlers to fire cursorActivity on
- cursorActivityCalled: 0, // Tracks which cursorActivity handlers have been called already
- selectionChanged: false, // Whether the selection needs to be redrawn
- updateMaxLine: false, // Set when the widest line needs to be determined anew
- scrollLeft: null, scrollTop: null, // Intermediate scroll position, not pushed to DOM yet
- scrollToPos: null, // Used to scroll to a specific position
- focus: false,
- id: ++nextOpId // Unique ID
- }
- pushOperation(cm.curOp)
-}
-
-// Finish an operation, updating the display and signalling delayed events
-function endOperation(cm) {
- var op = cm.curOp
- finishOperation(op, function (group) {
- for (var i = 0; i < group.ops.length; i++)
- { group.ops[i].cm.curOp = null }
- endOperations(group)
- })
-}
-
-// The DOM updates done when an operation finishes are batched so
-// that the minimum number of relayouts are required.
-function endOperations(group) {
- var ops = group.ops
- for (var i = 0; i < ops.length; i++) // Read DOM
- { endOperation_R1(ops[i]) }
- for (var i$1 = 0; i$1 < ops.length; i$1++) // Write DOM (maybe)
- { endOperation_W1(ops[i$1]) }
- for (var i$2 = 0; i$2 < ops.length; i$2++) // Read DOM
- { endOperation_R2(ops[i$2]) }
- for (var i$3 = 0; i$3 < ops.length; i$3++) // Write DOM (maybe)
- { endOperation_W2(ops[i$3]) }
- for (var i$4 = 0; i$4 < ops.length; i$4++) // Read DOM
- { endOperation_finish(ops[i$4]) }
-}
-
-function endOperation_R1(op) {
- var cm = op.cm, display = cm.display
- maybeClipScrollbars(cm)
- if (op.updateMaxLine) { findMaxLine(cm) }
-
- op.mustUpdate = op.viewChanged || op.forceUpdate || op.scrollTop != null ||
- op.scrollToPos && (op.scrollToPos.from.line < display.viewFrom ||
- op.scrollToPos.to.line >= display.viewTo) ||
- display.maxLineChanged && cm.options.lineWrapping
- op.update = op.mustUpdate &&
- new DisplayUpdate(cm, op.mustUpdate && {top: op.scrollTop, ensure: op.scrollToPos}, op.forceUpdate)
-}
-
-function endOperation_W1(op) {
- op.updatedDisplay = op.mustUpdate && updateDisplayIfNeeded(op.cm, op.update)
-}
-
-function endOperation_R2(op) {
- var cm = op.cm, display = cm.display
- if (op.updatedDisplay) { updateHeightsInViewport(cm) }
-
- op.barMeasure = measureForScrollbars(cm)
-
- // If the max line changed since it was last measured, measure it,
- // and ensure the document's width matches it.
- // updateDisplay_W2 will use these properties to do the actual resizing
- if (display.maxLineChanged && !cm.options.lineWrapping) {
- op.adjustWidthTo = measureChar(cm, display.maxLine, display.maxLine.text.length).left + 3
- cm.display.sizerWidth = op.adjustWidthTo
- op.barMeasure.scrollWidth =
- Math.max(display.scroller.clientWidth, display.sizer.offsetLeft + op.adjustWidthTo + scrollGap(cm) + cm.display.barWidth)
- op.maxScrollLeft = Math.max(0, display.sizer.offsetLeft + op.adjustWidthTo - displayWidth(cm))
- }
-
- if (op.updatedDisplay || op.selectionChanged)
- { op.preparedSelection = display.input.prepareSelection(op.focus) }
-}
-
-function endOperation_W2(op) {
- var cm = op.cm
-
- if (op.adjustWidthTo != null) {
- cm.display.sizer.style.minWidth = op.adjustWidthTo + "px"
- if (op.maxScrollLeft < cm.doc.scrollLeft)
- { setScrollLeft(cm, Math.min(cm.display.scroller.scrollLeft, op.maxScrollLeft), true) }
- cm.display.maxLineChanged = false
- }
-
- var takeFocus = op.focus && op.focus == activeElt() && (!document.hasFocus || document.hasFocus())
- if (op.preparedSelection)
- { cm.display.input.showSelection(op.preparedSelection, takeFocus) }
- if (op.updatedDisplay || op.startHeight != cm.doc.height)
- { updateScrollbars(cm, op.barMeasure) }
- if (op.updatedDisplay)
- { setDocumentHeight(cm, op.barMeasure) }
-
- if (op.selectionChanged) { restartBlink(cm) }
-
- if (cm.state.focused && op.updateInput)
- { cm.display.input.reset(op.typing) }
- if (takeFocus) { ensureFocus(op.cm) }
-}
-
-function endOperation_finish(op) {
- var cm = op.cm, display = cm.display, doc = cm.doc
-
- if (op.updatedDisplay) { postUpdateDisplay(cm, op.update) }
-
- // Abort mouse wheel delta measurement, when scrolling explicitly
- if (display.wheelStartX != null && (op.scrollTop != null || op.scrollLeft != null || op.scrollToPos))
- { display.wheelStartX = display.wheelStartY = null }
-
- // Propagate the scroll position to the actual DOM scroller
- if (op.scrollTop != null && (display.scroller.scrollTop != op.scrollTop || op.forceScroll)) {
- doc.scrollTop = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, op.scrollTop))
- display.scrollbars.setScrollTop(doc.scrollTop)
- display.scroller.scrollTop = doc.scrollTop
- }
- if (op.scrollLeft != null && (display.scroller.scrollLeft != op.scrollLeft || op.forceScroll)) {
- doc.scrollLeft = Math.max(0, Math.min(display.scroller.scrollWidth - display.scroller.clientWidth, op.scrollLeft))
- display.scrollbars.setScrollLeft(doc.scrollLeft)
- display.scroller.scrollLeft = doc.scrollLeft
- alignHorizontally(cm)
- }
- // If we need to scroll a specific position into view, do so.
- if (op.scrollToPos) {
- var coords = scrollPosIntoView(cm, clipPos(doc, op.scrollToPos.from),
- clipPos(doc, op.scrollToPos.to), op.scrollToPos.margin)
- if (op.scrollToPos.isCursor && cm.state.focused) { maybeScrollWindow(cm, coords) }
- }
-
- // Fire events for markers that are hidden/unidden by editing or
- // undoing
- var hidden = op.maybeHiddenMarkers, unhidden = op.maybeUnhiddenMarkers
- if (hidden) { for (var i = 0; i < hidden.length; ++i)
- { if (!hidden[i].lines.length) { signal(hidden[i], "hide") } } }
- if (unhidden) { for (var i$1 = 0; i$1 < unhidden.length; ++i$1)
- { if (unhidden[i$1].lines.length) { signal(unhidden[i$1], "unhide") } } }
-
- if (display.wrapper.offsetHeight)
- { doc.scrollTop = cm.display.scroller.scrollTop }
-
- // Fire change events, and delayed event handlers
- if (op.changeObjs)
- { signal(cm, "changes", cm, op.changeObjs) }
- if (op.update)
- { op.update.finish() }
-}
-
-// Run the given function in an operation
-function runInOp(cm, f) {
- if (cm.curOp) { return f() }
- startOperation(cm)
- try { return f() }
- finally { endOperation(cm) }
-}
-// Wraps a function in an operation. Returns the wrapped function.
-function operation(cm, f) {
- return function() {
- if (cm.curOp) { return f.apply(cm, arguments) }
- startOperation(cm)
- try { return f.apply(cm, arguments) }
- finally { endOperation(cm) }
- }
-}
-// Used to add methods to editor and doc instances, wrapping them in
-// operations.
-function methodOp(f) {
- return function() {
- if (this.curOp) { return f.apply(this, arguments) }
- startOperation(this)
- try { return f.apply(this, arguments) }
- finally { endOperation(this) }
- }
-}
-function docMethodOp(f) {
- return function() {
- var cm = this.cm
- if (!cm || cm.curOp) { return f.apply(this, arguments) }
- startOperation(cm)
- try { return f.apply(this, arguments) }
- finally { endOperation(cm) }
- }
-}
-
-// Updates the display.view data structure for a given change to the
-// document. From and to are in pre-change coordinates. Lendiff is
-// the amount of lines added or subtracted by the change. This is
-// used for changes that span multiple lines, or change the way
-// lines are divided into visual lines. regLineChange (below)
-// registers single-line changes.
-function regChange(cm, from, to, lendiff) {
- if (from == null) { from = cm.doc.first }
- if (to == null) { to = cm.doc.first + cm.doc.size }
- if (!lendiff) { lendiff = 0 }
-
- var display = cm.display
- if (lendiff && to < display.viewTo &&
- (display.updateLineNumbers == null || display.updateLineNumbers > from))
- { display.updateLineNumbers = from }
-
- cm.curOp.viewChanged = true
-
- if (from >= display.viewTo) { // Change after
- if (sawCollapsedSpans && visualLineNo(cm.doc, from) < display.viewTo)
- { resetView(cm) }
- } else if (to <= display.viewFrom) { // Change before
- if (sawCollapsedSpans && visualLineEndNo(cm.doc, to + lendiff) > display.viewFrom) {
- resetView(cm)
- } else {
- display.viewFrom += lendiff
- display.viewTo += lendiff
- }
- } else if (from <= display.viewFrom && to >= display.viewTo) { // Full overlap
- resetView(cm)
- } else if (from <= display.viewFrom) { // Top overlap
- var cut = viewCuttingPoint(cm, to, to + lendiff, 1)
- if (cut) {
- display.view = display.view.slice(cut.index)
- display.viewFrom = cut.lineN
- display.viewTo += lendiff
- } else {
- resetView(cm)
- }
- } else if (to >= display.viewTo) { // Bottom overlap
- var cut$1 = viewCuttingPoint(cm, from, from, -1)
- if (cut$1) {
- display.view = display.view.slice(0, cut$1.index)
- display.viewTo = cut$1.lineN
- } else {
- resetView(cm)
- }
- } else { // Gap in the middle
- var cutTop = viewCuttingPoint(cm, from, from, -1)
- var cutBot = viewCuttingPoint(cm, to, to + lendiff, 1)
- if (cutTop && cutBot) {
- display.view = display.view.slice(0, cutTop.index)
- .concat(buildViewArray(cm, cutTop.lineN, cutBot.lineN))
- .concat(display.view.slice(cutBot.index))
- display.viewTo += lendiff
- } else {
- resetView(cm)
- }
- }
-
- var ext = display.externalMeasured
- if (ext) {
- if (to < ext.lineN)
- { ext.lineN += lendiff }
- else if (from < ext.lineN + ext.size)
- { display.externalMeasured = null }
- }
-}
-
-// Register a change to a single line. Type must be one of "text",
-// "gutter", "class", "widget"
-function regLineChange(cm, line, type) {
- cm.curOp.viewChanged = true
- var display = cm.display, ext = cm.display.externalMeasured
- if (ext && line >= ext.lineN && line < ext.lineN + ext.size)
- { display.externalMeasured = null }
-
- if (line < display.viewFrom || line >= display.viewTo) { return }
- var lineView = display.view[findViewIndex(cm, line)]
- if (lineView.node == null) { return }
- var arr = lineView.changes || (lineView.changes = [])
- if (indexOf(arr, type) == -1) { arr.push(type) }
-}
-
-// Clear the view.
-function resetView(cm) {
- cm.display.viewFrom = cm.display.viewTo = cm.doc.first
- cm.display.view = []
- cm.display.viewOffset = 0
-}
-
-function viewCuttingPoint(cm, oldN, newN, dir) {
- var index = findViewIndex(cm, oldN), diff, view = cm.display.view
- if (!sawCollapsedSpans || newN == cm.doc.first + cm.doc.size)
- { return {index: index, lineN: newN} }
- var n = cm.display.viewFrom
- for (var i = 0; i < index; i++)
- { n += view[i].size }
- if (n != oldN) {
- if (dir > 0) {
- if (index == view.length - 1) { return null }
- diff = (n + view[index].size) - oldN
- index++
- } else {
- diff = n - oldN
- }
- oldN += diff; newN += diff
- }
- while (visualLineNo(cm.doc, newN) != newN) {
- if (index == (dir < 0 ? 0 : view.length - 1)) { return null }
- newN += dir * view[index - (dir < 0 ? 1 : 0)].size
- index += dir
- }
- return {index: index, lineN: newN}
-}
-
-// Force the view to cover a given range, adding empty view element
-// or clipping off existing ones as needed.
-function adjustView(cm, from, to) {
- var display = cm.display, view = display.view
- if (view.length == 0 || from >= display.viewTo || to <= display.viewFrom) {
- display.view = buildViewArray(cm, from, to)
- display.viewFrom = from
- } else {
- if (display.viewFrom > from)
- { display.view = buildViewArray(cm, from, display.viewFrom).concat(display.view) }
- else if (display.viewFrom < from)
- { display.view = display.view.slice(findViewIndex(cm, from)) }
- display.viewFrom = from
- if (display.viewTo < to)
- { display.view = display.view.concat(buildViewArray(cm, display.viewTo, to)) }
- else if (display.viewTo > to)
- { display.view = display.view.slice(0, findViewIndex(cm, to)) }
- }
- display.viewTo = to
-}
-
-// Count the number of lines in the view whose DOM representation is
-// out of date (or nonexistent).
-function countDirtyView(cm) {
- var view = cm.display.view, dirty = 0
- for (var i = 0; i < view.length; i++) {
- var lineView = view[i]
- if (!lineView.hidden && (!lineView.node || lineView.changes)) { ++dirty }
- }
- return dirty
-}
-
-// HIGHLIGHT WORKER
-
-function startWorker(cm, time) {
- if (cm.doc.mode.startState && cm.doc.frontier < cm.display.viewTo)
- { cm.state.highlight.set(time, bind(highlightWorker, cm)) }
-}
-
-function highlightWorker(cm) {
- var doc = cm.doc
- if (doc.frontier < doc.first) { doc.frontier = doc.first }
- if (doc.frontier >= cm.display.viewTo) { return }
- var end = +new Date + cm.options.workTime
- var state = copyState(doc.mode, getStateBefore(cm, doc.frontier))
- var changedLines = []
-
- doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.viewTo + 500), function (line) {
- if (doc.frontier >= cm.display.viewFrom) { // Visible
- var oldStyles = line.styles, tooLong = line.text.length > cm.options.maxHighlightLength
- var highlighted = highlightLine(cm, line, tooLong ? copyState(doc.mode, state) : state, true)
- line.styles = highlighted.styles
- var oldCls = line.styleClasses, newCls = highlighted.classes
- if (newCls) { line.styleClasses = newCls }
- else if (oldCls) { line.styleClasses = null }
- var ischange = !oldStyles || oldStyles.length != line.styles.length ||
- oldCls != newCls && (!oldCls || !newCls || oldCls.bgClass != newCls.bgClass || oldCls.textClass != newCls.textClass)
- for (var i = 0; !ischange && i < oldStyles.length; ++i) { ischange = oldStyles[i] != line.styles[i] }
- if (ischange) { changedLines.push(doc.frontier) }
- line.stateAfter = tooLong ? state : copyState(doc.mode, state)
- } else {
- if (line.text.length <= cm.options.maxHighlightLength)
- { processLine(cm, line.text, state) }
- line.stateAfter = doc.frontier % 5 == 0 ? copyState(doc.mode, state) : null
- }
- ++doc.frontier
- if (+new Date > end) {
- startWorker(cm, cm.options.workDelay)
- return true
- }
- })
- if (changedLines.length) { runInOp(cm, function () {
- for (var i = 0; i < changedLines.length; i++)
- { regLineChange(cm, changedLines[i], "text") }
- }) }
-}
-
-// DISPLAY DRAWING
-
-function DisplayUpdate(cm, viewport, force) {
- var display = cm.display
-
- this.viewport = viewport
- // Store some values that we'll need later (but don't want to force a relayout for)
- this.visible = visibleLines(display, cm.doc, viewport)
- this.editorIsHidden = !display.wrapper.offsetWidth
- this.wrapperHeight = display.wrapper.clientHeight
- this.wrapperWidth = display.wrapper.clientWidth
- this.oldDisplayWidth = displayWidth(cm)
- this.force = force
- this.dims = getDimensions(cm)
- this.events = []
-}
-
-DisplayUpdate.prototype.signal = function(emitter, type) {
- if (hasHandler(emitter, type))
- { this.events.push(arguments) }
-}
-DisplayUpdate.prototype.finish = function() {
- var this$1 = this;
-
- for (var i = 0; i < this.events.length; i++)
- { signal.apply(null, this$1.events[i]) }
-}
-
-function maybeClipScrollbars(cm) {
- var display = cm.display
- if (!display.scrollbarsClipped && display.scroller.offsetWidth) {
- display.nativeBarWidth = display.scroller.offsetWidth - display.scroller.clientWidth
- display.heightForcer.style.height = scrollGap(cm) + "px"
- display.sizer.style.marginBottom = -display.nativeBarWidth + "px"
- display.sizer.style.borderRightWidth = scrollGap(cm) + "px"
- display.scrollbarsClipped = true
- }
-}
-
-// Does the actual updating of the line display. Bails out
-// (returning false) when there is nothing to be done and forced is
-// false.
-function updateDisplayIfNeeded(cm, update) {
- var display = cm.display, doc = cm.doc
-
- if (update.editorIsHidden) {
- resetView(cm)
- return false
- }
-
- // Bail out if the visible area is already rendered and nothing changed.
- if (!update.force &&
- update.visible.from >= display.viewFrom && update.visible.to <= display.viewTo &&
- (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo) &&
- display.renderedView == display.view && countDirtyView(cm) == 0)
- { return false }
-
- if (maybeUpdateLineNumberWidth(cm)) {
- resetView(cm)
- update.dims = getDimensions(cm)
- }
-
- // Compute a suitable new viewport (from & to)
- var end = doc.first + doc.size
- var from = Math.max(update.visible.from - cm.options.viewportMargin, doc.first)
- var to = Math.min(end, update.visible.to + cm.options.viewportMargin)
- if (display.viewFrom < from && from - display.viewFrom < 20) { from = Math.max(doc.first, display.viewFrom) }
- if (display.viewTo > to && display.viewTo - to < 20) { to = Math.min(end, display.viewTo) }
- if (sawCollapsedSpans) {
- from = visualLineNo(cm.doc, from)
- to = visualLineEndNo(cm.doc, to)
- }
-
- var different = from != display.viewFrom || to != display.viewTo ||
- display.lastWrapHeight != update.wrapperHeight || display.lastWrapWidth != update.wrapperWidth
- adjustView(cm, from, to)
-
- display.viewOffset = heightAtLine(getLine(cm.doc, display.viewFrom))
- // Position the mover div to align with the current scroll position
- cm.display.mover.style.top = display.viewOffset + "px"
-
- var toUpdate = countDirtyView(cm)
- if (!different && toUpdate == 0 && !update.force && display.renderedView == display.view &&
- (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo))
- { return false }
-
- // For big changes, we hide the enclosing element during the
- // update, since that speeds up the operations on most browsers.
- var focused = activeElt()
- if (toUpdate > 4) { display.lineDiv.style.display = "none" }
- patchDisplay(cm, display.updateLineNumbers, update.dims)
- if (toUpdate > 4) { display.lineDiv.style.display = "" }
- display.renderedView = display.view
- // There might have been a widget with a focused element that got
- // hidden or updated, if so re-focus it.
- if (focused && activeElt() != focused && focused.offsetHeight) { focused.focus() }
-
- // Prevent selection and cursors from interfering with the scroll
- // width and height.
- removeChildren(display.cursorDiv)
- removeChildren(display.selectionDiv)
- display.gutters.style.height = display.sizer.style.minHeight = 0
-
- if (different) {
- display.lastWrapHeight = update.wrapperHeight
- display.lastWrapWidth = update.wrapperWidth
- startWorker(cm, 400)
- }
-
- display.updateLineNumbers = null
-
- return true
-}
-
-function postUpdateDisplay(cm, update) {
- var viewport = update.viewport
-
- for (var first = true;; first = false) {
- if (!first || !cm.options.lineWrapping || update.oldDisplayWidth == displayWidth(cm)) {
- // Clip forced viewport to actual scrollable area.
- if (viewport && viewport.top != null)
- { viewport = {top: Math.min(cm.doc.height + paddingVert(cm.display) - displayHeight(cm), viewport.top)} }
- // Updated line heights might result in the drawn area not
- // actually covering the viewport. Keep looping until it does.
- update.visible = visibleLines(cm.display, cm.doc, viewport)
- if (update.visible.from >= cm.display.viewFrom && update.visible.to <= cm.display.viewTo)
- { break }
- }
- if (!updateDisplayIfNeeded(cm, update)) { break }
- updateHeightsInViewport(cm)
- var barMeasure = measureForScrollbars(cm)
- updateSelection(cm)
- updateScrollbars(cm, barMeasure)
- setDocumentHeight(cm, barMeasure)
- }
-
- update.signal(cm, "update", cm)
- if (cm.display.viewFrom != cm.display.reportedViewFrom || cm.display.viewTo != cm.display.reportedViewTo) {
- update.signal(cm, "viewportChange", cm, cm.display.viewFrom, cm.display.viewTo)
- cm.display.reportedViewFrom = cm.display.viewFrom; cm.display.reportedViewTo = cm.display.viewTo
- }
-}
-
-function updateDisplaySimple(cm, viewport) {
- var update = new DisplayUpdate(cm, viewport)
- if (updateDisplayIfNeeded(cm, update)) {
- updateHeightsInViewport(cm)
- postUpdateDisplay(cm, update)
- var barMeasure = measureForScrollbars(cm)
- updateSelection(cm)
- updateScrollbars(cm, barMeasure)
- setDocumentHeight(cm, barMeasure)
- update.finish()
- }
-}
-
-// Sync the actual display DOM structure with display.view, removing
-// nodes for lines that are no longer in view, and creating the ones
-// that are not there yet, and updating the ones that are out of
-// date.
-function patchDisplay(cm, updateNumbersFrom, dims) {
- var display = cm.display, lineNumbers = cm.options.lineNumbers
- var container = display.lineDiv, cur = container.firstChild
-
- function rm(node) {
- var next = node.nextSibling
- // Works around a throw-scroll bug in OS X Webkit
- if (webkit && mac && cm.display.currentWheelTarget == node)
- { node.style.display = "none" }
- else
- { node.parentNode.removeChild(node) }
- return next
- }
-
- var view = display.view, lineN = display.viewFrom
- // Loop over the elements in the view, syncing cur (the DOM nodes
- // in display.lineDiv) with the view as we go.
- for (var i = 0; i < view.length; i++) {
- var lineView = view[i]
- if (lineView.hidden) {
- } else if (!lineView.node || lineView.node.parentNode != container) { // Not drawn yet
- var node = buildLineElement(cm, lineView, lineN, dims)
- container.insertBefore(node, cur)
- } else { // Already drawn
- while (cur != lineView.node) { cur = rm(cur) }
- var updateNumber = lineNumbers && updateNumbersFrom != null &&
- updateNumbersFrom <= lineN && lineView.lineNumber
- if (lineView.changes) {
- if (indexOf(lineView.changes, "gutter") > -1) { updateNumber = false }
- updateLineForChanges(cm, lineView, lineN, dims)
- }
- if (updateNumber) {
- removeChildren(lineView.lineNumber)
- lineView.lineNumber.appendChild(document.createTextNode(lineNumberFor(cm.options, lineN)))
- }
- cur = lineView.node.nextSibling
- }
- lineN += lineView.size
- }
- while (cur) { cur = rm(cur) }
-}
-
-function updateGutterSpace(cm) {
- var width = cm.display.gutters.offsetWidth
- cm.display.sizer.style.marginLeft = width + "px"
-}
-
-function setDocumentHeight(cm, measure) {
- cm.display.sizer.style.minHeight = measure.docHeight + "px"
- cm.display.heightForcer.style.top = measure.docHeight + "px"
- cm.display.gutters.style.height = (measure.docHeight + cm.display.barHeight + scrollGap(cm)) + "px"
-}
-
-// Rebuild the gutter elements, ensure the margin to the left of the
-// code matches their width.
-function updateGutters(cm) {
- var gutters = cm.display.gutters, specs = cm.options.gutters
- removeChildren(gutters)
- var i = 0
- for (; i < specs.length; ++i) {
- var gutterClass = specs[i]
- var gElt = gutters.appendChild(elt("div", null, "CodeMirror-gutter " + gutterClass))
- if (gutterClass == "CodeMirror-linenumbers") {
- cm.display.lineGutter = gElt
- gElt.style.width = (cm.display.lineNumWidth || 1) + "px"
- }
- }
- gutters.style.display = i ? "" : "none"
- updateGutterSpace(cm)
-}
-
-// Make sure the gutters options contains the element
-// "CodeMirror-linenumbers" when the lineNumbers option is true.
-function setGuttersForLineNumbers(options) {
- var found = indexOf(options.gutters, "CodeMirror-linenumbers")
- if (found == -1 && options.lineNumbers) {
- options.gutters = options.gutters.concat(["CodeMirror-linenumbers"])
- } else if (found > -1 && !options.lineNumbers) {
- options.gutters = options.gutters.slice(0)
- options.gutters.splice(found, 1)
- }
-}
-
-// Selection objects are immutable. A new one is created every time
-// the selection changes. A selection is one or more non-overlapping
-// (and non-touching) ranges, sorted, and an integer that indicates
-// which one is the primary selection (the one that's scrolled into
-// view, that getCursor returns, etc).
-function Selection(ranges, primIndex) {
- this.ranges = ranges
- this.primIndex = primIndex
-}
-
-Selection.prototype = {
- primary: function() { return this.ranges[this.primIndex] },
- equals: function(other) {
- var this$1 = this;
-
- if (other == this) { return true }
- if (other.primIndex != this.primIndex || other.ranges.length != this.ranges.length) { return false }
- for (var i = 0; i < this.ranges.length; i++) {
- var here = this$1.ranges[i], there = other.ranges[i]
- if (cmp(here.anchor, there.anchor) != 0 || cmp(here.head, there.head) != 0) { return false }
- }
- return true
- },
- deepCopy: function() {
- var this$1 = this;
-
- var out = []
- for (var i = 0; i < this.ranges.length; i++)
- { out[i] = new Range(copyPos(this$1.ranges[i].anchor), copyPos(this$1.ranges[i].head)) }
- return new Selection(out, this.primIndex)
- },
- somethingSelected: function() {
- var this$1 = this;
-
- for (var i = 0; i < this.ranges.length; i++)
- { if (!this$1.ranges[i].empty()) { return true } }
- return false
- },
- contains: function(pos, end) {
- var this$1 = this;
-
- if (!end) { end = pos }
- for (var i = 0; i < this.ranges.length; i++) {
- var range = this$1.ranges[i]
- if (cmp(end, range.from()) >= 0 && cmp(pos, range.to()) <= 0)
- { return i }
- }
- return -1
- }
-}
-
-function Range(anchor, head) {
- this.anchor = anchor; this.head = head
-}
-
-Range.prototype = {
- from: function() { return minPos(this.anchor, this.head) },
- to: function() { return maxPos(this.anchor, this.head) },
- empty: function() {
- return this.head.line == this.anchor.line && this.head.ch == this.anchor.ch
- }
-}
-
-// Take an unsorted, potentially overlapping set of ranges, and
-// build a selection out of it. 'Consumes' ranges array (modifying
-// it).
-function normalizeSelection(ranges, primIndex) {
- var prim = ranges[primIndex]
- ranges.sort(function (a, b) { return cmp(a.from(), b.from()); })
- primIndex = indexOf(ranges, prim)
- for (var i = 1; i < ranges.length; i++) {
- var cur = ranges[i], prev = ranges[i - 1]
- if (cmp(prev.to(), cur.from()) >= 0) {
- var from = minPos(prev.from(), cur.from()), to = maxPos(prev.to(), cur.to())
- var inv = prev.empty() ? cur.from() == cur.head : prev.from() == prev.head
- if (i <= primIndex) { --primIndex }
- ranges.splice(--i, 2, new Range(inv ? to : from, inv ? from : to))
- }
- }
- return new Selection(ranges, primIndex)
-}
-
-function simpleSelection(anchor, head) {
- return new Selection([new Range(anchor, head || anchor)], 0)
-}
-
-// Compute the position of the end of a change (its 'to' property
-// refers to the pre-change end).
-function changeEnd(change) {
- if (!change.text) { return change.to }
- return Pos(change.from.line + change.text.length - 1,
- lst(change.text).length + (change.text.length == 1 ? change.from.ch : 0))
-}
-
-// Adjust a position to refer to the post-change position of the
-// same text, or the end of the change if the change covers it.
-function adjustForChange(pos, change) {
- if (cmp(pos, change.from) < 0) { return pos }
- if (cmp(pos, change.to) <= 0) { return changeEnd(change) }
-
- var line = pos.line + change.text.length - (change.to.line - change.from.line) - 1, ch = pos.ch
- if (pos.line == change.to.line) { ch += changeEnd(change).ch - change.to.ch }
- return Pos(line, ch)
-}
-
-function computeSelAfterChange(doc, change) {
- var out = []
- for (var i = 0; i < doc.sel.ranges.length; i++) {
- var range = doc.sel.ranges[i]
- out.push(new Range(adjustForChange(range.anchor, change),
- adjustForChange(range.head, change)))
- }
- return normalizeSelection(out, doc.sel.primIndex)
-}
-
-function offsetPos(pos, old, nw) {
- if (pos.line == old.line)
- { return Pos(nw.line, pos.ch - old.ch + nw.ch) }
- else
- { return Pos(nw.line + (pos.line - old.line), pos.ch) }
-}
-
-// Used by replaceSelections to allow moving the selection to the
-// start or around the replaced test. Hint may be "start" or "around".
-function computeReplacedSel(doc, changes, hint) {
- var out = []
- var oldPrev = Pos(doc.first, 0), newPrev = oldPrev
- for (var i = 0; i < changes.length; i++) {
- var change = changes[i]
- var from = offsetPos(change.from, oldPrev, newPrev)
- var to = offsetPos(changeEnd(change), oldPrev, newPrev)
- oldPrev = change.to
- newPrev = to
- if (hint == "around") {
- var range = doc.sel.ranges[i], inv = cmp(range.head, range.anchor) < 0
- out[i] = new Range(inv ? to : from, inv ? from : to)
- } else {
- out[i] = new Range(from, from)
- }
- }
- return new Selection(out, doc.sel.primIndex)
-}
-
-// Used to get the editor into a consistent state again when options change.
-
-function loadMode(cm) {
- cm.doc.mode = getMode(cm.options, cm.doc.modeOption)
- resetModeState(cm)
-}
-
-function resetModeState(cm) {
- cm.doc.iter(function (line) {
- if (line.stateAfter) { line.stateAfter = null }
- if (line.styles) { line.styles = null }
- })
- cm.doc.frontier = cm.doc.first
- startWorker(cm, 100)
- cm.state.modeGen++
- if (cm.curOp) { regChange(cm) }
-}
-
-// DOCUMENT DATA STRUCTURE
-
-// By default, updates that start and end at the beginning of a line
-// are treated specially, in order to make the association of line
-// widgets and marker elements with the text behave more intuitive.
-function isWholeLineUpdate(doc, change) {
- return change.from.ch == 0 && change.to.ch == 0 && lst(change.text) == "" &&
- (!doc.cm || doc.cm.options.wholeLineUpdateBefore)
-}
-
-// Perform a change on the document data structure.
-function updateDoc(doc, change, markedSpans, estimateHeight$$1) {
- function spansFor(n) {return markedSpans ? markedSpans[n] : null}
- function update(line, text, spans) {
- updateLine(line, text, spans, estimateHeight$$1)
- signalLater(line, "change", line, change)
- }
- function linesFor(start, end) {
- var result = []
- for (var i = start; i < end; ++i)
- { result.push(new Line(text[i], spansFor(i), estimateHeight$$1)) }
- return result
- }
-
- var from = change.from, to = change.to, text = change.text
- var firstLine = getLine(doc, from.line), lastLine = getLine(doc, to.line)
- var lastText = lst(text), lastSpans = spansFor(text.length - 1), nlines = to.line - from.line
-
- // Adjust the line structure
- if (change.full) {
- doc.insert(0, linesFor(0, text.length))
- doc.remove(text.length, doc.size - text.length)
- } else if (isWholeLineUpdate(doc, change)) {
- // This is a whole-line replace. Treated specially to make
- // sure line objects move the way they are supposed to.
- var added = linesFor(0, text.length - 1)
- update(lastLine, lastLine.text, lastSpans)
- if (nlines) { doc.remove(from.line, nlines) }
- if (added.length) { doc.insert(from.line, added) }
- } else if (firstLine == lastLine) {
- if (text.length == 1) {
- update(firstLine, firstLine.text.slice(0, from.ch) + lastText + firstLine.text.slice(to.ch), lastSpans)
- } else {
- var added$1 = linesFor(1, text.length - 1)
- added$1.push(new Line(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight$$1))
- update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0))
- doc.insert(from.line + 1, added$1)
- }
- } else if (text.length == 1) {
- update(firstLine, firstLine.text.slice(0, from.ch) + text[0] + lastLine.text.slice(to.ch), spansFor(0))
- doc.remove(from.line + 1, nlines)
- } else {
- update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0))
- update(lastLine, lastText + lastLine.text.slice(to.ch), lastSpans)
- var added$2 = linesFor(1, text.length - 1)
- if (nlines > 1) { doc.remove(from.line + 1, nlines - 1) }
- doc.insert(from.line + 1, added$2)
- }
-
- signalLater(doc, "change", doc, change)
-}
-
-// Call f for all linked documents.
-function linkedDocs(doc, f, sharedHistOnly) {
- function propagate(doc, skip, sharedHist) {
- if (doc.linked) { for (var i = 0; i < doc.linked.length; ++i) {
- var rel = doc.linked[i]
- if (rel.doc == skip) { continue }
- var shared = sharedHist && rel.sharedHist
- if (sharedHistOnly && !shared) { continue }
- f(rel.doc, shared)
- propagate(rel.doc, doc, shared)
- } }
- }
- propagate(doc, null, true)
-}
-
-// Attach a document to an editor.
-function attachDoc(cm, doc) {
- if (doc.cm) { throw new Error("This document is already in use.") }
- cm.doc = doc
- doc.cm = cm
- estimateLineHeights(cm)
- loadMode(cm)
- if (!cm.options.lineWrapping) { findMaxLine(cm) }
- cm.options.mode = doc.modeOption
- regChange(cm)
-}
-
-function History(startGen) {
- // Arrays of change events and selections. Doing something adds an
- // event to done and clears undo. Undoing moves events from done
- // to undone, redoing moves them in the other direction.
- this.done = []; this.undone = []
- this.undoDepth = Infinity
- // Used to track when changes can be merged into a single undo
- // event
- this.lastModTime = this.lastSelTime = 0
- this.lastOp = this.lastSelOp = null
- this.lastOrigin = this.lastSelOrigin = null
- // Used by the isClean() method
- this.generation = this.maxGeneration = startGen || 1
-}
-
-// Create a history change event from an updateDoc-style change
-// object.
-function historyChangeFromChange(doc, change) {
- var histChange = {from: copyPos(change.from), to: changeEnd(change), text: getBetween(doc, change.from, change.to)}
- attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1)
- linkedDocs(doc, function (doc) { return attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1); }, true)
- return histChange
-}
-
-// Pop all selection events off the end of a history array. Stop at
-// a change event.
-function clearSelectionEvents(array) {
- while (array.length) {
- var last = lst(array)
- if (last.ranges) { array.pop() }
- else { break }
- }
-}
-
-// Find the top change event in the history. Pop off selection
-// events that are in the way.
-function lastChangeEvent(hist, force) {
- if (force) {
- clearSelectionEvents(hist.done)
- return lst(hist.done)
- } else if (hist.done.length && !lst(hist.done).ranges) {
- return lst(hist.done)
- } else if (hist.done.length > 1 && !hist.done[hist.done.length - 2].ranges) {
- hist.done.pop()
- return lst(hist.done)
- }
-}
-
-// Register a change in the history. Merges changes that are within
-// a single operation, or are close together with an origin that
-// allows merging (starting with "+") into a single event.
-function addChangeToHistory(doc, change, selAfter, opId) {
- var hist = doc.history
- hist.undone.length = 0
- var time = +new Date, cur
- var last
-
- if ((hist.lastOp == opId ||
- hist.lastOrigin == change.origin && change.origin &&
- ((change.origin.charAt(0) == "+" && doc.cm && hist.lastModTime > time - doc.cm.options.historyEventDelay) ||
- change.origin.charAt(0) == "*")) &&
- (cur = lastChangeEvent(hist, hist.lastOp == opId))) {
- // Merge this change into the last event
- last = lst(cur.changes)
- if (cmp(change.from, change.to) == 0 && cmp(change.from, last.to) == 0) {
- // Optimized case for simple insertion -- don't want to add
- // new changesets for every character typed
- last.to = changeEnd(change)
- } else {
- // Add new sub-event
- cur.changes.push(historyChangeFromChange(doc, change))
- }
- } else {
- // Can not be merged, start a new event.
- var before = lst(hist.done)
- if (!before || !before.ranges)
- { pushSelectionToHistory(doc.sel, hist.done) }
- cur = {changes: [historyChangeFromChange(doc, change)],
- generation: hist.generation}
- hist.done.push(cur)
- while (hist.done.length > hist.undoDepth) {
- hist.done.shift()
- if (!hist.done[0].ranges) { hist.done.shift() }
- }
- }
- hist.done.push(selAfter)
- hist.generation = ++hist.maxGeneration
- hist.lastModTime = hist.lastSelTime = time
- hist.lastOp = hist.lastSelOp = opId
- hist.lastOrigin = hist.lastSelOrigin = change.origin
-
- if (!last) { signal(doc, "historyAdded") }
-}
-
-function selectionEventCanBeMerged(doc, origin, prev, sel) {
- var ch = origin.charAt(0)
- return ch == "*" ||
- ch == "+" &&
- prev.ranges.length == sel.ranges.length &&
- prev.somethingSelected() == sel.somethingSelected() &&
- new Date - doc.history.lastSelTime <= (doc.cm ? doc.cm.options.historyEventDelay : 500)
-}
-
-// Called whenever the selection changes, sets the new selection as
-// the pending selection in the history, and pushes the old pending
-// selection into the 'done' array when it was significantly
-// different (in number of selected ranges, emptiness, or time).
-function addSelectionToHistory(doc, sel, opId, options) {
- var hist = doc.history, origin = options && options.origin
-
- // A new event is started when the previous origin does not match
- // the current, or the origins don't allow matching. Origins
- // starting with * are always merged, those starting with + are
- // merged when similar and close together in time.
- if (opId == hist.lastSelOp ||
- (origin && hist.lastSelOrigin == origin &&
- (hist.lastModTime == hist.lastSelTime && hist.lastOrigin == origin ||
- selectionEventCanBeMerged(doc, origin, lst(hist.done), sel))))
- { hist.done[hist.done.length - 1] = sel }
- else
- { pushSelectionToHistory(sel, hist.done) }
-
- hist.lastSelTime = +new Date
- hist.lastSelOrigin = origin
- hist.lastSelOp = opId
- if (options && options.clearRedo !== false)
- { clearSelectionEvents(hist.undone) }
-}
-
-function pushSelectionToHistory(sel, dest) {
- var top = lst(dest)
- if (!(top && top.ranges && top.equals(sel)))
- { dest.push(sel) }
-}
-
-// Used to store marked span information in the history.
-function attachLocalSpans(doc, change, from, to) {
- var existing = change["spans_" + doc.id], n = 0
- doc.iter(Math.max(doc.first, from), Math.min(doc.first + doc.size, to), function (line) {
- if (line.markedSpans)
- { (existing || (existing = change["spans_" + doc.id] = {}))[n] = line.markedSpans }
- ++n
- })
-}
-
-// When un/re-doing restores text containing marked spans, those
-// that have been explicitly cleared should not be restored.
-function removeClearedSpans(spans) {
- if (!spans) { return null }
- var out
- for (var i = 0; i < spans.length; ++i) {
- if (spans[i].marker.explicitlyCleared) { if (!out) { out = spans.slice(0, i) } }
- else if (out) { out.push(spans[i]) }
- }
- return !out ? spans : out.length ? out : null
-}
-
-// Retrieve and filter the old marked spans stored in a change event.
-function getOldSpans(doc, change) {
- var found = change["spans_" + doc.id]
- if (!found) { return null }
- var nw = []
- for (var i = 0; i < change.text.length; ++i)
- { nw.push(removeClearedSpans(found[i])) }
- return nw
-}
-
-// Used for un/re-doing changes from the history. Combines the
-// result of computing the existing spans with the set of spans that
-// existed in the history (so that deleting around a span and then
-// undoing brings back the span).
-function mergeOldSpans(doc, change) {
- var old = getOldSpans(doc, change)
- var stretched = stretchSpansOverChange(doc, change)
- if (!old) { return stretched }
- if (!stretched) { return old }
-
- for (var i = 0; i < old.length; ++i) {
- var oldCur = old[i], stretchCur = stretched[i]
- if (oldCur && stretchCur) {
- spans: for (var j = 0; j < stretchCur.length; ++j) {
- var span = stretchCur[j]
- for (var k = 0; k < oldCur.length; ++k)
- { if (oldCur[k].marker == span.marker) { continue spans } }
- oldCur.push(span)
- }
- } else if (stretchCur) {
- old[i] = stretchCur
- }
- }
- return old
-}
-
-// Used both to provide a JSON-safe object in .getHistory, and, when
-// detaching a document, to split the history in two
-function copyHistoryArray(events, newGroup, instantiateSel) {
- var copy = []
- for (var i = 0; i < events.length; ++i) {
- var event = events[i]
- if (event.ranges) {
- copy.push(instantiateSel ? Selection.prototype.deepCopy.call(event) : event)
- continue
- }
- var changes = event.changes, newChanges = []
- copy.push({changes: newChanges})
- for (var j = 0; j < changes.length; ++j) {
- var change = changes[j], m = void 0
- newChanges.push({from: change.from, to: change.to, text: change.text})
- if (newGroup) { for (var prop in change) { if (m = prop.match(/^spans_(\d+)$/)) {
- if (indexOf(newGroup, Number(m[1])) > -1) {
- lst(newChanges)[prop] = change[prop]
- delete change[prop]
- }
- } } }
- }
- }
- return copy
-}
-
-// The 'scroll' parameter given to many of these indicated whether
-// the new cursor position should be scrolled into view after
-// modifying the selection.
-
-// If shift is held or the extend flag is set, extends a range to
-// include a given position (and optionally a second position).
-// Otherwise, simply returns the range between the given positions.
-// Used for cursor motion and such.
-function extendRange(doc, range, head, other) {
- if (doc.cm && doc.cm.display.shift || doc.extend) {
- var anchor = range.anchor
- if (other) {
- var posBefore = cmp(head, anchor) < 0
- if (posBefore != (cmp(other, anchor) < 0)) {
- anchor = head
- head = other
- } else if (posBefore != (cmp(head, other) < 0)) {
- head = other
- }
- }
- return new Range(anchor, head)
- } else {
- return new Range(other || head, head)
- }
-}
-
-// Extend the primary selection range, discard the rest.
-function extendSelection(doc, head, other, options) {
- setSelection(doc, new Selection([extendRange(doc, doc.sel.primary(), head, other)], 0), options)
-}
-
-// Extend all selections (pos is an array of selections with length
-// equal the number of selections)
-function extendSelections(doc, heads, options) {
- var out = []
- for (var i = 0; i < doc.sel.ranges.length; i++)
- { out[i] = extendRange(doc, doc.sel.ranges[i], heads[i], null) }
- var newSel = normalizeSelection(out, doc.sel.primIndex)
- setSelection(doc, newSel, options)
-}
-
-// Updates a single range in the selection.
-function replaceOneSelection(doc, i, range, options) {
- var ranges = doc.sel.ranges.slice(0)
- ranges[i] = range
- setSelection(doc, normalizeSelection(ranges, doc.sel.primIndex), options)
-}
-
-// Reset the selection to a single range.
-function setSimpleSelection(doc, anchor, head, options) {
- setSelection(doc, simpleSelection(anchor, head), options)
-}
-
-// Give beforeSelectionChange handlers a change to influence a
-// selection update.
-function filterSelectionChange(doc, sel, options) {
- var obj = {
- ranges: sel.ranges,
- update: function(ranges) {
- var this$1 = this;
-
- this.ranges = []
- for (var i = 0; i < ranges.length; i++)
- { this$1.ranges[i] = new Range(clipPos(doc, ranges[i].anchor),
- clipPos(doc, ranges[i].head)) }
- },
- origin: options && options.origin
- }
- signal(doc, "beforeSelectionChange", doc, obj)
- if (doc.cm) { signal(doc.cm, "beforeSelectionChange", doc.cm, obj) }
- if (obj.ranges != sel.ranges) { return normalizeSelection(obj.ranges, obj.ranges.length - 1) }
- else { return sel }
-}
-
-function setSelectionReplaceHistory(doc, sel, options) {
- var done = doc.history.done, last = lst(done)
- if (last && last.ranges) {
- done[done.length - 1] = sel
- setSelectionNoUndo(doc, sel, options)
- } else {
- setSelection(doc, sel, options)
- }
-}
-
-// Set a new selection.
-function setSelection(doc, sel, options) {
- setSelectionNoUndo(doc, sel, options)
- addSelectionToHistory(doc, doc.sel, doc.cm ? doc.cm.curOp.id : NaN, options)
-}
-
-function setSelectionNoUndo(doc, sel, options) {
- if (hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange"))
- { sel = filterSelectionChange(doc, sel, options) }
-
- var bias = options && options.bias ||
- (cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1)
- setSelectionInner(doc, skipAtomicInSelection(doc, sel, bias, true))
-
- if (!(options && options.scroll === false) && doc.cm)
- { ensureCursorVisible(doc.cm) }
-}
-
-function setSelectionInner(doc, sel) {
- if (sel.equals(doc.sel)) { return }
-
- doc.sel = sel
-
- if (doc.cm) {
- doc.cm.curOp.updateInput = doc.cm.curOp.selectionChanged = true
- signalCursorActivity(doc.cm)
- }
- signalLater(doc, "cursorActivity", doc)
-}
-
-// Verify that the selection does not partially select any atomic
-// marked ranges.
-function reCheckSelection(doc) {
- setSelectionInner(doc, skipAtomicInSelection(doc, doc.sel, null, false), sel_dontScroll)
-}
-
-// Return a selection that does not partially select any atomic
-// ranges.
-function skipAtomicInSelection(doc, sel, bias, mayClear) {
- var out
- for (var i = 0; i < sel.ranges.length; i++) {
- var range = sel.ranges[i]
- var old = sel.ranges.length == doc.sel.ranges.length && doc.sel.ranges[i]
- var newAnchor = skipAtomic(doc, range.anchor, old && old.anchor, bias, mayClear)
- var newHead = skipAtomic(doc, range.head, old && old.head, bias, mayClear)
- if (out || newAnchor != range.anchor || newHead != range.head) {
- if (!out) { out = sel.ranges.slice(0, i) }
- out[i] = new Range(newAnchor, newHead)
- }
- }
- return out ? normalizeSelection(out, sel.primIndex) : sel
-}
-
-function skipAtomicInner(doc, pos, oldPos, dir, mayClear) {
- var line = getLine(doc, pos.line)
- if (line.markedSpans) { for (var i = 0; i < line.markedSpans.length; ++i) {
- var sp = line.markedSpans[i], m = sp.marker
- if ((sp.from == null || (m.inclusiveLeft ? sp.from <= pos.ch : sp.from < pos.ch)) &&
- (sp.to == null || (m.inclusiveRight ? sp.to >= pos.ch : sp.to > pos.ch))) {
- if (mayClear) {
- signal(m, "beforeCursorEnter")
- if (m.explicitlyCleared) {
- if (!line.markedSpans) { break }
- else {--i; continue}
- }
- }
- if (!m.atomic) { continue }
-
- if (oldPos) {
- var near = m.find(dir < 0 ? 1 : -1), diff = void 0
- if (dir < 0 ? m.inclusiveRight : m.inclusiveLeft)
- { near = movePos(doc, near, -dir, near && near.line == pos.line ? line : null) }
- if (near && near.line == pos.line && (diff = cmp(near, oldPos)) && (dir < 0 ? diff < 0 : diff > 0))
- { return skipAtomicInner(doc, near, pos, dir, mayClear) }
- }
-
- var far = m.find(dir < 0 ? -1 : 1)
- if (dir < 0 ? m.inclusiveLeft : m.inclusiveRight)
- { far = movePos(doc, far, dir, far.line == pos.line ? line : null) }
- return far ? skipAtomicInner(doc, far, pos, dir, mayClear) : null
- }
- } }
- return pos
-}
-
-// Ensure a given position is not inside an atomic range.
-function skipAtomic(doc, pos, oldPos, bias, mayClear) {
- var dir = bias || 1
- var found = skipAtomicInner(doc, pos, oldPos, dir, mayClear) ||
- (!mayClear && skipAtomicInner(doc, pos, oldPos, dir, true)) ||
- skipAtomicInner(doc, pos, oldPos, -dir, mayClear) ||
- (!mayClear && skipAtomicInner(doc, pos, oldPos, -dir, true))
- if (!found) {
- doc.cantEdit = true
- return Pos(doc.first, 0)
- }
- return found
-}
-
-function movePos(doc, pos, dir, line) {
- if (dir < 0 && pos.ch == 0) {
- if (pos.line > doc.first) { return clipPos(doc, Pos(pos.line - 1)) }
- else { return null }
- } else if (dir > 0 && pos.ch == (line || getLine(doc, pos.line)).text.length) {
- if (pos.line < doc.first + doc.size - 1) { return Pos(pos.line + 1, 0) }
- else { return null }
- } else {
- return new Pos(pos.line, pos.ch + dir)
- }
-}
-
-function selectAll(cm) {
- cm.setSelection(Pos(cm.firstLine(), 0), Pos(cm.lastLine()), sel_dontScroll)
-}
-
-// UPDATING
-
-// Allow "beforeChange" event handlers to influence a change
-function filterChange(doc, change, update) {
- var obj = {
- canceled: false,
- from: change.from,
- to: change.to,
- text: change.text,
- origin: change.origin,
- cancel: function () { return obj.canceled = true; }
- }
- if (update) { obj.update = function (from, to, text, origin) {
- if (from) { obj.from = clipPos(doc, from) }
- if (to) { obj.to = clipPos(doc, to) }
- if (text) { obj.text = text }
- if (origin !== undefined) { obj.origin = origin }
- } }
- signal(doc, "beforeChange", doc, obj)
- if (doc.cm) { signal(doc.cm, "beforeChange", doc.cm, obj) }
-
- if (obj.canceled) { return null }
- return {from: obj.from, to: obj.to, text: obj.text, origin: obj.origin}
-}
-
-// Apply a change to a document, and add it to the document's
-// history, and propagating it to all linked documents.
-function makeChange(doc, change, ignoreReadOnly) {
- if (doc.cm) {
- if (!doc.cm.curOp) { return operation(doc.cm, makeChange)(doc, change, ignoreReadOnly) }
- if (doc.cm.state.suppressEdits) { return }
- }
-
- if (hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange")) {
- change = filterChange(doc, change, true)
- if (!change) { return }
- }
-
- // Possibly split or suppress the update based on the presence
- // of read-only spans in its range.
- var split = sawReadOnlySpans && !ignoreReadOnly && removeReadOnlyRanges(doc, change.from, change.to)
- if (split) {
- for (var i = split.length - 1; i >= 0; --i)
- { makeChangeInner(doc, {from: split[i].from, to: split[i].to, text: i ? [""] : change.text}) }
- } else {
- makeChangeInner(doc, change)
- }
-}
-
-function makeChangeInner(doc, change) {
- if (change.text.length == 1 && change.text[0] == "" && cmp(change.from, change.to) == 0) { return }
- var selAfter = computeSelAfterChange(doc, change)
- addChangeToHistory(doc, change, selAfter, doc.cm ? doc.cm.curOp.id : NaN)
-
- makeChangeSingleDoc(doc, change, selAfter, stretchSpansOverChange(doc, change))
- var rebased = []
-
- linkedDocs(doc, function (doc, sharedHist) {
- if (!sharedHist && indexOf(rebased, doc.history) == -1) {
- rebaseHist(doc.history, change)
- rebased.push(doc.history)
- }
- makeChangeSingleDoc(doc, change, null, stretchSpansOverChange(doc, change))
- })
-}
-
-// Revert a change stored in a document's history.
-function makeChangeFromHistory(doc, type, allowSelectionOnly) {
- if (doc.cm && doc.cm.state.suppressEdits && !allowSelectionOnly) { return }
-
- var hist = doc.history, event, selAfter = doc.sel
- var source = type == "undo" ? hist.done : hist.undone, dest = type == "undo" ? hist.undone : hist.done
-
- // Verify that there is a useable event (so that ctrl-z won't
- // needlessly clear selection events)
- var i = 0
- for (; i < source.length; i++) {
- event = source[i]
- if (allowSelectionOnly ? event.ranges && !event.equals(doc.sel) : !event.ranges)
- { break }
- }
- if (i == source.length) { return }
- hist.lastOrigin = hist.lastSelOrigin = null
-
- for (;;) {
- event = source.pop()
- if (event.ranges) {
- pushSelectionToHistory(event, dest)
- if (allowSelectionOnly && !event.equals(doc.sel)) {
- setSelection(doc, event, {clearRedo: false})
- return
- }
- selAfter = event
- }
- else { break }
- }
-
- // Build up a reverse change object to add to the opposite history
- // stack (redo when undoing, and vice versa).
- var antiChanges = []
- pushSelectionToHistory(selAfter, dest)
- dest.push({changes: antiChanges, generation: hist.generation})
- hist.generation = event.generation || ++hist.maxGeneration
-
- var filter = hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange")
-
- var loop = function ( i ) {
- var change = event.changes[i]
- change.origin = type
- if (filter && !filterChange(doc, change, false)) {
- source.length = 0
- return {}
- }
-
- antiChanges.push(historyChangeFromChange(doc, change))
-
- var after = i ? computeSelAfterChange(doc, change) : lst(source)
- makeChangeSingleDoc(doc, change, after, mergeOldSpans(doc, change))
- if (!i && doc.cm) { doc.cm.scrollIntoView({from: change.from, to: changeEnd(change)}) }
- var rebased = []
-
- // Propagate to the linked documents
- linkedDocs(doc, function (doc, sharedHist) {
- if (!sharedHist && indexOf(rebased, doc.history) == -1) {
- rebaseHist(doc.history, change)
- rebased.push(doc.history)
- }
- makeChangeSingleDoc(doc, change, null, mergeOldSpans(doc, change))
- })
- };
-
- for (var i$1 = event.changes.length - 1; i$1 >= 0; --i$1) {
- var returned = loop( i$1 );
-
- if ( returned ) return returned.v;
- }
-}
-
-// Sub-views need their line numbers shifted when text is added
-// above or below them in the parent document.
-function shiftDoc(doc, distance) {
- if (distance == 0) { return }
- doc.first += distance
- doc.sel = new Selection(map(doc.sel.ranges, function (range) { return new Range(
- Pos(range.anchor.line + distance, range.anchor.ch),
- Pos(range.head.line + distance, range.head.ch)
- ); }), doc.sel.primIndex)
- if (doc.cm) {
- regChange(doc.cm, doc.first, doc.first - distance, distance)
- for (var d = doc.cm.display, l = d.viewFrom; l < d.viewTo; l++)
- { regLineChange(doc.cm, l, "gutter") }
- }
-}
-
-// More lower-level change function, handling only a single document
-// (not linked ones).
-function makeChangeSingleDoc(doc, change, selAfter, spans) {
- if (doc.cm && !doc.cm.curOp)
- { return operation(doc.cm, makeChangeSingleDoc)(doc, change, selAfter, spans) }
-
- if (change.to.line < doc.first) {
- shiftDoc(doc, change.text.length - 1 - (change.to.line - change.from.line))
- return
- }
- if (change.from.line > doc.lastLine()) { return }
-
- // Clip the change to the size of this doc
- if (change.from.line < doc.first) {
- var shift = change.text.length - 1 - (doc.first - change.from.line)
- shiftDoc(doc, shift)
- change = {from: Pos(doc.first, 0), to: Pos(change.to.line + shift, change.to.ch),
- text: [lst(change.text)], origin: change.origin}
- }
- var last = doc.lastLine()
- if (change.to.line > last) {
- change = {from: change.from, to: Pos(last, getLine(doc, last).text.length),
- text: [change.text[0]], origin: change.origin}
- }
-
- change.removed = getBetween(doc, change.from, change.to)
-
- if (!selAfter) { selAfter = computeSelAfterChange(doc, change) }
- if (doc.cm) { makeChangeSingleDocInEditor(doc.cm, change, spans) }
- else { updateDoc(doc, change, spans) }
- setSelectionNoUndo(doc, selAfter, sel_dontScroll)
-}
-
-// Handle the interaction of a change to a document with the editor
-// that this document is part of.
-function makeChangeSingleDocInEditor(cm, change, spans) {
- var doc = cm.doc, display = cm.display, from = change.from, to = change.to
-
- var recomputeMaxLength = false, checkWidthStart = from.line
- if (!cm.options.lineWrapping) {
- checkWidthStart = lineNo(visualLine(getLine(doc, from.line)))
- doc.iter(checkWidthStart, to.line + 1, function (line) {
- if (line == display.maxLine) {
- recomputeMaxLength = true
- return true
- }
- })
- }
-
- if (doc.sel.contains(change.from, change.to) > -1)
- { signalCursorActivity(cm) }
-
- updateDoc(doc, change, spans, estimateHeight(cm))
-
- if (!cm.options.lineWrapping) {
- doc.iter(checkWidthStart, from.line + change.text.length, function (line) {
- var len = lineLength(line)
- if (len > display.maxLineLength) {
- display.maxLine = line
- display.maxLineLength = len
- display.maxLineChanged = true
- recomputeMaxLength = false
- }
- })
- if (recomputeMaxLength) { cm.curOp.updateMaxLine = true }
- }
-
- // Adjust frontier, schedule worker
- doc.frontier = Math.min(doc.frontier, from.line)
- startWorker(cm, 400)
-
- var lendiff = change.text.length - (to.line - from.line) - 1
- // Remember that these lines changed, for updating the display
- if (change.full)
- { regChange(cm) }
- else if (from.line == to.line && change.text.length == 1 && !isWholeLineUpdate(cm.doc, change))
- { regLineChange(cm, from.line, "text") }
- else
- { regChange(cm, from.line, to.line + 1, lendiff) }
-
- var changesHandler = hasHandler(cm, "changes"), changeHandler = hasHandler(cm, "change")
- if (changeHandler || changesHandler) {
- var obj = {
- from: from, to: to,
- text: change.text,
- removed: change.removed,
- origin: change.origin
- }
- if (changeHandler) { signalLater(cm, "change", cm, obj) }
- if (changesHandler) { (cm.curOp.changeObjs || (cm.curOp.changeObjs = [])).push(obj) }
- }
- cm.display.selForContextMenu = null
-}
-
-function replaceRange(doc, code, from, to, origin) {
- if (!to) { to = from }
- if (cmp(to, from) < 0) { var tmp = to; to = from; from = tmp }
- if (typeof code == "string") { code = doc.splitLines(code) }
- makeChange(doc, {from: from, to: to, text: code, origin: origin})
-}
-
-// Rebasing/resetting history to deal with externally-sourced changes
-
-function rebaseHistSelSingle(pos, from, to, diff) {
- if (to < pos.line) {
- pos.line += diff
- } else if (from < pos.line) {
- pos.line = from
- pos.ch = 0
- }
-}
-
-// Tries to rebase an array of history events given a change in the
-// document. If the change touches the same lines as the event, the
-// event, and everything 'behind' it, is discarded. If the change is
-// before the event, the event's positions are updated. Uses a
-// copy-on-write scheme for the positions, to avoid having to
-// reallocate them all on every rebase, but also avoid problems with
-// shared position objects being unsafely updated.
-function rebaseHistArray(array, from, to, diff) {
- for (var i = 0; i < array.length; ++i) {
- var sub = array[i], ok = true
- if (sub.ranges) {
- if (!sub.copied) { sub = array[i] = sub.deepCopy(); sub.copied = true }
- for (var j = 0; j < sub.ranges.length; j++) {
- rebaseHistSelSingle(sub.ranges[j].anchor, from, to, diff)
- rebaseHistSelSingle(sub.ranges[j].head, from, to, diff)
- }
- continue
- }
- for (var j$1 = 0; j$1 < sub.changes.length; ++j$1) {
- var cur = sub.changes[j$1]
- if (to < cur.from.line) {
- cur.from = Pos(cur.from.line + diff, cur.from.ch)
- cur.to = Pos(cur.to.line + diff, cur.to.ch)
- } else if (from <= cur.to.line) {
- ok = false
- break
- }
- }
- if (!ok) {
- array.splice(0, i + 1)
- i = 0
- }
- }
-}
-
-function rebaseHist(hist, change) {
- var from = change.from.line, to = change.to.line, diff = change.text.length - (to - from) - 1
- rebaseHistArray(hist.done, from, to, diff)
- rebaseHistArray(hist.undone, from, to, diff)
-}
-
-// Utility for applying a change to a line by handle or number,
-// returning the number and optionally registering the line as
-// changed.
-function changeLine(doc, handle, changeType, op) {
- var no = handle, line = handle
- if (typeof handle == "number") { line = getLine(doc, clipLine(doc, handle)) }
- else { no = lineNo(handle) }
- if (no == null) { return null }
- if (op(line, no) && doc.cm) { regLineChange(doc.cm, no, changeType) }
- return line
-}
-
-// The document is represented as a BTree consisting of leaves, with
-// chunk of lines in them, and branches, with up to ten leaves or
-// other branch nodes below them. The top node is always a branch
-// node, and is the document object itself (meaning it has
-// additional methods and properties).
-//
-// All nodes have parent links. The tree is used both to go from
-// line numbers to line objects, and to go from objects to numbers.
-// It also indexes by height, and is used to convert between height
-// and line object, and to find the total height of the document.
-//
-// See also http://marijnhaverbeke.nl/blog/codemirror-line-tree.html
-
-function LeafChunk(lines) {
- var this$1 = this;
-
- this.lines = lines
- this.parent = null
- var height = 0
- for (var i = 0; i < lines.length; ++i) {
- lines[i].parent = this$1
- height += lines[i].height
- }
- this.height = height
-}
-
-LeafChunk.prototype = {
- chunkSize: function() { return this.lines.length },
- // Remove the n lines at offset 'at'.
- removeInner: function(at, n) {
- var this$1 = this;
-
- for (var i = at, e = at + n; i < e; ++i) {
- var line = this$1.lines[i]
- this$1.height -= line.height
- cleanUpLine(line)
- signalLater(line, "delete")
- }
- this.lines.splice(at, n)
- },
- // Helper used to collapse a small branch into a single leaf.
- collapse: function(lines) {
- lines.push.apply(lines, this.lines)
- },
- // Insert the given array of lines at offset 'at', count them as
- // having the given height.
- insertInner: function(at, lines, height) {
- var this$1 = this;
-
- this.height += height
- this.lines = this.lines.slice(0, at).concat(lines).concat(this.lines.slice(at))
- for (var i = 0; i < lines.length; ++i) { lines[i].parent = this$1 }
- },
- // Used to iterate over a part of the tree.
- iterN: function(at, n, op) {
- var this$1 = this;
-
- for (var e = at + n; at < e; ++at)
- { if (op(this$1.lines[at])) { return true } }
- }
-}
-
-function BranchChunk(children) {
- var this$1 = this;
-
- this.children = children
- var size = 0, height = 0
- for (var i = 0; i < children.length; ++i) {
- var ch = children[i]
- size += ch.chunkSize(); height += ch.height
- ch.parent = this$1
- }
- this.size = size
- this.height = height
- this.parent = null
-}
-
-BranchChunk.prototype = {
- chunkSize: function() { return this.size },
- removeInner: function(at, n) {
- var this$1 = this;
-
- this.size -= n
- for (var i = 0; i < this.children.length; ++i) {
- var child = this$1.children[i], sz = child.chunkSize()
- if (at < sz) {
- var rm = Math.min(n, sz - at), oldHeight = child.height
- child.removeInner(at, rm)
- this$1.height -= oldHeight - child.height
- if (sz == rm) { this$1.children.splice(i--, 1); child.parent = null }
- if ((n -= rm) == 0) { break }
- at = 0
- } else { at -= sz }
- }
- // If the result is smaller than 25 lines, ensure that it is a
- // single leaf node.
- if (this.size - n < 25 &&
- (this.children.length > 1 || !(this.children[0] instanceof LeafChunk))) {
- var lines = []
- this.collapse(lines)
- this.children = [new LeafChunk(lines)]
- this.children[0].parent = this
- }
- },
- collapse: function(lines) {
- var this$1 = this;
-
- for (var i = 0; i < this.children.length; ++i) { this$1.children[i].collapse(lines) }
- },
- insertInner: function(at, lines, height) {
- var this$1 = this;
-
- this.size += lines.length
- this.height += height
- for (var i = 0; i < this.children.length; ++i) {
- var child = this$1.children[i], sz = child.chunkSize()
- if (at <= sz) {
- child.insertInner(at, lines, height)
- if (child.lines && child.lines.length > 50) {
- // To avoid memory thrashing when child.lines is huge (e.g. first view of a large file), it's never spliced.
- // Instead, small slices are taken. They're taken in order because sequential memory accesses are fastest.
- var remaining = child.lines.length % 25 + 25
- for (var pos = remaining; pos < child.lines.length;) {
- var leaf = new LeafChunk(child.lines.slice(pos, pos += 25))
- child.height -= leaf.height
- this$1.children.splice(++i, 0, leaf)
- leaf.parent = this$1
- }
- child.lines = child.lines.slice(0, remaining)
- this$1.maybeSpill()
- }
- break
- }
- at -= sz
- }
- },
- // When a node has grown, check whether it should be split.
- maybeSpill: function() {
- if (this.children.length <= 10) { return }
- var me = this
- do {
- var spilled = me.children.splice(me.children.length - 5, 5)
- var sibling = new BranchChunk(spilled)
- if (!me.parent) { // Become the parent node
- var copy = new BranchChunk(me.children)
- copy.parent = me
- me.children = [copy, sibling]
- me = copy
- } else {
- me.size -= sibling.size
- me.height -= sibling.height
- var myIndex = indexOf(me.parent.children, me)
- me.parent.children.splice(myIndex + 1, 0, sibling)
- }
- sibling.parent = me.parent
- } while (me.children.length > 10)
- me.parent.maybeSpill()
- },
- iterN: function(at, n, op) {
- var this$1 = this;
-
- for (var i = 0; i < this.children.length; ++i) {
- var child = this$1.children[i], sz = child.chunkSize()
- if (at < sz) {
- var used = Math.min(n, sz - at)
- if (child.iterN(at, used, op)) { return true }
- if ((n -= used) == 0) { break }
- at = 0
- } else { at -= sz }
- }
- }
-}
-
-// Line widgets are block elements displayed above or below a line.
-
-function LineWidget(doc, node, options) {
- var this$1 = this;
-
- if (options) { for (var opt in options) { if (options.hasOwnProperty(opt))
- { this$1[opt] = options[opt] } } }
- this.doc = doc
- this.node = node
-}
-eventMixin(LineWidget)
-
-function adjustScrollWhenAboveVisible(cm, line, diff) {
- if (heightAtLine(line) < ((cm.curOp && cm.curOp.scrollTop) || cm.doc.scrollTop))
- { addToScrollPos(cm, null, diff) }
-}
-
-LineWidget.prototype.clear = function() {
- var this$1 = this;
-
- var cm = this.doc.cm, ws = this.line.widgets, line = this.line, no = lineNo(line)
- if (no == null || !ws) { return }
- for (var i = 0; i < ws.length; ++i) { if (ws[i] == this$1) { ws.splice(i--, 1) } }
- if (!ws.length) { line.widgets = null }
- var height = widgetHeight(this)
- updateLineHeight(line, Math.max(0, line.height - height))
- if (cm) { runInOp(cm, function () {
- adjustScrollWhenAboveVisible(cm, line, -height)
- regLineChange(cm, no, "widget")
- }) }
-}
-LineWidget.prototype.changed = function() {
- var oldH = this.height, cm = this.doc.cm, line = this.line
- this.height = null
- var diff = widgetHeight(this) - oldH
- if (!diff) { return }
- updateLineHeight(line, line.height + diff)
- if (cm) { runInOp(cm, function () {
- cm.curOp.forceUpdate = true
- adjustScrollWhenAboveVisible(cm, line, diff)
- }) }
-}
-
-function addLineWidget(doc, handle, node, options) {
- var widget = new LineWidget(doc, node, options)
- var cm = doc.cm
- if (cm && widget.noHScroll) { cm.display.alignWidgets = true }
- changeLine(doc, handle, "widget", function (line) {
- var widgets = line.widgets || (line.widgets = [])
- if (widget.insertAt == null) { widgets.push(widget) }
- else { widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget) }
- widget.line = line
- if (cm && !lineIsHidden(doc, line)) {
- var aboveVisible = heightAtLine(line) < doc.scrollTop
- updateLineHeight(line, line.height + widgetHeight(widget))
- if (aboveVisible) { addToScrollPos(cm, null, widget.height) }
- cm.curOp.forceUpdate = true
- }
- return true
- })
- return widget
-}
-
-// TEXTMARKERS
-
-// Created with markText and setBookmark methods. A TextMarker is a
-// handle that can be used to clear or find a marked position in the
-// document. Line objects hold arrays (markedSpans) containing
-// {from, to, marker} object pointing to such marker objects, and
-// indicating that such a marker is present on that line. Multiple
-// lines may point to the same marker when it spans across lines.
-// The spans will have null for their from/to properties when the
-// marker continues beyond the start/end of the line. Markers have
-// links back to the lines they currently touch.
-
-// Collapsed markers have unique ids, in order to be able to order
-// them, which is needed for uniquely determining an outer marker
-// when they overlap (they may nest, but not partially overlap).
-var nextMarkerId = 0
-
-function TextMarker(doc, type) {
- this.lines = []
- this.type = type
- this.doc = doc
- this.id = ++nextMarkerId
-}
-eventMixin(TextMarker)
-
-// Clear the marker.
-TextMarker.prototype.clear = function() {
- var this$1 = this;
-
- if (this.explicitlyCleared) { return }
- var cm = this.doc.cm, withOp = cm && !cm.curOp
- if (withOp) { startOperation(cm) }
- if (hasHandler(this, "clear")) {
- var found = this.find()
- if (found) { signalLater(this, "clear", found.from, found.to) }
- }
- var min = null, max = null
- for (var i = 0; i < this.lines.length; ++i) {
- var line = this$1.lines[i]
- var span = getMarkedSpanFor(line.markedSpans, this$1)
- if (cm && !this$1.collapsed) { regLineChange(cm, lineNo(line), "text") }
- else if (cm) {
- if (span.to != null) { max = lineNo(line) }
- if (span.from != null) { min = lineNo(line) }
- }
- line.markedSpans = removeMarkedSpan(line.markedSpans, span)
- if (span.from == null && this$1.collapsed && !lineIsHidden(this$1.doc, line) && cm)
- { updateLineHeight(line, textHeight(cm.display)) }
- }
- if (cm && this.collapsed && !cm.options.lineWrapping) { for (var i$1 = 0; i$1 < this.lines.length; ++i$1) {
- var visual = visualLine(this$1.lines[i$1]), len = lineLength(visual)
- if (len > cm.display.maxLineLength) {
- cm.display.maxLine = visual
- cm.display.maxLineLength = len
- cm.display.maxLineChanged = true
- }
- } }
-
- if (min != null && cm && this.collapsed) { regChange(cm, min, max + 1) }
- this.lines.length = 0
- this.explicitlyCleared = true
- if (this.atomic && this.doc.cantEdit) {
- this.doc.cantEdit = false
- if (cm) { reCheckSelection(cm.doc) }
- }
- if (cm) { signalLater(cm, "markerCleared", cm, this) }
- if (withOp) { endOperation(cm) }
- if (this.parent) { this.parent.clear() }
-}
-
-// Find the position of the marker in the document. Returns a {from,
-// to} object by default. Side can be passed to get a specific side
-// -- 0 (both), -1 (left), or 1 (right). When lineObj is true, the
-// Pos objects returned contain a line object, rather than a line
-// number (used to prevent looking up the same line twice).
-TextMarker.prototype.find = function(side, lineObj) {
- var this$1 = this;
-
- if (side == null && this.type == "bookmark") { side = 1 }
- var from, to
- for (var i = 0; i < this.lines.length; ++i) {
- var line = this$1.lines[i]
- var span = getMarkedSpanFor(line.markedSpans, this$1)
- if (span.from != null) {
- from = Pos(lineObj ? line : lineNo(line), span.from)
- if (side == -1) { return from }
- }
- if (span.to != null) {
- to = Pos(lineObj ? line : lineNo(line), span.to)
- if (side == 1) { return to }
- }
- }
- return from && {from: from, to: to}
-}
-
-// Signals that the marker's widget changed, and surrounding layout
-// should be recomputed.
-TextMarker.prototype.changed = function() {
- var pos = this.find(-1, true), widget = this, cm = this.doc.cm
- if (!pos || !cm) { return }
- runInOp(cm, function () {
- var line = pos.line, lineN = lineNo(pos.line)
- var view = findViewForLine(cm, lineN)
- if (view) {
- clearLineMeasurementCacheFor(view)
- cm.curOp.selectionChanged = cm.curOp.forceUpdate = true
- }
- cm.curOp.updateMaxLine = true
- if (!lineIsHidden(widget.doc, line) && widget.height != null) {
- var oldHeight = widget.height
- widget.height = null
- var dHeight = widgetHeight(widget) - oldHeight
- if (dHeight)
- { updateLineHeight(line, line.height + dHeight) }
- }
- })
-}
-
-TextMarker.prototype.attachLine = function(line) {
- if (!this.lines.length && this.doc.cm) {
- var op = this.doc.cm.curOp
- if (!op.maybeHiddenMarkers || indexOf(op.maybeHiddenMarkers, this) == -1)
- { (op.maybeUnhiddenMarkers || (op.maybeUnhiddenMarkers = [])).push(this) }
- }
- this.lines.push(line)
-}
-TextMarker.prototype.detachLine = function(line) {
- this.lines.splice(indexOf(this.lines, line), 1)
- if (!this.lines.length && this.doc.cm) {
- var op = this.doc.cm.curOp;(op.maybeHiddenMarkers || (op.maybeHiddenMarkers = [])).push(this)
- }
-}
-
-// Create a marker, wire it up to the right lines, and
-function markText(doc, from, to, options, type) {
- // Shared markers (across linked documents) are handled separately
- // (markTextShared will call out to this again, once per
- // document).
- if (options && options.shared) { return markTextShared(doc, from, to, options, type) }
- // Ensure we are in an operation.
- if (doc.cm && !doc.cm.curOp) { return operation(doc.cm, markText)(doc, from, to, options, type) }
-
- var marker = new TextMarker(doc, type), diff = cmp(from, to)
- if (options) { copyObj(options, marker, false) }
- // Don't connect empty markers unless clearWhenEmpty is false
- if (diff > 0 || diff == 0 && marker.clearWhenEmpty !== false)
- { return marker }
- if (marker.replacedWith) {
- // Showing up as a widget implies collapsed (widget replaces text)
- marker.collapsed = true
- marker.widgetNode = elt("span", [marker.replacedWith], "CodeMirror-widget")
- if (!options.handleMouseEvents) { marker.widgetNode.setAttribute("cm-ignore-events", "true") }
- if (options.insertLeft) { marker.widgetNode.insertLeft = true }
- }
- if (marker.collapsed) {
- if (conflictingCollapsedRange(doc, from.line, from, to, marker) ||
- from.line != to.line && conflictingCollapsedRange(doc, to.line, from, to, marker))
- { throw new Error("Inserting collapsed marker partially overlapping an existing one") }
- seeCollapsedSpans()
- }
-
- if (marker.addToHistory)
- { addChangeToHistory(doc, {from: from, to: to, origin: "markText"}, doc.sel, NaN) }
-
- var curLine = from.line, cm = doc.cm, updateMaxLine
- doc.iter(curLine, to.line + 1, function (line) {
- if (cm && marker.collapsed && !cm.options.lineWrapping && visualLine(line) == cm.display.maxLine)
- { updateMaxLine = true }
- if (marker.collapsed && curLine != from.line) { updateLineHeight(line, 0) }
- addMarkedSpan(line, new MarkedSpan(marker,
- curLine == from.line ? from.ch : null,
- curLine == to.line ? to.ch : null))
- ++curLine
- })
- // lineIsHidden depends on the presence of the spans, so needs a second pass
- if (marker.collapsed) { doc.iter(from.line, to.line + 1, function (line) {
- if (lineIsHidden(doc, line)) { updateLineHeight(line, 0) }
- }) }
-
- if (marker.clearOnEnter) { on(marker, "beforeCursorEnter", function () { return marker.clear(); }) }
-
- if (marker.readOnly) {
- seeReadOnlySpans()
- if (doc.history.done.length || doc.history.undone.length)
- { doc.clearHistory() }
- }
- if (marker.collapsed) {
- marker.id = ++nextMarkerId
- marker.atomic = true
- }
- if (cm) {
- // Sync editor state
- if (updateMaxLine) { cm.curOp.updateMaxLine = true }
- if (marker.collapsed)
- { regChange(cm, from.line, to.line + 1) }
- else if (marker.className || marker.title || marker.startStyle || marker.endStyle || marker.css)
- { for (var i = from.line; i <= to.line; i++) { regLineChange(cm, i, "text") } }
- if (marker.atomic) { reCheckSelection(cm.doc) }
- signalLater(cm, "markerAdded", cm, marker)
- }
- return marker
-}
-
-// SHARED TEXTMARKERS
-
-// A shared marker spans multiple linked documents. It is
-// implemented as a meta-marker-object controlling multiple normal
-// markers.
-function SharedTextMarker(markers, primary) {
- var this$1 = this;
-
- this.markers = markers
- this.primary = primary
- for (var i = 0; i < markers.length; ++i)
- { markers[i].parent = this$1 }
-}
-eventMixin(SharedTextMarker)
-
-SharedTextMarker.prototype.clear = function() {
- var this$1 = this;
-
- if (this.explicitlyCleared) { return }
- this.explicitlyCleared = true
- for (var i = 0; i < this.markers.length; ++i)
- { this$1.markers[i].clear() }
- signalLater(this, "clear")
-}
-SharedTextMarker.prototype.find = function(side, lineObj) {
- return this.primary.find(side, lineObj)
-}
-
-function markTextShared(doc, from, to, options, type) {
- options = copyObj(options)
- options.shared = false
- var markers = [markText(doc, from, to, options, type)], primary = markers[0]
- var widget = options.widgetNode
- linkedDocs(doc, function (doc) {
- if (widget) { options.widgetNode = widget.cloneNode(true) }
- markers.push(markText(doc, clipPos(doc, from), clipPos(doc, to), options, type))
- for (var i = 0; i < doc.linked.length; ++i)
- { if (doc.linked[i].isParent) { return } }
- primary = lst(markers)
- })
- return new SharedTextMarker(markers, primary)
-}
-
-function findSharedMarkers(doc) {
- return doc.findMarks(Pos(doc.first, 0), doc.clipPos(Pos(doc.lastLine())), function (m) { return m.parent; })
-}
-
-function copySharedMarkers(doc, markers) {
- for (var i = 0; i < markers.length; i++) {
- var marker = markers[i], pos = marker.find()
- var mFrom = doc.clipPos(pos.from), mTo = doc.clipPos(pos.to)
- if (cmp(mFrom, mTo)) {
- var subMark = markText(doc, mFrom, mTo, marker.primary, marker.primary.type)
- marker.markers.push(subMark)
- subMark.parent = marker
- }
- }
-}
-
-function detachSharedMarkers(markers) {
- var loop = function ( i ) {
- var marker = markers[i], linked = [marker.primary.doc]
- linkedDocs(marker.primary.doc, function (d) { return linked.push(d); })
- for (var j = 0; j < marker.markers.length; j++) {
- var subMarker = marker.markers[j]
- if (indexOf(linked, subMarker.doc) == -1) {
- subMarker.parent = null
- marker.markers.splice(j--, 1)
- }
- }
- };
-
- for (var i = 0; i < markers.length; i++) loop( i );
-}
-
-var nextDocId = 0
-var Doc = function(text, mode, firstLine, lineSep) {
- if (!(this instanceof Doc)) { return new Doc(text, mode, firstLine, lineSep) }
- if (firstLine == null) { firstLine = 0 }
-
- BranchChunk.call(this, [new LeafChunk([new Line("", null)])])
- this.first = firstLine
- this.scrollTop = this.scrollLeft = 0
- this.cantEdit = false
- this.cleanGeneration = 1
- this.frontier = firstLine
- var start = Pos(firstLine, 0)
- this.sel = simpleSelection(start)
- this.history = new History(null)
- this.id = ++nextDocId
- this.modeOption = mode
- this.lineSep = lineSep
- this.extend = false
-
- if (typeof text == "string") { text = this.splitLines(text) }
- updateDoc(this, {from: start, to: start, text: text})
- setSelection(this, simpleSelection(start), sel_dontScroll)
-}
-
-Doc.prototype = createObj(BranchChunk.prototype, {
- constructor: Doc,
- // Iterate over the document. Supports two forms -- with only one
- // argument, it calls that for each line in the document. With
- // three, it iterates over the range given by the first two (with
- // the second being non-inclusive).
- iter: function(from, to, op) {
- if (op) { this.iterN(from - this.first, to - from, op) }
- else { this.iterN(this.first, this.first + this.size, from) }
- },
-
- // Non-public interface for adding and removing lines.
- insert: function(at, lines) {
- var height = 0
- for (var i = 0; i < lines.length; ++i) { height += lines[i].height }
- this.insertInner(at - this.first, lines, height)
- },
- remove: function(at, n) { this.removeInner(at - this.first, n) },
-
- // From here, the methods are part of the public interface. Most
- // are also available from CodeMirror (editor) instances.
-
- getValue: function(lineSep) {
- var lines = getLines(this, this.first, this.first + this.size)
- if (lineSep === false) { return lines }
- return lines.join(lineSep || this.lineSeparator())
- },
- setValue: docMethodOp(function(code) {
- var top = Pos(this.first, 0), last = this.first + this.size - 1
- makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length),
- text: this.splitLines(code), origin: "setValue", full: true}, true)
- setSelection(this, simpleSelection(top))
- }),
- replaceRange: function(code, from, to, origin) {
- from = clipPos(this, from)
- to = to ? clipPos(this, to) : from
- replaceRange(this, code, from, to, origin)
- },
- getRange: function(from, to, lineSep) {
- var lines = getBetween(this, clipPos(this, from), clipPos(this, to))
- if (lineSep === false) { return lines }
- return lines.join(lineSep || this.lineSeparator())
- },
-
- getLine: function(line) {var l = this.getLineHandle(line); return l && l.text},
-
- getLineHandle: function(line) {if (isLine(this, line)) { return getLine(this, line) }},
- getLineNumber: function(line) {return lineNo(line)},
-
- getLineHandleVisualStart: function(line) {
- if (typeof line == "number") { line = getLine(this, line) }
- return visualLine(line)
- },
-
- lineCount: function() {return this.size},
- firstLine: function() {return this.first},
- lastLine: function() {return this.first + this.size - 1},
-
- clipPos: function(pos) {return clipPos(this, pos)},
-
- getCursor: function(start) {
- var range$$1 = this.sel.primary(), pos
- if (start == null || start == "head") { pos = range$$1.head }
- else if (start == "anchor") { pos = range$$1.anchor }
- else if (start == "end" || start == "to" || start === false) { pos = range$$1.to() }
- else { pos = range$$1.from() }
- return pos
- },
- listSelections: function() { return this.sel.ranges },
- somethingSelected: function() {return this.sel.somethingSelected()},
-
- setCursor: docMethodOp(function(line, ch, options) {
- setSimpleSelection(this, clipPos(this, typeof line == "number" ? Pos(line, ch || 0) : line), null, options)
- }),
- setSelection: docMethodOp(function(anchor, head, options) {
- setSimpleSelection(this, clipPos(this, anchor), clipPos(this, head || anchor), options)
- }),
- extendSelection: docMethodOp(function(head, other, options) {
- extendSelection(this, clipPos(this, head), other && clipPos(this, other), options)
- }),
- extendSelections: docMethodOp(function(heads, options) {
- extendSelections(this, clipPosArray(this, heads), options)
- }),
- extendSelectionsBy: docMethodOp(function(f, options) {
- var heads = map(this.sel.ranges, f)
- extendSelections(this, clipPosArray(this, heads), options)
- }),
- setSelections: docMethodOp(function(ranges, primary, options) {
- var this$1 = this;
-
- if (!ranges.length) { return }
- var out = []
- for (var i = 0; i < ranges.length; i++)
- { out[i] = new Range(clipPos(this$1, ranges[i].anchor),
- clipPos(this$1, ranges[i].head)) }
- if (primary == null) { primary = Math.min(ranges.length - 1, this.sel.primIndex) }
- setSelection(this, normalizeSelection(out, primary), options)
- }),
- addSelection: docMethodOp(function(anchor, head, options) {
- var ranges = this.sel.ranges.slice(0)
- ranges.push(new Range(clipPos(this, anchor), clipPos(this, head || anchor)))
- setSelection(this, normalizeSelection(ranges, ranges.length - 1), options)
- }),
-
- getSelection: function(lineSep) {
- var this$1 = this;
-
- var ranges = this.sel.ranges, lines
- for (var i = 0; i < ranges.length; i++) {
- var sel = getBetween(this$1, ranges[i].from(), ranges[i].to())
- lines = lines ? lines.concat(sel) : sel
- }
- if (lineSep === false) { return lines }
- else { return lines.join(lineSep || this.lineSeparator()) }
- },
- getSelections: function(lineSep) {
- var this$1 = this;
-
- var parts = [], ranges = this.sel.ranges
- for (var i = 0; i < ranges.length; i++) {
- var sel = getBetween(this$1, ranges[i].from(), ranges[i].to())
- if (lineSep !== false) { sel = sel.join(lineSep || this$1.lineSeparator()) }
- parts[i] = sel
- }
- return parts
- },
- replaceSelection: function(code, collapse, origin) {
- var dup = []
- for (var i = 0; i < this.sel.ranges.length; i++)
- { dup[i] = code }
- this.replaceSelections(dup, collapse, origin || "+input")
- },
- replaceSelections: docMethodOp(function(code, collapse, origin) {
- var this$1 = this;
-
- var changes = [], sel = this.sel
- for (var i = 0; i < sel.ranges.length; i++) {
- var range$$1 = sel.ranges[i]
- changes[i] = {from: range$$1.from(), to: range$$1.to(), text: this$1.splitLines(code[i]), origin: origin}
- }
- var newSel = collapse && collapse != "end" && computeReplacedSel(this, changes, collapse)
- for (var i$1 = changes.length - 1; i$1 >= 0; i$1--)
- { makeChange(this$1, changes[i$1]) }
- if (newSel) { setSelectionReplaceHistory(this, newSel) }
- else if (this.cm) { ensureCursorVisible(this.cm) }
- }),
- undo: docMethodOp(function() {makeChangeFromHistory(this, "undo")}),
- redo: docMethodOp(function() {makeChangeFromHistory(this, "redo")}),
- undoSelection: docMethodOp(function() {makeChangeFromHistory(this, "undo", true)}),
- redoSelection: docMethodOp(function() {makeChangeFromHistory(this, "redo", true)}),
-
- setExtending: function(val) {this.extend = val},
- getExtending: function() {return this.extend},
-
- historySize: function() {
- var hist = this.history, done = 0, undone = 0
- for (var i = 0; i < hist.done.length; i++) { if (!hist.done[i].ranges) { ++done } }
- for (var i$1 = 0; i$1 < hist.undone.length; i$1++) { if (!hist.undone[i$1].ranges) { ++undone } }
- return {undo: done, redo: undone}
- },
- clearHistory: function() {this.history = new History(this.history.maxGeneration)},
-
- markClean: function() {
- this.cleanGeneration = this.changeGeneration(true)
- },
- changeGeneration: function(forceSplit) {
- if (forceSplit)
- { this.history.lastOp = this.history.lastSelOp = this.history.lastOrigin = null }
- return this.history.generation
- },
- isClean: function (gen) {
- return this.history.generation == (gen || this.cleanGeneration)
- },
-
- getHistory: function() {
- return {done: copyHistoryArray(this.history.done),
- undone: copyHistoryArray(this.history.undone)}
- },
- setHistory: function(histData) {
- var hist = this.history = new History(this.history.maxGeneration)
- hist.done = copyHistoryArray(histData.done.slice(0), null, true)
- hist.undone = copyHistoryArray(histData.undone.slice(0), null, true)
- },
-
- addLineClass: docMethodOp(function(handle, where, cls) {
- return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function (line) {
- var prop = where == "text" ? "textClass"
- : where == "background" ? "bgClass"
- : where == "gutter" ? "gutterClass" : "wrapClass"
- if (!line[prop]) { line[prop] = cls }
- else if (classTest(cls).test(line[prop])) { return false }
- else { line[prop] += " " + cls }
- return true
- })
- }),
- removeLineClass: docMethodOp(function(handle, where, cls) {
- return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function (line) {
- var prop = where == "text" ? "textClass"
- : where == "background" ? "bgClass"
- : where == "gutter" ? "gutterClass" : "wrapClass"
- var cur = line[prop]
- if (!cur) { return false }
- else if (cls == null) { line[prop] = null }
- else {
- var found = cur.match(classTest(cls))
- if (!found) { return false }
- var end = found.index + found[0].length
- line[prop] = cur.slice(0, found.index) + (!found.index || end == cur.length ? "" : " ") + cur.slice(end) || null
- }
- return true
- })
- }),
-
- addLineWidget: docMethodOp(function(handle, node, options) {
- return addLineWidget(this, handle, node, options)
- }),
- removeLineWidget: function(widget) { widget.clear() },
-
- markText: function(from, to, options) {
- return markText(this, clipPos(this, from), clipPos(this, to), options, options && options.type || "range")
- },
- setBookmark: function(pos, options) {
- var realOpts = {replacedWith: options && (options.nodeType == null ? options.widget : options),
- insertLeft: options && options.insertLeft,
- clearWhenEmpty: false, shared: options && options.shared,
- handleMouseEvents: options && options.handleMouseEvents}
- pos = clipPos(this, pos)
- return markText(this, pos, pos, realOpts, "bookmark")
- },
- findMarksAt: function(pos) {
- pos = clipPos(this, pos)
- var markers = [], spans = getLine(this, pos.line).markedSpans
- if (spans) { for (var i = 0; i < spans.length; ++i) {
- var span = spans[i]
- if ((span.from == null || span.from <= pos.ch) &&
- (span.to == null || span.to >= pos.ch))
- { markers.push(span.marker.parent || span.marker) }
- } }
- return markers
- },
- findMarks: function(from, to, filter) {
- from = clipPos(this, from); to = clipPos(this, to)
- var found = [], lineNo$$1 = from.line
- this.iter(from.line, to.line + 1, function (line) {
- var spans = line.markedSpans
- if (spans) { for (var i = 0; i < spans.length; i++) {
- var span = spans[i]
- if (!(span.to != null && lineNo$$1 == from.line && from.ch >= span.to ||
- span.from == null && lineNo$$1 != from.line ||
- span.from != null && lineNo$$1 == to.line && span.from >= to.ch) &&
- (!filter || filter(span.marker)))
- { found.push(span.marker.parent || span.marker) }
- } }
- ++lineNo$$1
- })
- return found
- },
- getAllMarks: function() {
- var markers = []
- this.iter(function (line) {
- var sps = line.markedSpans
- if (sps) { for (var i = 0; i < sps.length; ++i)
- { if (sps[i].from != null) { markers.push(sps[i].marker) } } }
- })
- return markers
- },
-
- posFromIndex: function(off) {
- var ch, lineNo$$1 = this.first, sepSize = this.lineSeparator().length
- this.iter(function (line) {
- var sz = line.text.length + sepSize
- if (sz > off) { ch = off; return true }
- off -= sz
- ++lineNo$$1
- })
- return clipPos(this, Pos(lineNo$$1, ch))
- },
- indexFromPos: function (coords) {
- coords = clipPos(this, coords)
- var index = coords.ch
- if (coords.line < this.first || coords.ch < 0) { return 0 }
- var sepSize = this.lineSeparator().length
- this.iter(this.first, coords.line, function (line) { // iter aborts when callback returns a truthy value
- index += line.text.length + sepSize
- })
- return index
- },
-
- copy: function(copyHistory) {
- var doc = new Doc(getLines(this, this.first, this.first + this.size),
- this.modeOption, this.first, this.lineSep)
- doc.scrollTop = this.scrollTop; doc.scrollLeft = this.scrollLeft
- doc.sel = this.sel
- doc.extend = false
- if (copyHistory) {
- doc.history.undoDepth = this.history.undoDepth
- doc.setHistory(this.getHistory())
- }
- return doc
- },
-
- linkedDoc: function(options) {
- if (!options) { options = {} }
- var from = this.first, to = this.first + this.size
- if (options.from != null && options.from > from) { from = options.from }
- if (options.to != null && options.to < to) { to = options.to }
- var copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from, this.lineSep)
- if (options.sharedHist) { copy.history = this.history
- ; }(this.linked || (this.linked = [])).push({doc: copy, sharedHist: options.sharedHist})
- copy.linked = [{doc: this, isParent: true, sharedHist: options.sharedHist}]
- copySharedMarkers(copy, findSharedMarkers(this))
- return copy
- },
- unlinkDoc: function(other) {
- var this$1 = this;
-
- if (other instanceof CodeMirror$1) { other = other.doc }
- if (this.linked) { for (var i = 0; i < this.linked.length; ++i) {
- var link = this$1.linked[i]
- if (link.doc != other) { continue }
- this$1.linked.splice(i, 1)
- other.unlinkDoc(this$1)
- detachSharedMarkers(findSharedMarkers(this$1))
- break
- } }
- // If the histories were shared, split them again
- if (other.history == this.history) {
- var splitIds = [other.id]
- linkedDocs(other, function (doc) { return splitIds.push(doc.id); }, true)
- other.history = new History(null)
- other.history.done = copyHistoryArray(this.history.done, splitIds)
- other.history.undone = copyHistoryArray(this.history.undone, splitIds)
- }
- },
- iterLinkedDocs: function(f) {linkedDocs(this, f)},
-
- getMode: function() {return this.mode},
- getEditor: function() {return this.cm},
-
- splitLines: function(str) {
- if (this.lineSep) { return str.split(this.lineSep) }
- return splitLinesAuto(str)
- },
- lineSeparator: function() { return this.lineSep || "\n" }
-})
-
-// Public alias.
-Doc.prototype.eachLine = Doc.prototype.iter
-
-// Kludge to work around strange IE behavior where it'll sometimes
-// re-fire a series of drag-related events right after the drop (#1551)
-var lastDrop = 0
-
-function onDrop(e) {
- var cm = this
- clearDragCursor(cm)
- if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e))
- { return }
- e_preventDefault(e)
- if (ie) { lastDrop = +new Date }
- var pos = posFromMouse(cm, e, true), files = e.dataTransfer.files
- if (!pos || cm.isReadOnly()) { return }
- // Might be a file drop, in which case we simply extract the text
- // and insert it.
- if (files && files.length && window.FileReader && window.File) {
- var n = files.length, text = Array(n), read = 0
- var loadFile = function (file, i) {
- if (cm.options.allowDropFileTypes &&
- indexOf(cm.options.allowDropFileTypes, file.type) == -1)
- { return }
-
- var reader = new FileReader
- reader.onload = operation(cm, function () {
- var content = reader.result
- if (/[\x00-\x08\x0e-\x1f]{2}/.test(content)) { content = "" }
- text[i] = content
- if (++read == n) {
- pos = clipPos(cm.doc, pos)
- var change = {from: pos, to: pos,
- text: cm.doc.splitLines(text.join(cm.doc.lineSeparator())),
- origin: "paste"}
- makeChange(cm.doc, change)
- setSelectionReplaceHistory(cm.doc, simpleSelection(pos, changeEnd(change)))
- }
- })
- reader.readAsText(file)
- }
- for (var i = 0; i < n; ++i) { loadFile(files[i], i) }
- } else { // Normal drop
- // Don't do a replace if the drop happened inside of the selected text.
- if (cm.state.draggingText && cm.doc.sel.contains(pos) > -1) {
- cm.state.draggingText(e)
- // Ensure the editor is re-focused
- setTimeout(function () { return cm.display.input.focus(); }, 20)
- return
- }
- try {
- var text$1 = e.dataTransfer.getData("Text")
- if (text$1) {
- var selected
- if (cm.state.draggingText && !cm.state.draggingText.copy)
- { selected = cm.listSelections() }
- setSelectionNoUndo(cm.doc, simpleSelection(pos, pos))
- if (selected) { for (var i$1 = 0; i$1 < selected.length; ++i$1)
- { replaceRange(cm.doc, "", selected[i$1].anchor, selected[i$1].head, "drag") } }
- cm.replaceSelection(text$1, "around", "paste")
- cm.display.input.focus()
- }
- }
- catch(e){}
- }
-}
-
-function onDragStart(cm, e) {
- if (ie && (!cm.state.draggingText || +new Date - lastDrop < 100)) { e_stop(e); return }
- if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) { return }
-
- e.dataTransfer.setData("Text", cm.getSelection())
- e.dataTransfer.effectAllowed = "copyMove"
-
- // Use dummy image instead of default browsers image.
- // Recent Safari (~6.0.2) have a tendency to segfault when this happens, so we don't do it there.
- if (e.dataTransfer.setDragImage && !safari) {
- var img = elt("img", null, null, "position: fixed; left: 0; top: 0;")
- img.src = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="
- if (presto) {
- img.width = img.height = 1
- cm.display.wrapper.appendChild(img)
- // Force a relayout, or Opera won't use our image for some obscure reason
- img._top = img.offsetTop
- }
- e.dataTransfer.setDragImage(img, 0, 0)
- if (presto) { img.parentNode.removeChild(img) }
- }
-}
-
-function onDragOver(cm, e) {
- var pos = posFromMouse(cm, e)
- if (!pos) { return }
- var frag = document.createDocumentFragment()
- drawSelectionCursor(cm, pos, frag)
- if (!cm.display.dragCursor) {
- cm.display.dragCursor = elt("div", null, "CodeMirror-cursors CodeMirror-dragcursors")
- cm.display.lineSpace.insertBefore(cm.display.dragCursor, cm.display.cursorDiv)
- }
- removeChildrenAndAdd(cm.display.dragCursor, frag)
-}
-
-function clearDragCursor(cm) {
- if (cm.display.dragCursor) {
- cm.display.lineSpace.removeChild(cm.display.dragCursor)
- cm.display.dragCursor = null
- }
-}
-
-// These must be handled carefully, because naively registering a
-// handler for each editor will cause the editors to never be
-// garbage collected.
-
-function forEachCodeMirror(f) {
- if (!document.body.getElementsByClassName) { return }
- var byClass = document.body.getElementsByClassName("CodeMirror")
- for (var i = 0; i < byClass.length; i++) {
- var cm = byClass[i].CodeMirror
- if (cm) { f(cm) }
- }
-}
-
-var globalsRegistered = false
-function ensureGlobalHandlers() {
- if (globalsRegistered) { return }
- registerGlobalHandlers()
- globalsRegistered = true
-}
-function registerGlobalHandlers() {
- // When the window resizes, we need to refresh active editors.
- var resizeTimer
- on(window, "resize", function () {
- if (resizeTimer == null) { resizeTimer = setTimeout(function () {
- resizeTimer = null
- forEachCodeMirror(onResize)
- }, 100) }
- })
- // When the window loses focus, we want to show the editor as blurred
- on(window, "blur", function () { return forEachCodeMirror(onBlur); })
-}
-// Called when the window resizes
-function onResize(cm) {
- var d = cm.display
- if (d.lastWrapHeight == d.wrapper.clientHeight && d.lastWrapWidth == d.wrapper.clientWidth)
- { return }
- // Might be a text scaling operation, clear size caches.
- d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null
- d.scrollbarsClipped = false
- cm.setSize()
-}
-
-var keyNames = {
- 3: "Enter", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
- 19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End",
- 36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert",
- 46: "Delete", 59: ";", 61: "=", 91: "Mod", 92: "Mod", 93: "Mod",
- 106: "*", 107: "=", 109: "-", 110: ".", 111: "/", 127: "Delete",
- 173: "-", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
- 221: "]", 222: "'", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete",
- 63273: "Home", 63275: "End", 63276: "PageUp", 63277: "PageDown", 63302: "Insert"
-}
-
-// Number keys
-for (var i = 0; i < 10; i++) { keyNames[i + 48] = keyNames[i + 96] = String(i) }
-// Alphabetic keys
-for (var i$1 = 65; i$1 <= 90; i$1++) { keyNames[i$1] = String.fromCharCode(i$1) }
-// Function keys
-for (var i$2 = 1; i$2 <= 12; i$2++) { keyNames[i$2 + 111] = keyNames[i$2 + 63235] = "F" + i$2 }
-
-var keyMap = {}
-
-keyMap.basic = {
- "Left": "goCharLeft", "Right": "goCharRight", "Up": "goLineUp", "Down": "goLineDown",
- "End": "goLineEnd", "Home": "goLineStartSmart", "PageUp": "goPageUp", "PageDown": "goPageDown",
- "Delete": "delCharAfter", "Backspace": "delCharBefore", "Shift-Backspace": "delCharBefore",
- "Tab": "defaultTab", "Shift-Tab": "indentAuto",
- "Enter": "newlineAndIndent", "Insert": "toggleOverwrite",
- "Esc": "singleSelection"
-}
-// Note that the save and find-related commands aren't defined by
-// default. User code or addons can define them. Unknown commands
-// are simply ignored.
-keyMap.pcDefault = {
- "Ctrl-A": "selectAll", "Ctrl-D": "deleteLine", "Ctrl-Z": "undo", "Shift-Ctrl-Z": "redo", "Ctrl-Y": "redo",
- "Ctrl-Home": "goDocStart", "Ctrl-End": "goDocEnd", "Ctrl-Up": "goLineUp", "Ctrl-Down": "goLineDown",
- "Ctrl-Left": "goGroupLeft", "Ctrl-Right": "goGroupRight", "Alt-Left": "goLineStart", "Alt-Right": "goLineEnd",
- "Ctrl-Backspace": "delGroupBefore", "Ctrl-Delete": "delGroupAfter", "Ctrl-S": "save", "Ctrl-F": "find",
- "Ctrl-G": "findNext", "Shift-Ctrl-G": "findPrev", "Shift-Ctrl-F": "replace", "Shift-Ctrl-R": "replaceAll",
- "Ctrl-[": "indentLess", "Ctrl-]": "indentMore",
- "Ctrl-U": "undoSelection", "Shift-Ctrl-U": "redoSelection", "Alt-U": "redoSelection",
- fallthrough: "basic"
-}
-// Very basic readline/emacs-style bindings, which are standard on Mac.
-keyMap.emacsy = {
- "Ctrl-F": "goCharRight", "Ctrl-B": "goCharLeft", "Ctrl-P": "goLineUp", "Ctrl-N": "goLineDown",
- "Alt-F": "goWordRight", "Alt-B": "goWordLeft", "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd",
- "Ctrl-V": "goPageDown", "Shift-Ctrl-V": "goPageUp", "Ctrl-D": "delCharAfter", "Ctrl-H": "delCharBefore",
- "Alt-D": "delWordAfter", "Alt-Backspace": "delWordBefore", "Ctrl-K": "killLine", "Ctrl-T": "transposeChars",
- "Ctrl-O": "openLine"
-}
-keyMap.macDefault = {
- "Cmd-A": "selectAll", "Cmd-D": "deleteLine", "Cmd-Z": "undo", "Shift-Cmd-Z": "redo", "Cmd-Y": "redo",
- "Cmd-Home": "goDocStart", "Cmd-Up": "goDocStart", "Cmd-End": "goDocEnd", "Cmd-Down": "goDocEnd", "Alt-Left": "goGroupLeft",
- "Alt-Right": "goGroupRight", "Cmd-Left": "goLineLeft", "Cmd-Right": "goLineRight", "Alt-Backspace": "delGroupBefore",
- "Ctrl-Alt-Backspace": "delGroupAfter", "Alt-Delete": "delGroupAfter", "Cmd-S": "save", "Cmd-F": "find",
- "Cmd-G": "findNext", "Shift-Cmd-G": "findPrev", "Cmd-Alt-F": "replace", "Shift-Cmd-Alt-F": "replaceAll",
- "Cmd-[": "indentLess", "Cmd-]": "indentMore", "Cmd-Backspace": "delWrappedLineLeft", "Cmd-Delete": "delWrappedLineRight",
- "Cmd-U": "undoSelection", "Shift-Cmd-U": "redoSelection", "Ctrl-Up": "goDocStart", "Ctrl-Down": "goDocEnd",
- fallthrough: ["basic", "emacsy"]
-}
-keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault
-
-// KEYMAP DISPATCH
-
-function normalizeKeyName(name) {
- var parts = name.split(/-(?!$)/)
- name = parts[parts.length - 1]
- var alt, ctrl, shift, cmd
- for (var i = 0; i < parts.length - 1; i++) {
- var mod = parts[i]
- if (/^(cmd|meta|m)$/i.test(mod)) { cmd = true }
- else if (/^a(lt)?$/i.test(mod)) { alt = true }
- else if (/^(c|ctrl|control)$/i.test(mod)) { ctrl = true }
- else if (/^s(hift)?$/i.test(mod)) { shift = true }
- else { throw new Error("Unrecognized modifier name: " + mod) }
- }
- if (alt) { name = "Alt-" + name }
- if (ctrl) { name = "Ctrl-" + name }
- if (cmd) { name = "Cmd-" + name }
- if (shift) { name = "Shift-" + name }
- return name
-}
-
-// This is a kludge to keep keymaps mostly working as raw objects
-// (backwards compatibility) while at the same time support features
-// like normalization and multi-stroke key bindings. It compiles a
-// new normalized keymap, and then updates the old object to reflect
-// this.
-function normalizeKeyMap(keymap) {
- var copy = {}
- for (var keyname in keymap) { if (keymap.hasOwnProperty(keyname)) {
- var value = keymap[keyname]
- if (/^(name|fallthrough|(de|at)tach)$/.test(keyname)) { continue }
- if (value == "...") { delete keymap[keyname]; continue }
-
- var keys = map(keyname.split(" "), normalizeKeyName)
- for (var i = 0; i < keys.length; i++) {
- var val = void 0, name = void 0
- if (i == keys.length - 1) {
- name = keys.join(" ")
- val = value
- } else {
- name = keys.slice(0, i + 1).join(" ")
- val = "..."
- }
- var prev = copy[name]
- if (!prev) { copy[name] = val }
- else if (prev != val) { throw new Error("Inconsistent bindings for " + name) }
- }
- delete keymap[keyname]
- } }
- for (var prop in copy) { keymap[prop] = copy[prop] }
- return keymap
-}
-
-function lookupKey(key, map$$1, handle, context) {
- map$$1 = getKeyMap(map$$1)
- var found = map$$1.call ? map$$1.call(key, context) : map$$1[key]
- if (found === false) { return "nothing" }
- if (found === "...") { return "multi" }
- if (found != null && handle(found)) { return "handled" }
-
- if (map$$1.fallthrough) {
- if (Object.prototype.toString.call(map$$1.fallthrough) != "[object Array]")
- { return lookupKey(key, map$$1.fallthrough, handle, context) }
- for (var i = 0; i < map$$1.fallthrough.length; i++) {
- var result = lookupKey(key, map$$1.fallthrough[i], handle, context)
- if (result) { return result }
- }
- }
-}
-
-// Modifier key presses don't count as 'real' key presses for the
-// purpose of keymap fallthrough.
-function isModifierKey(value) {
- var name = typeof value == "string" ? value : keyNames[value.keyCode]
- return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod"
-}
-
-// Look up the name of a key as indicated by an event object.
-function keyName(event, noShift) {
- if (presto && event.keyCode == 34 && event["char"]) { return false }
- var base = keyNames[event.keyCode], name = base
- if (name == null || event.altGraphKey) { return false }
- if (event.altKey && base != "Alt") { name = "Alt-" + name }
- if ((flipCtrlCmd ? event.metaKey : event.ctrlKey) && base != "Ctrl") { name = "Ctrl-" + name }
- if ((flipCtrlCmd ? event.ctrlKey : event.metaKey) && base != "Cmd") { name = "Cmd-" + name }
- if (!noShift && event.shiftKey && base != "Shift") { name = "Shift-" + name }
- return name
-}
-
-function getKeyMap(val) {
- return typeof val == "string" ? keyMap[val] : val
-}
-
-// Helper for deleting text near the selection(s), used to implement
-// backspace, delete, and similar functionality.
-function deleteNearSelection(cm, compute) {
- var ranges = cm.doc.sel.ranges, kill = []
- // Build up a set of ranges to kill first, merging overlapping
- // ranges.
- for (var i = 0; i < ranges.length; i++) {
- var toKill = compute(ranges[i])
- while (kill.length && cmp(toKill.from, lst(kill).to) <= 0) {
- var replaced = kill.pop()
- if (cmp(replaced.from, toKill.from) < 0) {
- toKill.from = replaced.from
- break
- }
- }
- kill.push(toKill)
- }
- // Next, remove those actual ranges.
- runInOp(cm, function () {
- for (var i = kill.length - 1; i >= 0; i--)
- { replaceRange(cm.doc, "", kill[i].from, kill[i].to, "+delete") }
- ensureCursorVisible(cm)
- })
-}
-
-// Commands are parameter-less actions that can be performed on an
-// editor, mostly used for keybindings.
-var commands = {
- selectAll: selectAll,
- singleSelection: function (cm) { return cm.setSelection(cm.getCursor("anchor"), cm.getCursor("head"), sel_dontScroll); },
- killLine: function (cm) { return deleteNearSelection(cm, function (range) {
- if (range.empty()) {
- var len = getLine(cm.doc, range.head.line).text.length
- if (range.head.ch == len && range.head.line < cm.lastLine())
- { return {from: range.head, to: Pos(range.head.line + 1, 0)} }
- else
- { return {from: range.head, to: Pos(range.head.line, len)} }
- } else {
- return {from: range.from(), to: range.to()}
- }
- }); },
- deleteLine: function (cm) { return deleteNearSelection(cm, function (range) { return ({
- from: Pos(range.from().line, 0),
- to: clipPos(cm.doc, Pos(range.to().line + 1, 0))
- }); }); },
- delLineLeft: function (cm) { return deleteNearSelection(cm, function (range) { return ({
- from: Pos(range.from().line, 0), to: range.from()
- }); }); },
- delWrappedLineLeft: function (cm) { return deleteNearSelection(cm, function (range) {
- var top = cm.charCoords(range.head, "div").top + 5
- var leftPos = cm.coordsChar({left: 0, top: top}, "div")
- return {from: leftPos, to: range.from()}
- }); },
- delWrappedLineRight: function (cm) { return deleteNearSelection(cm, function (range) {
- var top = cm.charCoords(range.head, "div").top + 5
- var rightPos = cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div")
- return {from: range.from(), to: rightPos }
- }); },
- undo: function (cm) { return cm.undo(); },
- redo: function (cm) { return cm.redo(); },
- undoSelection: function (cm) { return cm.undoSelection(); },
- redoSelection: function (cm) { return cm.redoSelection(); },
- goDocStart: function (cm) { return cm.extendSelection(Pos(cm.firstLine(), 0)); },
- goDocEnd: function (cm) { return cm.extendSelection(Pos(cm.lastLine())); },
- goLineStart: function (cm) { return cm.extendSelectionsBy(function (range) { return lineStart(cm, range.head.line); },
- {origin: "+move", bias: 1}
- ); },
- goLineStartSmart: function (cm) { return cm.extendSelectionsBy(function (range) { return lineStartSmart(cm, range.head); },
- {origin: "+move", bias: 1}
- ); },
- goLineEnd: function (cm) { return cm.extendSelectionsBy(function (range) { return lineEnd(cm, range.head.line); },
- {origin: "+move", bias: -1}
- ); },
- goLineRight: function (cm) { return cm.extendSelectionsBy(function (range) {
- var top = cm.charCoords(range.head, "div").top + 5
- return cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div")
- }, sel_move); },
- goLineLeft: function (cm) { return cm.extendSelectionsBy(function (range) {
- var top = cm.charCoords(range.head, "div").top + 5
- return cm.coordsChar({left: 0, top: top}, "div")
- }, sel_move); },
- goLineLeftSmart: function (cm) { return cm.extendSelectionsBy(function (range) {
- var top = cm.charCoords(range.head, "div").top + 5
- var pos = cm.coordsChar({left: 0, top: top}, "div")
- if (pos.ch < cm.getLine(pos.line).search(/\S/)) { return lineStartSmart(cm, range.head) }
- return pos
- }, sel_move); },
- goLineUp: function (cm) { return cm.moveV(-1, "line"); },
- goLineDown: function (cm) { return cm.moveV(1, "line"); },
- goPageUp: function (cm) { return cm.moveV(-1, "page"); },
- goPageDown: function (cm) { return cm.moveV(1, "page"); },
- goCharLeft: function (cm) { return cm.moveH(-1, "char"); },
- goCharRight: function (cm) { return cm.moveH(1, "char"); },
- goColumnLeft: function (cm) { return cm.moveH(-1, "column"); },
- goColumnRight: function (cm) { return cm.moveH(1, "column"); },
- goWordLeft: function (cm) { return cm.moveH(-1, "word"); },
- goGroupRight: function (cm) { return cm.moveH(1, "group"); },
- goGroupLeft: function (cm) { return cm.moveH(-1, "group"); },
- goWordRight: function (cm) { return cm.moveH(1, "word"); },
- delCharBefore: function (cm) { return cm.deleteH(-1, "char"); },
- delCharAfter: function (cm) { return cm.deleteH(1, "char"); },
- delWordBefore: function (cm) { return cm.deleteH(-1, "word"); },
- delWordAfter: function (cm) { return cm.deleteH(1, "word"); },
- delGroupBefore: function (cm) { return cm.deleteH(-1, "group"); },
- delGroupAfter: function (cm) { return cm.deleteH(1, "group"); },
- indentAuto: function (cm) { return cm.indentSelection("smart"); },
- indentMore: function (cm) { return cm.indentSelection("add"); },
- indentLess: function (cm) { return cm.indentSelection("subtract"); },
- insertTab: function (cm) { return cm.replaceSelection("\t"); },
- insertSoftTab: function (cm) {
- var spaces = [], ranges = cm.listSelections(), tabSize = cm.options.tabSize
- for (var i = 0; i < ranges.length; i++) {
- var pos = ranges[i].from()
- var col = countColumn(cm.getLine(pos.line), pos.ch, tabSize)
- spaces.push(spaceStr(tabSize - col % tabSize))
- }
- cm.replaceSelections(spaces)
- },
- defaultTab: function (cm) {
- if (cm.somethingSelected()) { cm.indentSelection("add") }
- else { cm.execCommand("insertTab") }
- },
- // Swap the two chars left and right of each selection's head.
- // Move cursor behind the two swapped characters afterwards.
- //
- // Doesn't consider line feeds a character.
- // Doesn't scan more than one line above to find a character.
- // Doesn't do anything on an empty line.
- // Doesn't do anything with non-empty selections.
- transposeChars: function (cm) { return runInOp(cm, function () {
- var ranges = cm.listSelections(), newSel = []
- for (var i = 0; i < ranges.length; i++) {
- if (!ranges[i].empty()) { continue }
- var cur = ranges[i].head, line = getLine(cm.doc, cur.line).text
- if (line) {
- if (cur.ch == line.length) { cur = new Pos(cur.line, cur.ch - 1) }
- if (cur.ch > 0) {
- cur = new Pos(cur.line, cur.ch + 1)
- cm.replaceRange(line.charAt(cur.ch - 1) + line.charAt(cur.ch - 2),
- Pos(cur.line, cur.ch - 2), cur, "+transpose")
- } else if (cur.line > cm.doc.first) {
- var prev = getLine(cm.doc, cur.line - 1).text
- if (prev) {
- cur = new Pos(cur.line, 1)
- cm.replaceRange(line.charAt(0) + cm.doc.lineSeparator() +
- prev.charAt(prev.length - 1),
- Pos(cur.line - 1, prev.length - 1), cur, "+transpose")
- }
- }
- }
- newSel.push(new Range(cur, cur))
- }
- cm.setSelections(newSel)
- }); },
- newlineAndIndent: function (cm) { return runInOp(cm, function () {
- var sels = cm.listSelections()
- for (var i = sels.length - 1; i >= 0; i--)
- { cm.replaceRange(cm.doc.lineSeparator(), sels[i].anchor, sels[i].head, "+input") }
- sels = cm.listSelections()
- for (var i$1 = 0; i$1 < sels.length; i$1++)
- { cm.indentLine(sels[i$1].from().line, null, true) }
- ensureCursorVisible(cm)
- }); },
- openLine: function (cm) { return cm.replaceSelection("\n", "start"); },
- toggleOverwrite: function (cm) { return cm.toggleOverwrite(); }
-}
-
-
-function lineStart(cm, lineN) {
- var line = getLine(cm.doc, lineN)
- var visual = visualLine(line)
- if (visual != line) { lineN = lineNo(visual) }
- var order = getOrder(visual)
- var ch = !order ? 0 : order[0].level % 2 ? lineRight(visual) : lineLeft(visual)
- return Pos(lineN, ch)
-}
-function lineEnd(cm, lineN) {
- var merged, line = getLine(cm.doc, lineN)
- while (merged = collapsedSpanAtEnd(line)) {
- line = merged.find(1, true).line
- lineN = null
- }
- var order = getOrder(line)
- var ch = !order ? line.text.length : order[0].level % 2 ? lineLeft(line) : lineRight(line)
- return Pos(lineN == null ? lineNo(line) : lineN, ch)
-}
-function lineStartSmart(cm, pos) {
- var start = lineStart(cm, pos.line)
- var line = getLine(cm.doc, start.line)
- var order = getOrder(line)
- if (!order || order[0].level == 0) {
- var firstNonWS = Math.max(0, line.text.search(/\S/))
- var inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch
- return Pos(start.line, inWS ? 0 : firstNonWS)
- }
- return start
-}
-
-// Run a handler that was bound to a key.
-function doHandleBinding(cm, bound, dropShift) {
- if (typeof bound == "string") {
- bound = commands[bound]
- if (!bound) { return false }
- }
- // Ensure previous input has been read, so that the handler sees a
- // consistent view of the document
- cm.display.input.ensurePolled()
- var prevShift = cm.display.shift, done = false
- try {
- if (cm.isReadOnly()) { cm.state.suppressEdits = true }
- if (dropShift) { cm.display.shift = false }
- done = bound(cm) != Pass
- } finally {
- cm.display.shift = prevShift
- cm.state.suppressEdits = false
- }
- return done
-}
-
-function lookupKeyForEditor(cm, name, handle) {
- for (var i = 0; i < cm.state.keyMaps.length; i++) {
- var result = lookupKey(name, cm.state.keyMaps[i], handle, cm)
- if (result) { return result }
- }
- return (cm.options.extraKeys && lookupKey(name, cm.options.extraKeys, handle, cm))
- || lookupKey(name, cm.options.keyMap, handle, cm)
-}
-
-var stopSeq = new Delayed
-function dispatchKey(cm, name, e, handle) {
- var seq = cm.state.keySeq
- if (seq) {
- if (isModifierKey(name)) { return "handled" }
- stopSeq.set(50, function () {
- if (cm.state.keySeq == seq) {
- cm.state.keySeq = null
- cm.display.input.reset()
- }
- })
- name = seq + " " + name
- }
- var result = lookupKeyForEditor(cm, name, handle)
-
- if (result == "multi")
- { cm.state.keySeq = name }
- if (result == "handled")
- { signalLater(cm, "keyHandled", cm, name, e) }
-
- if (result == "handled" || result == "multi") {
- e_preventDefault(e)
- restartBlink(cm)
- }
-
- if (seq && !result && /\'$/.test(name)) {
- e_preventDefault(e)
- return true
- }
- return !!result
-}
-
-// Handle a key from the keydown event.
-function handleKeyBinding(cm, e) {
- var name = keyName(e, true)
- if (!name) { return false }
-
- if (e.shiftKey && !cm.state.keySeq) {
- // First try to resolve full name (including 'Shift-'). Failing
- // that, see if there is a cursor-motion command (starting with
- // 'go') bound to the keyname without 'Shift-'.
- return dispatchKey(cm, "Shift-" + name, e, function (b) { return doHandleBinding(cm, b, true); })
- || dispatchKey(cm, name, e, function (b) {
- if (typeof b == "string" ? /^go[A-Z]/.test(b) : b.motion)
- { return doHandleBinding(cm, b) }
- })
- } else {
- return dispatchKey(cm, name, e, function (b) { return doHandleBinding(cm, b); })
- }
-}
-
-// Handle a key from the keypress event
-function handleCharBinding(cm, e, ch) {
- return dispatchKey(cm, "'" + ch + "'", e, function (b) { return doHandleBinding(cm, b, true); })
-}
-
-var lastStoppedKey = null
-function onKeyDown(e) {
- var cm = this
- cm.curOp.focus = activeElt()
- if (signalDOMEvent(cm, e)) { return }
- // IE does strange things with escape.
- if (ie && ie_version < 11 && e.keyCode == 27) { e.returnValue = false }
- var code = e.keyCode
- cm.display.shift = code == 16 || e.shiftKey
- var handled = handleKeyBinding(cm, e)
- if (presto) {
- lastStoppedKey = handled ? code : null
- // Opera has no cut event... we try to at least catch the key combo
- if (!handled && code == 88 && !hasCopyEvent && (mac ? e.metaKey : e.ctrlKey))
- { cm.replaceSelection("", null, "cut") }
- }
-
- // Turn mouse into crosshair when Alt is held on Mac.
- if (code == 18 && !/\bCodeMirror-crosshair\b/.test(cm.display.lineDiv.className))
- { showCrossHair(cm) }
-}
-
-function showCrossHair(cm) {
- var lineDiv = cm.display.lineDiv
- addClass(lineDiv, "CodeMirror-crosshair")
-
- function up(e) {
- if (e.keyCode == 18 || !e.altKey) {
- rmClass(lineDiv, "CodeMirror-crosshair")
- off(document, "keyup", up)
- off(document, "mouseover", up)
- }
- }
- on(document, "keyup", up)
- on(document, "mouseover", up)
-}
-
-function onKeyUp(e) {
- if (e.keyCode == 16) { this.doc.sel.shift = false }
- signalDOMEvent(this, e)
-}
-
-function onKeyPress(e) {
- var cm = this
- if (eventInWidget(cm.display, e) || signalDOMEvent(cm, e) || e.ctrlKey && !e.altKey || mac && e.metaKey) { return }
- var keyCode = e.keyCode, charCode = e.charCode
- if (presto && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return}
- if ((presto && (!e.which || e.which < 10)) && handleKeyBinding(cm, e)) { return }
- var ch = String.fromCharCode(charCode == null ? keyCode : charCode)
- // Some browsers fire keypress events for backspace
- if (ch == "\x08") { return }
- if (handleCharBinding(cm, e, ch)) { return }
- cm.display.input.onKeyPress(e)
-}
-
-// A mouse down can be a single click, double click, triple click,
-// start of selection drag, start of text drag, new cursor
-// (ctrl-click), rectangle drag (alt-drag), or xwin
-// middle-click-paste. Or it might be a click on something we should
-// not interfere with, such as a scrollbar or widget.
-function onMouseDown(e) {
- var cm = this, display = cm.display
- if (signalDOMEvent(cm, e) || display.activeTouch && display.input.supportsTouch()) { return }
- display.shift = e.shiftKey
-
- if (eventInWidget(display, e)) {
- if (!webkit) {
- // Briefly turn off draggability, to allow widgets to do
- // normal dragging things.
- display.scroller.draggable = false
- setTimeout(function () { return display.scroller.draggable = true; }, 100)
- }
- return
- }
- if (clickInGutter(cm, e)) { return }
- var start = posFromMouse(cm, e)
- window.focus()
-
- switch (e_button(e)) {
- case 1:
- // #3261: make sure, that we're not starting a second selection
- if (cm.state.selectingText)
- { cm.state.selectingText(e) }
- else if (start)
- { leftButtonDown(cm, e, start) }
- else if (e_target(e) == display.scroller)
- { e_preventDefault(e) }
- break
- case 2:
- if (webkit) { cm.state.lastMiddleDown = +new Date }
- if (start) { extendSelection(cm.doc, start) }
- setTimeout(function () { return display.input.focus(); }, 20)
- e_preventDefault(e)
- break
- case 3:
- if (captureRightClick) { onContextMenu(cm, e) }
- else { delayBlurEvent(cm) }
- break
- }
-}
-
-var lastClick;
-var lastDoubleClick
-function leftButtonDown(cm, e, start) {
- if (ie) { setTimeout(bind(ensureFocus, cm), 0) }
- else { cm.curOp.focus = activeElt() }
-
- var now = +new Date, type
- if (lastDoubleClick && lastDoubleClick.time > now - 400 && cmp(lastDoubleClick.pos, start) == 0) {
- type = "triple"
- } else if (lastClick && lastClick.time > now - 400 && cmp(lastClick.pos, start) == 0) {
- type = "double"
- lastDoubleClick = {time: now, pos: start}
- } else {
- type = "single"
- lastClick = {time: now, pos: start}
- }
-
- var sel = cm.doc.sel, modifier = mac ? e.metaKey : e.ctrlKey, contained
- if (cm.options.dragDrop && dragAndDrop && !cm.isReadOnly() &&
- type == "single" && (contained = sel.contains(start)) > -1 &&
- (cmp((contained = sel.ranges[contained]).from(), start) < 0 || start.xRel > 0) &&
- (cmp(contained.to(), start) > 0 || start.xRel < 0))
- { leftButtonStartDrag(cm, e, start, modifier) }
- else
- { leftButtonSelect(cm, e, start, type, modifier) }
-}
-
-// Start a text drag. When it ends, see if any dragging actually
-// happen, and treat as a click if it didn't.
-function leftButtonStartDrag(cm, e, start, modifier) {
- var display = cm.display, startTime = +new Date
- var dragEnd = operation(cm, function (e2) {
- if (webkit) { display.scroller.draggable = false }
- cm.state.draggingText = false
- off(document, "mouseup", dragEnd)
- off(display.scroller, "drop", dragEnd)
- if (Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) < 10) {
- e_preventDefault(e2)
- if (!modifier && +new Date - 200 < startTime)
- { extendSelection(cm.doc, start) }
- // Work around unexplainable focus problem in IE9 (#2127) and Chrome (#3081)
- if (webkit || ie && ie_version == 9)
- { setTimeout(function () {document.body.focus(); display.input.focus()}, 20) }
- else
- { display.input.focus() }
- }
- })
- // Let the drag handler handle this.
- if (webkit) { display.scroller.draggable = true }
- cm.state.draggingText = dragEnd
- dragEnd.copy = mac ? e.altKey : e.ctrlKey
- // IE's approach to draggable
- if (display.scroller.dragDrop) { display.scroller.dragDrop() }
- on(document, "mouseup", dragEnd)
- on(display.scroller, "drop", dragEnd)
-}
-
-// Normal selection, as opposed to text dragging.
-function leftButtonSelect(cm, e, start, type, addNew) {
- var display = cm.display, doc = cm.doc
- e_preventDefault(e)
-
- var ourRange, ourIndex, startSel = doc.sel, ranges = startSel.ranges
- if (addNew && !e.shiftKey) {
- ourIndex = doc.sel.contains(start)
- if (ourIndex > -1)
- { ourRange = ranges[ourIndex] }
- else
- { ourRange = new Range(start, start) }
- } else {
- ourRange = doc.sel.primary()
- ourIndex = doc.sel.primIndex
- }
-
- if (chromeOS ? e.shiftKey && e.metaKey : e.altKey) {
- type = "rect"
- if (!addNew) { ourRange = new Range(start, start) }
- start = posFromMouse(cm, e, true, true)
- ourIndex = -1
- } else if (type == "double") {
- var word = cm.findWordAt(start)
- if (cm.display.shift || doc.extend)
- { ourRange = extendRange(doc, ourRange, word.anchor, word.head) }
- else
- { ourRange = word }
- } else if (type == "triple") {
- var line = new Range(Pos(start.line, 0), clipPos(doc, Pos(start.line + 1, 0)))
- if (cm.display.shift || doc.extend)
- { ourRange = extendRange(doc, ourRange, line.anchor, line.head) }
- else
- { ourRange = line }
- } else {
- ourRange = extendRange(doc, ourRange, start)
- }
-
- if (!addNew) {
- ourIndex = 0
- setSelection(doc, new Selection([ourRange], 0), sel_mouse)
- startSel = doc.sel
- } else if (ourIndex == -1) {
- ourIndex = ranges.length
- setSelection(doc, normalizeSelection(ranges.concat([ourRange]), ourIndex),
- {scroll: false, origin: "*mouse"})
- } else if (ranges.length > 1 && ranges[ourIndex].empty() && type == "single" && !e.shiftKey) {
- setSelection(doc, normalizeSelection(ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0),
- {scroll: false, origin: "*mouse"})
- startSel = doc.sel
- } else {
- replaceOneSelection(doc, ourIndex, ourRange, sel_mouse)
- }
-
- var lastPos = start
- function extendTo(pos) {
- if (cmp(lastPos, pos) == 0) { return }
- lastPos = pos
-
- if (type == "rect") {
- var ranges = [], tabSize = cm.options.tabSize
- var startCol = countColumn(getLine(doc, start.line).text, start.ch, tabSize)
- var posCol = countColumn(getLine(doc, pos.line).text, pos.ch, tabSize)
- var left = Math.min(startCol, posCol), right = Math.max(startCol, posCol)
- for (var line = Math.min(start.line, pos.line), end = Math.min(cm.lastLine(), Math.max(start.line, pos.line));
- line <= end; line++) {
- var text = getLine(doc, line).text, leftPos = findColumn(text, left, tabSize)
- if (left == right)
- { ranges.push(new Range(Pos(line, leftPos), Pos(line, leftPos))) }
- else if (text.length > leftPos)
- { ranges.push(new Range(Pos(line, leftPos), Pos(line, findColumn(text, right, tabSize)))) }
- }
- if (!ranges.length) { ranges.push(new Range(start, start)) }
- setSelection(doc, normalizeSelection(startSel.ranges.slice(0, ourIndex).concat(ranges), ourIndex),
- {origin: "*mouse", scroll: false})
- cm.scrollIntoView(pos)
- } else {
- var oldRange = ourRange
- var anchor = oldRange.anchor, head = pos
- if (type != "single") {
- var range$$1
- if (type == "double")
- { range$$1 = cm.findWordAt(pos) }
- else
- { range$$1 = new Range(Pos(pos.line, 0), clipPos(doc, Pos(pos.line + 1, 0))) }
- if (cmp(range$$1.anchor, anchor) > 0) {
- head = range$$1.head
- anchor = minPos(oldRange.from(), range$$1.anchor)
- } else {
- head = range$$1.anchor
- anchor = maxPos(oldRange.to(), range$$1.head)
- }
- }
- var ranges$1 = startSel.ranges.slice(0)
- ranges$1[ourIndex] = new Range(clipPos(doc, anchor), head)
- setSelection(doc, normalizeSelection(ranges$1, ourIndex), sel_mouse)
- }
- }
-
- var editorSize = display.wrapper.getBoundingClientRect()
- // Used to ensure timeout re-tries don't fire when another extend
- // happened in the meantime (clearTimeout isn't reliable -- at
- // least on Chrome, the timeouts still happen even when cleared,
- // if the clear happens after their scheduled firing time).
- var counter = 0
-
- function extend(e) {
- var curCount = ++counter
- var cur = posFromMouse(cm, e, true, type == "rect")
- if (!cur) { return }
- if (cmp(cur, lastPos) != 0) {
- cm.curOp.focus = activeElt()
- extendTo(cur)
- var visible = visibleLines(display, doc)
- if (cur.line >= visible.to || cur.line < visible.from)
- { setTimeout(operation(cm, function () {if (counter == curCount) { extend(e) }}), 150) }
- } else {
- var outside = e.clientY < editorSize.top ? -20 : e.clientY > editorSize.bottom ? 20 : 0
- if (outside) { setTimeout(operation(cm, function () {
- if (counter != curCount) { return }
- display.scroller.scrollTop += outside
- extend(e)
- }), 50) }
- }
- }
-
- function done(e) {
- cm.state.selectingText = false
- counter = Infinity
- e_preventDefault(e)
- display.input.focus()
- off(document, "mousemove", move)
- off(document, "mouseup", up)
- doc.history.lastSelOrigin = null
- }
-
- var move = operation(cm, function (e) {
- if (!e_button(e)) { done(e) }
- else { extend(e) }
- })
- var up = operation(cm, done)
- cm.state.selectingText = up
- on(document, "mousemove", move)
- on(document, "mouseup", up)
-}
-
-
-// Determines whether an event happened in the gutter, and fires the
-// handlers for the corresponding event.
-function gutterEvent(cm, e, type, prevent) {
- var mX, mY
- try { mX = e.clientX; mY = e.clientY }
- catch(e) { return false }
- if (mX >= Math.floor(cm.display.gutters.getBoundingClientRect().right)) { return false }
- if (prevent) { e_preventDefault(e) }
-
- var display = cm.display
- var lineBox = display.lineDiv.getBoundingClientRect()
-
- if (mY > lineBox.bottom || !hasHandler(cm, type)) { return e_defaultPrevented(e) }
- mY -= lineBox.top - display.viewOffset
-
- for (var i = 0; i < cm.options.gutters.length; ++i) {
- var g = display.gutters.childNodes[i]
- if (g && g.getBoundingClientRect().right >= mX) {
- var line = lineAtHeight(cm.doc, mY)
- var gutter = cm.options.gutters[i]
- signal(cm, type, cm, line, gutter, e)
- return e_defaultPrevented(e)
- }
- }
-}
-
-function clickInGutter(cm, e) {
- return gutterEvent(cm, e, "gutterClick", true)
-}
-
-// CONTEXT MENU HANDLING
-
-// To make the context menu work, we need to briefly unhide the
-// textarea (making it as unobtrusive as possible) to let the
-// right-click take effect on it.
-function onContextMenu(cm, e) {
- if (eventInWidget(cm.display, e) || contextMenuInGutter(cm, e)) { return }
- if (signalDOMEvent(cm, e, "contextmenu")) { return }
- cm.display.input.onContextMenu(e)
-}
-
-function contextMenuInGutter(cm, e) {
- if (!hasHandler(cm, "gutterContextMenu")) { return false }
- return gutterEvent(cm, e, "gutterContextMenu", false)
-}
-
-function themeChanged(cm) {
- cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-s-\S+/g, "") +
- cm.options.theme.replace(/(^|\s)\s*/g, " cm-s-")
- clearCaches(cm)
-}
-
-var Init = {toString: function(){return "CodeMirror.Init"}}
-
-var defaults = {}
-var optionHandlers = {}
-
-function defineOptions(CodeMirror) {
- var optionHandlers = CodeMirror.optionHandlers
-
- function option(name, deflt, handle, notOnInit) {
- CodeMirror.defaults[name] = deflt
- if (handle) { optionHandlers[name] =
- notOnInit ? function (cm, val, old) {if (old != Init) { handle(cm, val, old) }} : handle }
- }
-
- CodeMirror.defineOption = option
-
- // Passed to option handlers when there is no old value.
- CodeMirror.Init = Init
-
- // These two are, on init, called from the constructor because they
- // have to be initialized before the editor can start at all.
- option("value", "", function (cm, val) { return cm.setValue(val); }, true)
- option("mode", null, function (cm, val) {
- cm.doc.modeOption = val
- loadMode(cm)
- }, true)
-
- option("indentUnit", 2, loadMode, true)
- option("indentWithTabs", false)
- option("smartIndent", true)
- option("tabSize", 4, function (cm) {
- resetModeState(cm)
- clearCaches(cm)
- regChange(cm)
- }, true)
- option("lineSeparator", null, function (cm, val) {
- cm.doc.lineSep = val
- if (!val) { return }
- var newBreaks = [], lineNo = cm.doc.first
- cm.doc.iter(function (line) {
- for (var pos = 0;;) {
- var found = line.text.indexOf(val, pos)
- if (found == -1) { break }
- pos = found + val.length
- newBreaks.push(Pos(lineNo, found))
- }
- lineNo++
- })
- for (var i = newBreaks.length - 1; i >= 0; i--)
- { replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length)) }
- })
- option("specialChars", /[\u0000-\u001f\u007f\u00ad\u200b-\u200f\u2028\u2029\ufeff]/g, function (cm, val, old) {
- cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g")
- if (old != Init) { cm.refresh() }
- })
- option("specialCharPlaceholder", defaultSpecialCharPlaceholder, function (cm) { return cm.refresh(); }, true)
- option("electricChars", true)
- option("inputStyle", mobile ? "contenteditable" : "textarea", function () {
- throw new Error("inputStyle can not (yet) be changed in a running editor") // FIXME
- }, true)
- option("spellcheck", false, function (cm, val) { return cm.getInputField().spellcheck = val; }, true)
- option("rtlMoveVisually", !windows)
- option("wholeLineUpdateBefore", true)
-
- option("theme", "default", function (cm) {
- themeChanged(cm)
- guttersChanged(cm)
- }, true)
- option("keyMap", "default", function (cm, val, old) {
- var next = getKeyMap(val)
- var prev = old != Init && getKeyMap(old)
- if (prev && prev.detach) { prev.detach(cm, next) }
- if (next.attach) { next.attach(cm, prev || null) }
- })
- option("extraKeys", null)
-
- option("lineWrapping", false, wrappingChanged, true)
- option("gutters", [], function (cm) {
- setGuttersForLineNumbers(cm.options)
- guttersChanged(cm)
- }, true)
- option("fixedGutter", true, function (cm, val) {
- cm.display.gutters.style.left = val ? compensateForHScroll(cm.display) + "px" : "0"
- cm.refresh()
- }, true)
- option("coverGutterNextToScrollbar", false, function (cm) { return updateScrollbars(cm); }, true)
- option("scrollbarStyle", "native", function (cm) {
- initScrollbars(cm)
- updateScrollbars(cm)
- cm.display.scrollbars.setScrollTop(cm.doc.scrollTop)
- cm.display.scrollbars.setScrollLeft(cm.doc.scrollLeft)
- }, true)
- option("lineNumbers", false, function (cm) {
- setGuttersForLineNumbers(cm.options)
- guttersChanged(cm)
- }, true)
- option("firstLineNumber", 1, guttersChanged, true)
- option("lineNumberFormatter", function (integer) { return integer; }, guttersChanged, true)
- option("showCursorWhenSelecting", false, updateSelection, true)
-
- option("resetSelectionOnContextMenu", true)
- option("lineWiseCopyCut", true)
-
- option("readOnly", false, function (cm, val) {
- if (val == "nocursor") {
- onBlur(cm)
- cm.display.input.blur()
- cm.display.disabled = true
- } else {
- cm.display.disabled = false
- }
- cm.display.input.readOnlyChanged(val)
- })
- option("disableInput", false, function (cm, val) {if (!val) { cm.display.input.reset() }}, true)
- option("dragDrop", true, dragDropChanged)
- option("allowDropFileTypes", null)
-
- option("cursorBlinkRate", 530)
- option("cursorScrollMargin", 0)
- option("cursorHeight", 1, updateSelection, true)
- option("singleCursorHeightPerLine", true, updateSelection, true)
- option("workTime", 100)
- option("workDelay", 100)
- option("flattenSpans", true, resetModeState, true)
- option("addModeClass", false, resetModeState, true)
- option("pollInterval", 100)
- option("undoDepth", 200, function (cm, val) { return cm.doc.history.undoDepth = val; })
- option("historyEventDelay", 1250)
- option("viewportMargin", 10, function (cm) { return cm.refresh(); }, true)
- option("maxHighlightLength", 10000, resetModeState, true)
- option("moveInputWithCursor", true, function (cm, val) {
- if (!val) { cm.display.input.resetPosition() }
- })
-
- option("tabindex", null, function (cm, val) { return cm.display.input.getField().tabIndex = val || ""; })
- option("autofocus", null)
-}
-
-function guttersChanged(cm) {
- updateGutters(cm)
- regChange(cm)
- setTimeout(function () { return alignHorizontally(cm); }, 20)
-}
-
-function dragDropChanged(cm, value, old) {
- var wasOn = old && old != Init
- if (!value != !wasOn) {
- var funcs = cm.display.dragFunctions
- var toggle = value ? on : off
- toggle(cm.display.scroller, "dragstart", funcs.start)
- toggle(cm.display.scroller, "dragenter", funcs.enter)
- toggle(cm.display.scroller, "dragover", funcs.over)
- toggle(cm.display.scroller, "dragleave", funcs.leave)
- toggle(cm.display.scroller, "drop", funcs.drop)
- }
-}
-
-function wrappingChanged(cm) {
- if (cm.options.lineWrapping) {
- addClass(cm.display.wrapper, "CodeMirror-wrap")
- cm.display.sizer.style.minWidth = ""
- cm.display.sizerWidth = null
- } else {
- rmClass(cm.display.wrapper, "CodeMirror-wrap")
- findMaxLine(cm)
- }
- estimateLineHeights(cm)
- regChange(cm)
- clearCaches(cm)
- setTimeout(function () { return updateScrollbars(cm); }, 100)
-}
-
-// A CodeMirror instance represents an editor. This is the object
-// that user code is usually dealing with.
-
-function CodeMirror$1(place, options) {
- var this$1 = this;
-
- if (!(this instanceof CodeMirror$1)) { return new CodeMirror$1(place, options) }
-
- this.options = options = options ? copyObj(options) : {}
- // Determine effective options based on given values and defaults.
- copyObj(defaults, options, false)
- setGuttersForLineNumbers(options)
-
- var doc = options.value
- if (typeof doc == "string") { doc = new Doc(doc, options.mode, null, options.lineSeparator) }
- this.doc = doc
-
- var input = new CodeMirror$1.inputStyles[options.inputStyle](this)
- var display = this.display = new Display(place, doc, input)
- display.wrapper.CodeMirror = this
- updateGutters(this)
- themeChanged(this)
- if (options.lineWrapping)
- { this.display.wrapper.className += " CodeMirror-wrap" }
- if (options.autofocus && !mobile) { display.input.focus() }
- initScrollbars(this)
-
- this.state = {
- keyMaps: [], // stores maps added by addKeyMap
- overlays: [], // highlighting overlays, as added by addOverlay
- modeGen: 0, // bumped when mode/overlay changes, used to invalidate highlighting info
- overwrite: false,
- delayingBlurEvent: false,
- focused: false,
- suppressEdits: false, // used to disable editing during key handlers when in readOnly mode
- pasteIncoming: false, cutIncoming: false, // help recognize paste/cut edits in input.poll
- selectingText: false,
- draggingText: false,
- highlight: new Delayed(), // stores highlight worker timeout
- keySeq: null, // Unfinished key sequence
- specialChars: null
- }
-
- // Override magic textarea content restore that IE sometimes does
- // on our hidden textarea on reload
- if (ie && ie_version < 11) { setTimeout(function () { return this$1.display.input.reset(true); }, 20) }
-
- registerEventHandlers(this)
- ensureGlobalHandlers()
-
- startOperation(this)
- this.curOp.forceUpdate = true
- attachDoc(this, doc)
-
- if ((options.autofocus && !mobile) || this.hasFocus())
- { setTimeout(bind(onFocus, this), 20) }
- else
- { onBlur(this) }
-
- for (var opt in optionHandlers) { if (optionHandlers.hasOwnProperty(opt))
- { optionHandlers[opt](this$1, options[opt], Init) } }
- maybeUpdateLineNumberWidth(this)
- if (options.finishInit) { options.finishInit(this) }
- for (var i = 0; i < initHooks.length; ++i) { initHooks[i](this$1) }
- endOperation(this)
- // Suppress optimizelegibility in Webkit, since it breaks text
- // measuring on line wrapping boundaries.
- if (webkit && options.lineWrapping &&
- getComputedStyle(display.lineDiv).textRendering == "optimizelegibility")
- { display.lineDiv.style.textRendering = "auto" }
-}
-
-// The default configuration options.
-CodeMirror$1.defaults = defaults
-// Functions to run when options are changed.
-CodeMirror$1.optionHandlers = optionHandlers
-
-// Attach the necessary event handlers when initializing the editor
-function registerEventHandlers(cm) {
- var d = cm.display
- on(d.scroller, "mousedown", operation(cm, onMouseDown))
- // Older IE's will not fire a second mousedown for a double click
- if (ie && ie_version < 11)
- { on(d.scroller, "dblclick", operation(cm, function (e) {
- if (signalDOMEvent(cm, e)) { return }
- var pos = posFromMouse(cm, e)
- if (!pos || clickInGutter(cm, e) || eventInWidget(cm.display, e)) { return }
- e_preventDefault(e)
- var word = cm.findWordAt(pos)
- extendSelection(cm.doc, word.anchor, word.head)
- })) }
- else
- { on(d.scroller, "dblclick", function (e) { return signalDOMEvent(cm, e) || e_preventDefault(e); }) }
- // Some browsers fire contextmenu *after* opening the menu, at
- // which point we can't mess with it anymore. Context menu is
- // handled in onMouseDown for these browsers.
- if (!captureRightClick) { on(d.scroller, "contextmenu", function (e) { return onContextMenu(cm, e); }) }
-
- // Used to suppress mouse event handling when a touch happens
- var touchFinished, prevTouch = {end: 0}
- function finishTouch() {
- if (d.activeTouch) {
- touchFinished = setTimeout(function () { return d.activeTouch = null; }, 1000)
- prevTouch = d.activeTouch
- prevTouch.end = +new Date
- }
- }
- function isMouseLikeTouchEvent(e) {
- if (e.touches.length != 1) { return false }
- var touch = e.touches[0]
- return touch.radiusX <= 1 && touch.radiusY <= 1
- }
- function farAway(touch, other) {
- if (other.left == null) { return true }
- var dx = other.left - touch.left, dy = other.top - touch.top
- return dx * dx + dy * dy > 20 * 20
- }
- on(d.scroller, "touchstart", function (e) {
- if (!signalDOMEvent(cm, e) && !isMouseLikeTouchEvent(e)) {
- clearTimeout(touchFinished)
- var now = +new Date
- d.activeTouch = {start: now, moved: false,
- prev: now - prevTouch.end <= 300 ? prevTouch : null}
- if (e.touches.length == 1) {
- d.activeTouch.left = e.touches[0].pageX
- d.activeTouch.top = e.touches[0].pageY
- }
- }
- })
- on(d.scroller, "touchmove", function () {
- if (d.activeTouch) { d.activeTouch.moved = true }
- })
- on(d.scroller, "touchend", function (e) {
- var touch = d.activeTouch
- if (touch && !eventInWidget(d, e) && touch.left != null &&
- !touch.moved && new Date - touch.start < 300) {
- var pos = cm.coordsChar(d.activeTouch, "page"), range
- if (!touch.prev || farAway(touch, touch.prev)) // Single tap
- { range = new Range(pos, pos) }
- else if (!touch.prev.prev || farAway(touch, touch.prev.prev)) // Double tap
- { range = cm.findWordAt(pos) }
- else // Triple tap
- { range = new Range(Pos(pos.line, 0), clipPos(cm.doc, Pos(pos.line + 1, 0))) }
- cm.setSelection(range.anchor, range.head)
- cm.focus()
- e_preventDefault(e)
- }
- finishTouch()
- })
- on(d.scroller, "touchcancel", finishTouch)
-
- // Sync scrolling between fake scrollbars and real scrollable
- // area, ensure viewport is updated when scrolling.
- on(d.scroller, "scroll", function () {
- if (d.scroller.clientHeight) {
- setScrollTop(cm, d.scroller.scrollTop)
- setScrollLeft(cm, d.scroller.scrollLeft, true)
- signal(cm, "scroll", cm)
- }
- })
-
- // Listen to wheel events in order to try and update the viewport on time.
- on(d.scroller, "mousewheel", function (e) { return onScrollWheel(cm, e); })
- on(d.scroller, "DOMMouseScroll", function (e) { return onScrollWheel(cm, e); })
-
- // Prevent wrapper from ever scrolling
- on(d.wrapper, "scroll", function () { return d.wrapper.scrollTop = d.wrapper.scrollLeft = 0; })
-
- d.dragFunctions = {
- enter: function (e) {if (!signalDOMEvent(cm, e)) { e_stop(e) }},
- over: function (e) {if (!signalDOMEvent(cm, e)) { onDragOver(cm, e); e_stop(e) }},
- start: function (e) { return onDragStart(cm, e); },
- drop: operation(cm, onDrop),
- leave: function (e) {if (!signalDOMEvent(cm, e)) { clearDragCursor(cm) }}
- }
-
- var inp = d.input.getField()
- on(inp, "keyup", function (e) { return onKeyUp.call(cm, e); })
- on(inp, "keydown", operation(cm, onKeyDown))
- on(inp, "keypress", operation(cm, onKeyPress))
- on(inp, "focus", function (e) { return onFocus(cm, e); })
- on(inp, "blur", function (e) { return onBlur(cm, e); })
-}
-
-var initHooks = []
-CodeMirror$1.defineInitHook = function (f) { return initHooks.push(f); }
-
-// Indent the given line. The how parameter can be "smart",
-// "add"/null, "subtract", or "prev". When aggressive is false
-// (typically set to true for forced single-line indents), empty
-// lines are not indented, and places where the mode returns Pass
-// are left alone.
-function indentLine(cm, n, how, aggressive) {
- var doc = cm.doc, state
- if (how == null) { how = "add" }
- if (how == "smart") {
- // Fall back to "prev" when the mode doesn't have an indentation
- // method.
- if (!doc.mode.indent) { how = "prev" }
- else { state = getStateBefore(cm, n) }
- }
-
- var tabSize = cm.options.tabSize
- var line = getLine(doc, n), curSpace = countColumn(line.text, null, tabSize)
- if (line.stateAfter) { line.stateAfter = null }
- var curSpaceString = line.text.match(/^\s*/)[0], indentation
- if (!aggressive && !/\S/.test(line.text)) {
- indentation = 0
- how = "not"
- } else if (how == "smart") {
- indentation = doc.mode.indent(state, line.text.slice(curSpaceString.length), line.text)
- if (indentation == Pass || indentation > 150) {
- if (!aggressive) { return }
- how = "prev"
- }
- }
- if (how == "prev") {
- if (n > doc.first) { indentation = countColumn(getLine(doc, n-1).text, null, tabSize) }
- else { indentation = 0 }
- } else if (how == "add") {
- indentation = curSpace + cm.options.indentUnit
- } else if (how == "subtract") {
- indentation = curSpace - cm.options.indentUnit
- } else if (typeof how == "number") {
- indentation = curSpace + how
- }
- indentation = Math.max(0, indentation)
-
- var indentString = "", pos = 0
- if (cm.options.indentWithTabs)
- { for (var i = Math.floor(indentation / tabSize); i; --i) {pos += tabSize; indentString += "\t"} }
- if (pos < indentation) { indentString += spaceStr(indentation - pos) }
-
- if (indentString != curSpaceString) {
- replaceRange(doc, indentString, Pos(n, 0), Pos(n, curSpaceString.length), "+input")
- line.stateAfter = null
- return true
- } else {
- // Ensure that, if the cursor was in the whitespace at the start
- // of the line, it is moved to the end of that space.
- for (var i$1 = 0; i$1 < doc.sel.ranges.length; i$1++) {
- var range = doc.sel.ranges[i$1]
- if (range.head.line == n && range.head.ch < curSpaceString.length) {
- var pos$1 = Pos(n, curSpaceString.length)
- replaceOneSelection(doc, i$1, new Range(pos$1, pos$1))
- break
- }
- }
- }
-}
-
-// This will be set to a {lineWise: bool, text: [string]} object, so
-// that, when pasting, we know what kind of selections the copied
-// text was made out of.
-var lastCopied = null
-
-function setLastCopied(newLastCopied) {
- lastCopied = newLastCopied
-}
-
-function applyTextInput(cm, inserted, deleted, sel, origin) {
- var doc = cm.doc
- cm.display.shift = false
- if (!sel) { sel = doc.sel }
-
- var paste = cm.state.pasteIncoming || origin == "paste"
- var textLines = splitLinesAuto(inserted), multiPaste = null
- // When pasing N lines into N selections, insert one line per selection
- if (paste && sel.ranges.length > 1) {
- if (lastCopied && lastCopied.text.join("\n") == inserted) {
- if (sel.ranges.length % lastCopied.text.length == 0) {
- multiPaste = []
- for (var i = 0; i < lastCopied.text.length; i++)
- { multiPaste.push(doc.splitLines(lastCopied.text[i])) }
- }
- } else if (textLines.length == sel.ranges.length) {
- multiPaste = map(textLines, function (l) { return [l]; })
- }
- }
-
- var updateInput
- // Normal behavior is to insert the new text into every selection
- for (var i$1 = sel.ranges.length - 1; i$1 >= 0; i$1--) {
- var range$$1 = sel.ranges[i$1]
- var from = range$$1.from(), to = range$$1.to()
- if (range$$1.empty()) {
- if (deleted && deleted > 0) // Handle deletion
- { from = Pos(from.line, from.ch - deleted) }
- else if (cm.state.overwrite && !paste) // Handle overwrite
- { to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length)) }
- else if (lastCopied && lastCopied.lineWise && lastCopied.text.join("\n") == inserted)
- { from = to = Pos(from.line, 0) }
- }
- updateInput = cm.curOp.updateInput
- var changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i$1 % multiPaste.length] : textLines,
- origin: origin || (paste ? "paste" : cm.state.cutIncoming ? "cut" : "+input")}
- makeChange(cm.doc, changeEvent)
- signalLater(cm, "inputRead", cm, changeEvent)
- }
- if (inserted && !paste)
- { triggerElectric(cm, inserted) }
-
- ensureCursorVisible(cm)
- cm.curOp.updateInput = updateInput
- cm.curOp.typing = true
- cm.state.pasteIncoming = cm.state.cutIncoming = false
-}
-
-function handlePaste(e, cm) {
- var pasted = e.clipboardData && e.clipboardData.getData("Text")
- if (pasted) {
- e.preventDefault()
- if (!cm.isReadOnly() && !cm.options.disableInput)
- { runInOp(cm, function () { return applyTextInput(cm, pasted, 0, null, "paste"); }) }
- return true
- }
-}
-
-function triggerElectric(cm, inserted) {
- // When an 'electric' character is inserted, immediately trigger a reindent
- if (!cm.options.electricChars || !cm.options.smartIndent) { return }
- var sel = cm.doc.sel
-
- for (var i = sel.ranges.length - 1; i >= 0; i--) {
- var range$$1 = sel.ranges[i]
- if (range$$1.head.ch > 100 || (i && sel.ranges[i - 1].head.line == range$$1.head.line)) { continue }
- var mode = cm.getModeAt(range$$1.head)
- var indented = false
- if (mode.electricChars) {
- for (var j = 0; j < mode.electricChars.length; j++)
- { if (inserted.indexOf(mode.electricChars.charAt(j)) > -1) {
- indented = indentLine(cm, range$$1.head.line, "smart")
- break
- } }
- } else if (mode.electricInput) {
- if (mode.electricInput.test(getLine(cm.doc, range$$1.head.line).text.slice(0, range$$1.head.ch)))
- { indented = indentLine(cm, range$$1.head.line, "smart") }
- }
- if (indented) { signalLater(cm, "electricInput", cm, range$$1.head.line) }
- }
-}
-
-function copyableRanges(cm) {
- var text = [], ranges = []
- for (var i = 0; i < cm.doc.sel.ranges.length; i++) {
- var line = cm.doc.sel.ranges[i].head.line
- var lineRange = {anchor: Pos(line, 0), head: Pos(line + 1, 0)}
- ranges.push(lineRange)
- text.push(cm.getRange(lineRange.anchor, lineRange.head))
- }
- return {text: text, ranges: ranges}
-}
-
-function disableBrowserMagic(field, spellcheck) {
- field.setAttribute("autocorrect", "off")
- field.setAttribute("autocapitalize", "off")
- field.setAttribute("spellcheck", !!spellcheck)
-}
-
-function hiddenTextarea() {
- var te = elt("textarea", null, null, "position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; outline: none")
- var div = elt("div", [te], null, "overflow: hidden; position: relative; width: 3px; height: 0px;")
- // The textarea is kept positioned near the cursor to prevent the
- // fact that it'll be scrolled into view on input from scrolling
- // our fake cursor out of view. On webkit, when wrap=off, paste is
- // very slow. So make the area wide instead.
- if (webkit) { te.style.width = "1000px" }
- else { te.setAttribute("wrap", "off") }
- // If border: 0; -- iOS fails to open keyboard (issue #1287)
- if (ios) { te.style.border = "1px solid black" }
- disableBrowserMagic(te)
- return div
-}
-
-// The publicly visible API. Note that methodOp(f) means
-// 'wrap f in an operation, performed on its `this` parameter'.
-
-// This is not the complete set of editor methods. Most of the
-// methods defined on the Doc type are also injected into
-// CodeMirror.prototype, for backwards compatibility and
-// convenience.
-
-var addEditorMethods = function(CodeMirror) {
- var optionHandlers = CodeMirror.optionHandlers
-
- var helpers = CodeMirror.helpers = {}
-
- CodeMirror.prototype = {
- constructor: CodeMirror,
- focus: function(){window.focus(); this.display.input.focus()},
-
- setOption: function(option, value) {
- var options = this.options, old = options[option]
- if (options[option] == value && option != "mode") { return }
- options[option] = value
- if (optionHandlers.hasOwnProperty(option))
- { operation(this, optionHandlers[option])(this, value, old) }
- },
-
- getOption: function(option) {return this.options[option]},
- getDoc: function() {return this.doc},
-
- addKeyMap: function(map$$1, bottom) {
- this.state.keyMaps[bottom ? "push" : "unshift"](getKeyMap(map$$1))
- },
- removeKeyMap: function(map$$1) {
- var maps = this.state.keyMaps
- for (var i = 0; i < maps.length; ++i)
- { if (maps[i] == map$$1 || maps[i].name == map$$1) {
- maps.splice(i, 1)
- return true
- } }
- },
-
- addOverlay: methodOp(function(spec, options) {
- var mode = spec.token ? spec : CodeMirror.getMode(this.options, spec)
- if (mode.startState) { throw new Error("Overlays may not be stateful.") }
- insertSorted(this.state.overlays,
- {mode: mode, modeSpec: spec, opaque: options && options.opaque,
- priority: (options && options.priority) || 0},
- function (overlay) { return overlay.priority; })
- this.state.modeGen++
- regChange(this)
- }),
- removeOverlay: methodOp(function(spec) {
- var this$1 = this;
-
- var overlays = this.state.overlays
- for (var i = 0; i < overlays.length; ++i) {
- var cur = overlays[i].modeSpec
- if (cur == spec || typeof spec == "string" && cur.name == spec) {
- overlays.splice(i, 1)
- this$1.state.modeGen++
- regChange(this$1)
- return
- }
- }
- }),
-
- indentLine: methodOp(function(n, dir, aggressive) {
- if (typeof dir != "string" && typeof dir != "number") {
- if (dir == null) { dir = this.options.smartIndent ? "smart" : "prev" }
- else { dir = dir ? "add" : "subtract" }
- }
- if (isLine(this.doc, n)) { indentLine(this, n, dir, aggressive) }
- }),
- indentSelection: methodOp(function(how) {
- var this$1 = this;
-
- var ranges = this.doc.sel.ranges, end = -1
- for (var i = 0; i < ranges.length; i++) {
- var range$$1 = ranges[i]
- if (!range$$1.empty()) {
- var from = range$$1.from(), to = range$$1.to()
- var start = Math.max(end, from.line)
- end = Math.min(this$1.lastLine(), to.line - (to.ch ? 0 : 1)) + 1
- for (var j = start; j < end; ++j)
- { indentLine(this$1, j, how) }
- var newRanges = this$1.doc.sel.ranges
- if (from.ch == 0 && ranges.length == newRanges.length && newRanges[i].from().ch > 0)
- { replaceOneSelection(this$1.doc, i, new Range(from, newRanges[i].to()), sel_dontScroll) }
- } else if (range$$1.head.line > end) {
- indentLine(this$1, range$$1.head.line, how, true)
- end = range$$1.head.line
- if (i == this$1.doc.sel.primIndex) { ensureCursorVisible(this$1) }
- }
- }
- }),
-
- // Fetch the parser token for a given character. Useful for hacks
- // that want to inspect the mode state (say, for completion).
- getTokenAt: function(pos, precise) {
- return takeToken(this, pos, precise)
- },
-
- getLineTokens: function(line, precise) {
- return takeToken(this, Pos(line), precise, true)
- },
-
- getTokenTypeAt: function(pos) {
- pos = clipPos(this.doc, pos)
- var styles = getLineStyles(this, getLine(this.doc, pos.line))
- var before = 0, after = (styles.length - 1) / 2, ch = pos.ch
- var type
- if (ch == 0) { type = styles[2] }
- else { for (;;) {
- var mid = (before + after) >> 1
- if ((mid ? styles[mid * 2 - 1] : 0) >= ch) { after = mid }
- else if (styles[mid * 2 + 1] < ch) { before = mid + 1 }
- else { type = styles[mid * 2 + 2]; break }
- } }
- var cut = type ? type.indexOf("overlay ") : -1
- return cut < 0 ? type : cut == 0 ? null : type.slice(0, cut - 1)
- },
-
- getModeAt: function(pos) {
- var mode = this.doc.mode
- if (!mode.innerMode) { return mode }
- return CodeMirror.innerMode(mode, this.getTokenAt(pos).state).mode
- },
-
- getHelper: function(pos, type) {
- return this.getHelpers(pos, type)[0]
- },
-
- getHelpers: function(pos, type) {
- var this$1 = this;
-
- var found = []
- if (!helpers.hasOwnProperty(type)) { return found }
- var help = helpers[type], mode = this.getModeAt(pos)
- if (typeof mode[type] == "string") {
- if (help[mode[type]]) { found.push(help[mode[type]]) }
- } else if (mode[type]) {
- for (var i = 0; i < mode[type].length; i++) {
- var val = help[mode[type][i]]
- if (val) { found.push(val) }
- }
- } else if (mode.helperType && help[mode.helperType]) {
- found.push(help[mode.helperType])
- } else if (help[mode.name]) {
- found.push(help[mode.name])
- }
- for (var i$1 = 0; i$1 < help._global.length; i$1++) {
- var cur = help._global[i$1]
- if (cur.pred(mode, this$1) && indexOf(found, cur.val) == -1)
- { found.push(cur.val) }
- }
- return found
- },
-
- getStateAfter: function(line, precise) {
- var doc = this.doc
- line = clipLine(doc, line == null ? doc.first + doc.size - 1: line)
- return getStateBefore(this, line + 1, precise)
- },
-
- cursorCoords: function(start, mode) {
- var pos, range$$1 = this.doc.sel.primary()
- if (start == null) { pos = range$$1.head }
- else if (typeof start == "object") { pos = clipPos(this.doc, start) }
- else { pos = start ? range$$1.from() : range$$1.to() }
- return cursorCoords(this, pos, mode || "page")
- },
-
- charCoords: function(pos, mode) {
- return charCoords(this, clipPos(this.doc, pos), mode || "page")
- },
-
- coordsChar: function(coords, mode) {
- coords = fromCoordSystem(this, coords, mode || "page")
- return coordsChar(this, coords.left, coords.top)
- },
-
- lineAtHeight: function(height, mode) {
- height = fromCoordSystem(this, {top: height, left: 0}, mode || "page").top
- return lineAtHeight(this.doc, height + this.display.viewOffset)
- },
- heightAtLine: function(line, mode) {
- var end = false, lineObj
- if (typeof line == "number") {
- var last = this.doc.first + this.doc.size - 1
- if (line < this.doc.first) { line = this.doc.first }
- else if (line > last) { line = last; end = true }
- lineObj = getLine(this.doc, line)
- } else {
- lineObj = line
- }
- return intoCoordSystem(this, lineObj, {top: 0, left: 0}, mode || "page").top +
- (end ? this.doc.height - heightAtLine(lineObj) : 0)
- },
-
- defaultTextHeight: function() { return textHeight(this.display) },
- defaultCharWidth: function() { return charWidth(this.display) },
-
- setGutterMarker: methodOp(function(line, gutterID, value) {
- return changeLine(this.doc, line, "gutter", function (line) {
- var markers = line.gutterMarkers || (line.gutterMarkers = {})
- markers[gutterID] = value
- if (!value && isEmpty(markers)) { line.gutterMarkers = null }
- return true
- })
- }),
-
- clearGutter: methodOp(function(gutterID) {
- var this$1 = this;
-
- var doc = this.doc, i = doc.first
- doc.iter(function (line) {
- if (line.gutterMarkers && line.gutterMarkers[gutterID]) {
- line.gutterMarkers[gutterID] = null
- regLineChange(this$1, i, "gutter")
- if (isEmpty(line.gutterMarkers)) { line.gutterMarkers = null }
- }
- ++i
- })
- }),
-
- lineInfo: function(line) {
- var n
- if (typeof line == "number") {
- if (!isLine(this.doc, line)) { return null }
- n = line
- line = getLine(this.doc, line)
- if (!line) { return null }
- } else {
- n = lineNo(line)
- if (n == null) { return null }
- }
- return {line: n, handle: line, text: line.text, gutterMarkers: line.gutterMarkers,
- textClass: line.textClass, bgClass: line.bgClass, wrapClass: line.wrapClass,
- widgets: line.widgets}
- },
-
- getViewport: function() { return {from: this.display.viewFrom, to: this.display.viewTo}},
-
- addWidget: function(pos, node, scroll, vert, horiz) {
- var display = this.display
- pos = cursorCoords(this, clipPos(this.doc, pos))
- var top = pos.bottom, left = pos.left
- node.style.position = "absolute"
- node.setAttribute("cm-ignore-events", "true")
- this.display.input.setUneditable(node)
- display.sizer.appendChild(node)
- if (vert == "over") {
- top = pos.top
- } else if (vert == "above" || vert == "near") {
- var vspace = Math.max(display.wrapper.clientHeight, this.doc.height),
- hspace = Math.max(display.sizer.clientWidth, display.lineSpace.clientWidth)
- // Default to positioning above (if specified and possible); otherwise default to positioning below
- if ((vert == 'above' || pos.bottom + node.offsetHeight > vspace) && pos.top > node.offsetHeight)
- { top = pos.top - node.offsetHeight }
- else if (pos.bottom + node.offsetHeight <= vspace)
- { top = pos.bottom }
- if (left + node.offsetWidth > hspace)
- { left = hspace - node.offsetWidth }
- }
- node.style.top = top + "px"
- node.style.left = node.style.right = ""
- if (horiz == "right") {
- left = display.sizer.clientWidth - node.offsetWidth
- node.style.right = "0px"
- } else {
- if (horiz == "left") { left = 0 }
- else if (horiz == "middle") { left = (display.sizer.clientWidth - node.offsetWidth) / 2 }
- node.style.left = left + "px"
- }
- if (scroll)
- { scrollIntoView(this, left, top, left + node.offsetWidth, top + node.offsetHeight) }
- },
-
- triggerOnKeyDown: methodOp(onKeyDown),
- triggerOnKeyPress: methodOp(onKeyPress),
- triggerOnKeyUp: onKeyUp,
-
- execCommand: function(cmd) {
- if (commands.hasOwnProperty(cmd))
- { return commands[cmd].call(null, this) }
- },
-
- triggerElectric: methodOp(function(text) { triggerElectric(this, text) }),
-
- findPosH: function(from, amount, unit, visually) {
- var this$1 = this;
-
- var dir = 1
- if (amount < 0) { dir = -1; amount = -amount }
- var cur = clipPos(this.doc, from)
- for (var i = 0; i < amount; ++i) {
- cur = findPosH(this$1.doc, cur, dir, unit, visually)
- if (cur.hitSide) { break }
- }
- return cur
- },
-
- moveH: methodOp(function(dir, unit) {
- var this$1 = this;
-
- this.extendSelectionsBy(function (range$$1) {
- if (this$1.display.shift || this$1.doc.extend || range$$1.empty())
- { return findPosH(this$1.doc, range$$1.head, dir, unit, this$1.options.rtlMoveVisually) }
- else
- { return dir < 0 ? range$$1.from() : range$$1.to() }
- }, sel_move)
- }),
-
- deleteH: methodOp(function(dir, unit) {
- var sel = this.doc.sel, doc = this.doc
- if (sel.somethingSelected())
- { doc.replaceSelection("", null, "+delete") }
- else
- { deleteNearSelection(this, function (range$$1) {
- var other = findPosH(doc, range$$1.head, dir, unit, false)
- return dir < 0 ? {from: other, to: range$$1.head} : {from: range$$1.head, to: other}
- }) }
- }),
-
- findPosV: function(from, amount, unit, goalColumn) {
- var this$1 = this;
-
- var dir = 1, x = goalColumn
- if (amount < 0) { dir = -1; amount = -amount }
- var cur = clipPos(this.doc, from)
- for (var i = 0; i < amount; ++i) {
- var coords = cursorCoords(this$1, cur, "div")
- if (x == null) { x = coords.left }
- else { coords.left = x }
- cur = findPosV(this$1, coords, dir, unit)
- if (cur.hitSide) { break }
- }
- return cur
- },
-
- moveV: methodOp(function(dir, unit) {
- var this$1 = this;
-
- var doc = this.doc, goals = []
- var collapse = !this.display.shift && !doc.extend && doc.sel.somethingSelected()
- doc.extendSelectionsBy(function (range$$1) {
- if (collapse)
- { return dir < 0 ? range$$1.from() : range$$1.to() }
- var headPos = cursorCoords(this$1, range$$1.head, "div")
- if (range$$1.goalColumn != null) { headPos.left = range$$1.goalColumn }
- goals.push(headPos.left)
- var pos = findPosV(this$1, headPos, dir, unit)
- if (unit == "page" && range$$1 == doc.sel.primary())
- { addToScrollPos(this$1, null, charCoords(this$1, pos, "div").top - headPos.top) }
- return pos
- }, sel_move)
- if (goals.length) { for (var i = 0; i < doc.sel.ranges.length; i++)
- { doc.sel.ranges[i].goalColumn = goals[i] } }
- }),
-
- // Find the word at the given position (as returned by coordsChar).
- findWordAt: function(pos) {
- var doc = this.doc, line = getLine(doc, pos.line).text
- var start = pos.ch, end = pos.ch
- if (line) {
- var helper = this.getHelper(pos, "wordChars")
- if ((pos.xRel < 0 || end == line.length) && start) { --start; } else { ++end }
- var startChar = line.charAt(start)
- var check = isWordChar(startChar, helper)
- ? function (ch) { return isWordChar(ch, helper); }
- : /\s/.test(startChar) ? function (ch) { return /\s/.test(ch); }
- : function (ch) { return (!/\s/.test(ch) && !isWordChar(ch)); }
- while (start > 0 && check(line.charAt(start - 1))) { --start }
- while (end < line.length && check(line.charAt(end))) { ++end }
- }
- return new Range(Pos(pos.line, start), Pos(pos.line, end))
- },
-
- toggleOverwrite: function(value) {
- if (value != null && value == this.state.overwrite) { return }
- if (this.state.overwrite = !this.state.overwrite)
- { addClass(this.display.cursorDiv, "CodeMirror-overwrite") }
- else
- { rmClass(this.display.cursorDiv, "CodeMirror-overwrite") }
-
- signal(this, "overwriteToggle", this, this.state.overwrite)
- },
- hasFocus: function() { return this.display.input.getField() == activeElt() },
- isReadOnly: function() { return !!(this.options.readOnly || this.doc.cantEdit) },
-
- scrollTo: methodOp(function(x, y) {
- if (x != null || y != null) { resolveScrollToPos(this) }
- if (x != null) { this.curOp.scrollLeft = x }
- if (y != null) { this.curOp.scrollTop = y }
- }),
- getScrollInfo: function() {
- var scroller = this.display.scroller
- return {left: scroller.scrollLeft, top: scroller.scrollTop,
- height: scroller.scrollHeight - scrollGap(this) - this.display.barHeight,
- width: scroller.scrollWidth - scrollGap(this) - this.display.barWidth,
- clientHeight: displayHeight(this), clientWidth: displayWidth(this)}
- },
-
- scrollIntoView: methodOp(function(range$$1, margin) {
- if (range$$1 == null) {
- range$$1 = {from: this.doc.sel.primary().head, to: null}
- if (margin == null) { margin = this.options.cursorScrollMargin }
- } else if (typeof range$$1 == "number") {
- range$$1 = {from: Pos(range$$1, 0), to: null}
- } else if (range$$1.from == null) {
- range$$1 = {from: range$$1, to: null}
- }
- if (!range$$1.to) { range$$1.to = range$$1.from }
- range$$1.margin = margin || 0
-
- if (range$$1.from.line != null) {
- resolveScrollToPos(this)
- this.curOp.scrollToPos = range$$1
- } else {
- var sPos = calculateScrollPos(this, Math.min(range$$1.from.left, range$$1.to.left),
- Math.min(range$$1.from.top, range$$1.to.top) - range$$1.margin,
- Math.max(range$$1.from.right, range$$1.to.right),
- Math.max(range$$1.from.bottom, range$$1.to.bottom) + range$$1.margin)
- this.scrollTo(sPos.scrollLeft, sPos.scrollTop)
- }
- }),
-
- setSize: methodOp(function(width, height) {
- var this$1 = this;
-
- var interpret = function (val) { return typeof val == "number" || /^\d+$/.test(String(val)) ? val + "px" : val; }
- if (width != null) { this.display.wrapper.style.width = interpret(width) }
- if (height != null) { this.display.wrapper.style.height = interpret(height) }
- if (this.options.lineWrapping) { clearLineMeasurementCache(this) }
- var lineNo$$1 = this.display.viewFrom
- this.doc.iter(lineNo$$1, this.display.viewTo, function (line) {
- if (line.widgets) { for (var i = 0; i < line.widgets.length; i++)
- { if (line.widgets[i].noHScroll) { regLineChange(this$1, lineNo$$1, "widget"); break } } }
- ++lineNo$$1
- })
- this.curOp.forceUpdate = true
- signal(this, "refresh", this)
- }),
-
- operation: function(f){return runInOp(this, f)},
-
- refresh: methodOp(function() {
- var oldHeight = this.display.cachedTextHeight
- regChange(this)
- this.curOp.forceUpdate = true
- clearCaches(this)
- this.scrollTo(this.doc.scrollLeft, this.doc.scrollTop)
- updateGutterSpace(this)
- if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5)
- { estimateLineHeights(this) }
- signal(this, "refresh", this)
- }),
-
- swapDoc: methodOp(function(doc) {
- var old = this.doc
- old.cm = null
- attachDoc(this, doc)
- clearCaches(this)
- this.display.input.reset()
- this.scrollTo(doc.scrollLeft, doc.scrollTop)
- this.curOp.forceScroll = true
- signalLater(this, "swapDoc", this, old)
- return old
- }),
-
- getInputField: function(){return this.display.input.getField()},
- getWrapperElement: function(){return this.display.wrapper},
- getScrollerElement: function(){return this.display.scroller},
- getGutterElement: function(){return this.display.gutters}
- }
- eventMixin(CodeMirror)
-
- CodeMirror.registerHelper = function(type, name, value) {
- if (!helpers.hasOwnProperty(type)) { helpers[type] = CodeMirror[type] = {_global: []} }
- helpers[type][name] = value
- }
- CodeMirror.registerGlobalHelper = function(type, name, predicate, value) {
- CodeMirror.registerHelper(type, name, value)
- helpers[type]._global.push({pred: predicate, val: value})
- }
-}
-
-// Used for horizontal relative motion. Dir is -1 or 1 (left or
-// right), unit can be "char", "column" (like char, but doesn't
-// cross line boundaries), "word" (across next word), or "group" (to
-// the start of next group of word or non-word-non-whitespace
-// chars). The visually param controls whether, in right-to-left
-// text, direction 1 means to move towards the next index in the
-// string, or towards the character to the right of the current
-// position. The resulting position will have a hitSide=true
-// property if it reached the end of the document.
-function findPosH(doc, pos, dir, unit, visually) {
- var line = pos.line, ch = pos.ch, origDir = dir
- var lineObj = getLine(doc, line)
- function findNextLine() {
- var l = line + dir
- if (l < doc.first || l >= doc.first + doc.size) { return false }
- line = l
- return lineObj = getLine(doc, l)
- }
- function moveOnce(boundToLine) {
- var next = (visually ? moveVisually : moveLogically)(lineObj, ch, dir, true)
- if (next == null) {
- if (!boundToLine && findNextLine()) {
- if (visually) { ch = (dir < 0 ? lineRight : lineLeft)(lineObj) }
- else { ch = dir < 0 ? lineObj.text.length : 0 }
- } else { return false }
- } else { ch = next }
- return true
- }
-
- if (unit == "char") {
- moveOnce()
- } else if (unit == "column") {
- moveOnce(true)
- } else if (unit == "word" || unit == "group") {
- var sawType = null, group = unit == "group"
- var helper = doc.cm && doc.cm.getHelper(pos, "wordChars")
- for (var first = true;; first = false) {
- if (dir < 0 && !moveOnce(!first)) { break }
- var cur = lineObj.text.charAt(ch) || "\n"
- var type = isWordChar(cur, helper) ? "w"
- : group && cur == "\n" ? "n"
- : !group || /\s/.test(cur) ? null
- : "p"
- if (group && !first && !type) { type = "s" }
- if (sawType && sawType != type) {
- if (dir < 0) {dir = 1; moveOnce()}
- break
- }
-
- if (type) { sawType = type }
- if (dir > 0 && !moveOnce(!first)) { break }
- }
- }
- var result = skipAtomic(doc, Pos(line, ch), pos, origDir, true)
- if (!cmp(pos, result)) { result.hitSide = true }
- return result
-}
-
-// For relative vertical movement. Dir may be -1 or 1. Unit can be
-// "page" or "line". The resulting position will have a hitSide=true
-// property if it reached the end of the document.
-function findPosV(cm, pos, dir, unit) {
- var doc = cm.doc, x = pos.left, y
- if (unit == "page") {
- var pageSize = Math.min(cm.display.wrapper.clientHeight, window.innerHeight || document.documentElement.clientHeight)
- var moveAmount = Math.max(pageSize - .5 * textHeight(cm.display), 3)
- y = (dir > 0 ? pos.bottom : pos.top) + dir * moveAmount
-
- } else if (unit == "line") {
- y = dir > 0 ? pos.bottom + 3 : pos.top - 3
- }
- var target
- for (;;) {
- target = coordsChar(cm, x, y)
- if (!target.outside) { break }
- if (dir < 0 ? y <= 0 : y >= doc.height) { target.hitSide = true; break }
- y += dir * 5
- }
- return target
-}
-
-// CONTENTEDITABLE INPUT STYLE
-
-function ContentEditableInput(cm) {
- this.cm = cm
- this.lastAnchorNode = this.lastAnchorOffset = this.lastFocusNode = this.lastFocusOffset = null
- this.polling = new Delayed()
- this.gracePeriod = false
-}
-
-ContentEditableInput.prototype = copyObj({
- init: function(display) {
- var input = this, cm = input.cm
- var div = input.div = display.lineDiv
- disableBrowserMagic(div, cm.options.spellcheck)
-
- on(div, "paste", function (e) {
- if (signalDOMEvent(cm, e) || handlePaste(e, cm)) { return }
- // IE doesn't fire input events, so we schedule a read for the pasted content in this way
- if (ie_version <= 11) { setTimeout(operation(cm, function () {
- if (!input.pollContent()) { regChange(cm) }
- }), 20) }
- })
-
- on(div, "compositionstart", function (e) {
- var data = e.data
- input.composing = {sel: cm.doc.sel, data: data, startData: data}
- if (!data) { return }
- var prim = cm.doc.sel.primary()
- var line = cm.getLine(prim.head.line)
- var found = line.indexOf(data, Math.max(0, prim.head.ch - data.length))
- if (found > -1 && found <= prim.head.ch)
- { input.composing.sel = simpleSelection(Pos(prim.head.line, found),
- Pos(prim.head.line, found + data.length)) }
- })
- on(div, "compositionupdate", function (e) { return input.composing.data = e.data; })
- on(div, "compositionend", function (e) {
- var ours = input.composing
- if (!ours) { return }
- if (e.data != ours.startData && !/\u200b/.test(e.data))
- { ours.data = e.data }
- // Need a small delay to prevent other code (input event,
- // selection polling) from doing damage when fired right after
- // compositionend.
- setTimeout(function () {
- if (!ours.handled)
- { input.applyComposition(ours) }
- if (input.composing == ours)
- { input.composing = null }
- }, 50)
- })
-
- on(div, "touchstart", function () { return input.forceCompositionEnd(); })
-
- on(div, "input", function () {
- if (input.composing) { return }
- if (cm.isReadOnly() || !input.pollContent())
- { runInOp(input.cm, function () { return regChange(cm); }) }
- })
-
- function onCopyCut(e) {
- if (signalDOMEvent(cm, e)) { return }
- if (cm.somethingSelected()) {
- setLastCopied({lineWise: false, text: cm.getSelections()})
- if (e.type == "cut") { cm.replaceSelection("", null, "cut") }
- } else if (!cm.options.lineWiseCopyCut) {
- return
- } else {
- var ranges = copyableRanges(cm)
- setLastCopied({lineWise: true, text: ranges.text})
- if (e.type == "cut") {
- cm.operation(function () {
- cm.setSelections(ranges.ranges, 0, sel_dontScroll)
- cm.replaceSelection("", null, "cut")
- })
- }
- }
- if (e.clipboardData) {
- e.clipboardData.clearData()
- var content = lastCopied.text.join("\n")
- // iOS exposes the clipboard API, but seems to discard content inserted into it
- e.clipboardData.setData("Text", content)
- if (e.clipboardData.getData("Text") == content) {
- e.preventDefault()
- return
- }
- }
- // Old-fashioned briefly-focus-a-textarea hack
- var kludge = hiddenTextarea(), te = kludge.firstChild
- cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild)
- te.value = lastCopied.text.join("\n")
- var hadFocus = document.activeElement
- selectInput(te)
- setTimeout(function () {
- cm.display.lineSpace.removeChild(kludge)
- hadFocus.focus()
- if (hadFocus == div) { input.showPrimarySelection() }
- }, 50)
- }
- on(div, "copy", onCopyCut)
- on(div, "cut", onCopyCut)
- },
-
- prepareSelection: function() {
- var result = prepareSelection(this.cm, false)
- result.focus = this.cm.state.focused
- return result
- },
-
- showSelection: function(info, takeFocus) {
- if (!info || !this.cm.display.view.length) { return }
- if (info.focus || takeFocus) { this.showPrimarySelection() }
- this.showMultipleSelections(info)
- },
-
- showPrimarySelection: function() {
- var sel = window.getSelection(), prim = this.cm.doc.sel.primary()
- var curAnchor = domToPos(this.cm, sel.anchorNode, sel.anchorOffset)
- var curFocus = domToPos(this.cm, sel.focusNode, sel.focusOffset)
- if (curAnchor && !curAnchor.bad && curFocus && !curFocus.bad &&
- cmp(minPos(curAnchor, curFocus), prim.from()) == 0 &&
- cmp(maxPos(curAnchor, curFocus), prim.to()) == 0)
- { return }
-
- var start = posToDOM(this.cm, prim.from())
- var end = posToDOM(this.cm, prim.to())
- if (!start && !end) { return }
-
- var view = this.cm.display.view
- var old = sel.rangeCount && sel.getRangeAt(0)
- if (!start) {
- start = {node: view[0].measure.map[2], offset: 0}
- } else if (!end) { // FIXME dangerously hacky
- var measure = view[view.length - 1].measure
- var map$$1 = measure.maps ? measure.maps[measure.maps.length - 1] : measure.map
- end = {node: map$$1[map$$1.length - 1], offset: map$$1[map$$1.length - 2] - map$$1[map$$1.length - 3]}
- }
-
- var rng
- try { rng = range(start.node, start.offset, end.offset, end.node) }
- catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible
- if (rng) {
- if (!gecko && this.cm.state.focused) {
- sel.collapse(start.node, start.offset)
- if (!rng.collapsed) {
- sel.removeAllRanges()
- sel.addRange(rng)
- }
- } else {
- sel.removeAllRanges()
- sel.addRange(rng)
- }
- if (old && sel.anchorNode == null) { sel.addRange(old) }
- else if (gecko) { this.startGracePeriod() }
- }
- this.rememberSelection()
- },
-
- startGracePeriod: function() {
- var this$1 = this;
-
- clearTimeout(this.gracePeriod)
- this.gracePeriod = setTimeout(function () {
- this$1.gracePeriod = false
- if (this$1.selectionChanged())
- { this$1.cm.operation(function () { return this$1.cm.curOp.selectionChanged = true; }) }
- }, 20)
- },
-
- showMultipleSelections: function(info) {
- removeChildrenAndAdd(this.cm.display.cursorDiv, info.cursors)
- removeChildrenAndAdd(this.cm.display.selectionDiv, info.selection)
- },
-
- rememberSelection: function() {
- var sel = window.getSelection()
- this.lastAnchorNode = sel.anchorNode; this.lastAnchorOffset = sel.anchorOffset
- this.lastFocusNode = sel.focusNode; this.lastFocusOffset = sel.focusOffset
- },
-
- selectionInEditor: function() {
- var sel = window.getSelection()
- if (!sel.rangeCount) { return false }
- var node = sel.getRangeAt(0).commonAncestorContainer
- return contains(this.div, node)
- },
-
- focus: function() {
- if (this.cm.options.readOnly != "nocursor") { this.div.focus() }
- },
- blur: function() { this.div.blur() },
- getField: function() { return this.div },
-
- supportsTouch: function() { return true },
-
- receivedFocus: function() {
- var input = this
- if (this.selectionInEditor())
- { this.pollSelection() }
- else
- { runInOp(this.cm, function () { return input.cm.curOp.selectionChanged = true; }) }
-
- function poll() {
- if (input.cm.state.focused) {
- input.pollSelection()
- input.polling.set(input.cm.options.pollInterval, poll)
- }
- }
- this.polling.set(this.cm.options.pollInterval, poll)
- },
-
- selectionChanged: function() {
- var sel = window.getSelection()
- return sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset ||
- sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset
- },
-
- pollSelection: function() {
- if (!this.composing && !this.gracePeriod && this.selectionChanged()) {
- var sel = window.getSelection(), cm = this.cm
- this.rememberSelection()
- var anchor = domToPos(cm, sel.anchorNode, sel.anchorOffset)
- var head = domToPos(cm, sel.focusNode, sel.focusOffset)
- if (anchor && head) { runInOp(cm, function () {
- setSelection(cm.doc, simpleSelection(anchor, head), sel_dontScroll)
- if (anchor.bad || head.bad) { cm.curOp.selectionChanged = true }
- }) }
- }
- },
-
- pollContent: function() {
- var cm = this.cm, display = cm.display, sel = cm.doc.sel.primary()
- var from = sel.from(), to = sel.to()
- if (from.line < display.viewFrom || to.line > display.viewTo - 1) { return false }
-
- var fromIndex, fromLine, fromNode
- if (from.line == display.viewFrom || (fromIndex = findViewIndex(cm, from.line)) == 0) {
- fromLine = lineNo(display.view[0].line)
- fromNode = display.view[0].node
- } else {
- fromLine = lineNo(display.view[fromIndex].line)
- fromNode = display.view[fromIndex - 1].node.nextSibling
- }
- var toIndex = findViewIndex(cm, to.line)
- var toLine, toNode
- if (toIndex == display.view.length - 1) {
- toLine = display.viewTo - 1
- toNode = display.lineDiv.lastChild
- } else {
- toLine = lineNo(display.view[toIndex + 1].line) - 1
- toNode = display.view[toIndex + 1].node.previousSibling
- }
-
- var newText = cm.doc.splitLines(domTextBetween(cm, fromNode, toNode, fromLine, toLine))
- var oldText = getBetween(cm.doc, Pos(fromLine, 0), Pos(toLine, getLine(cm.doc, toLine).text.length))
- while (newText.length > 1 && oldText.length > 1) {
- if (lst(newText) == lst(oldText)) { newText.pop(); oldText.pop(); toLine-- }
- else if (newText[0] == oldText[0]) { newText.shift(); oldText.shift(); fromLine++ }
- else { break }
- }
-
- var cutFront = 0, cutEnd = 0
- var newTop = newText[0], oldTop = oldText[0], maxCutFront = Math.min(newTop.length, oldTop.length)
- while (cutFront < maxCutFront && newTop.charCodeAt(cutFront) == oldTop.charCodeAt(cutFront))
- { ++cutFront }
- var newBot = lst(newText), oldBot = lst(oldText)
- var maxCutEnd = Math.min(newBot.length - (newText.length == 1 ? cutFront : 0),
- oldBot.length - (oldText.length == 1 ? cutFront : 0))
- while (cutEnd < maxCutEnd &&
- newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1))
- { ++cutEnd }
-
- newText[newText.length - 1] = newBot.slice(0, newBot.length - cutEnd)
- newText[0] = newText[0].slice(cutFront)
-
- var chFrom = Pos(fromLine, cutFront)
- var chTo = Pos(toLine, oldText.length ? lst(oldText).length - cutEnd : 0)
- if (newText.length > 1 || newText[0] || cmp(chFrom, chTo)) {
- replaceRange(cm.doc, newText, chFrom, chTo, "+input")
- return true
- }
- },
-
- ensurePolled: function() {
- this.forceCompositionEnd()
- },
- reset: function() {
- this.forceCompositionEnd()
- },
- forceCompositionEnd: function() {
- if (!this.composing || this.composing.handled) { return }
- this.applyComposition(this.composing)
- this.composing.handled = true
- this.div.blur()
- this.div.focus()
- },
- applyComposition: function(composing) {
- if (this.cm.isReadOnly())
- { operation(this.cm, regChange)(this.cm) }
- else if (composing.data && composing.data != composing.startData)
- { operation(this.cm, applyTextInput)(this.cm, composing.data, 0, composing.sel) }
- },
-
- setUneditable: function(node) {
- node.contentEditable = "false"
- },
-
- onKeyPress: function(e) {
- e.preventDefault()
- if (!this.cm.isReadOnly())
- { operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0) }
- },
-
- readOnlyChanged: function(val) {
- this.div.contentEditable = String(val != "nocursor")
- },
-
- onContextMenu: nothing,
- resetPosition: nothing,
-
- needsContentAttribute: true
- }, ContentEditableInput.prototype)
-
-function posToDOM(cm, pos) {
- var view = findViewForLine(cm, pos.line)
- if (!view || view.hidden) { return null }
- var line = getLine(cm.doc, pos.line)
- var info = mapFromLineView(view, line, pos.line)
-
- var order = getOrder(line), side = "left"
- if (order) {
- var partPos = getBidiPartAt(order, pos.ch)
- side = partPos % 2 ? "right" : "left"
- }
- var result = nodeAndOffsetInLineMap(info.map, pos.ch, side)
- result.offset = result.collapse == "right" ? result.end : result.start
- return result
-}
-
-function badPos(pos, bad) { if (bad) { pos.bad = true; } return pos }
-
-function domTextBetween(cm, from, to, fromLine, toLine) {
- var text = "", closing = false, lineSep = cm.doc.lineSeparator()
- function recognizeMarker(id) { return function (marker) { return marker.id == id; } }
- function walk(node) {
- if (node.nodeType == 1) {
- var cmText = node.getAttribute("cm-text")
- if (cmText != null) {
- if (cmText == "") { cmText = node.textContent.replace(/\u200b/g, "") }
- text += cmText
- return
- }
- var markerID = node.getAttribute("cm-marker"), range$$1
- if (markerID) {
- var found = cm.findMarks(Pos(fromLine, 0), Pos(toLine + 1, 0), recognizeMarker(+markerID))
- if (found.length && (range$$1 = found[0].find()))
- { text += getBetween(cm.doc, range$$1.from, range$$1.to).join(lineSep) }
- return
- }
- if (node.getAttribute("contenteditable") == "false") { return }
- for (var i = 0; i < node.childNodes.length; i++)
- { walk(node.childNodes[i]) }
- if (/^(pre|div|p)$/i.test(node.nodeName))
- { closing = true }
- } else if (node.nodeType == 3) {
- var val = node.nodeValue
- if (!val) { return }
- if (closing) {
- text += lineSep
- closing = false
- }
- text += val
- }
- }
- for (;;) {
- walk(from)
- if (from == to) { break }
- from = from.nextSibling
- }
- return text
-}
-
-function domToPos(cm, node, offset) {
- var lineNode
- if (node == cm.display.lineDiv) {
- lineNode = cm.display.lineDiv.childNodes[offset]
- if (!lineNode) { return badPos(cm.clipPos(Pos(cm.display.viewTo - 1)), true) }
- node = null; offset = 0
- } else {
- for (lineNode = node;; lineNode = lineNode.parentNode) {
- if (!lineNode || lineNode == cm.display.lineDiv) { return null }
- if (lineNode.parentNode && lineNode.parentNode == cm.display.lineDiv) { break }
- }
- }
- for (var i = 0; i < cm.display.view.length; i++) {
- var lineView = cm.display.view[i]
- if (lineView.node == lineNode)
- { return locateNodeInLineView(lineView, node, offset) }
- }
-}
-
-function locateNodeInLineView(lineView, node, offset) {
- var wrapper = lineView.text.firstChild, bad = false
- if (!node || !contains(wrapper, node)) { return badPos(Pos(lineNo(lineView.line), 0), true) }
- if (node == wrapper) {
- bad = true
- node = wrapper.childNodes[offset]
- offset = 0
- if (!node) {
- var line = lineView.rest ? lst(lineView.rest) : lineView.line
- return badPos(Pos(lineNo(line), line.text.length), bad)
- }
- }
-
- var textNode = node.nodeType == 3 ? node : null, topNode = node
- if (!textNode && node.childNodes.length == 1 && node.firstChild.nodeType == 3) {
- textNode = node.firstChild
- if (offset) { offset = textNode.nodeValue.length }
- }
- while (topNode.parentNode != wrapper) { topNode = topNode.parentNode }
- var measure = lineView.measure, maps = measure.maps
-
- function find(textNode, topNode, offset) {
- for (var i = -1; i < (maps ? maps.length : 0); i++) {
- var map$$1 = i < 0 ? measure.map : maps[i]
- for (var j = 0; j < map$$1.length; j += 3) {
- var curNode = map$$1[j + 2]
- if (curNode == textNode || curNode == topNode) {
- var line = lineNo(i < 0 ? lineView.line : lineView.rest[i])
- var ch = map$$1[j] + offset
- if (offset < 0 || curNode != textNode) { ch = map$$1[j + (offset ? 1 : 0)] }
- return Pos(line, ch)
- }
- }
- }
- }
- var found = find(textNode, topNode, offset)
- if (found) { return badPos(found, bad) }
-
- // FIXME this is all really shaky. might handle the few cases it needs to handle, but likely to cause problems
- for (var after = topNode.nextSibling, dist = textNode ? textNode.nodeValue.length - offset : 0; after; after = after.nextSibling) {
- found = find(after, after.firstChild, 0)
- if (found)
- { return badPos(Pos(found.line, found.ch - dist), bad) }
- else
- { dist += after.textContent.length }
- }
- for (var before = topNode.previousSibling, dist$1 = offset; before; before = before.previousSibling) {
- found = find(before, before.firstChild, -1)
- if (found)
- { return badPos(Pos(found.line, found.ch + dist$1), bad) }
- else
- { dist$1 += before.textContent.length }
- }
-}
-
-// TEXTAREA INPUT STYLE
-
-function TextareaInput(cm) {
- this.cm = cm
- // See input.poll and input.reset
- this.prevInput = ""
-
- // Flag that indicates whether we expect input to appear real soon
- // now (after some event like 'keypress' or 'input') and are
- // polling intensively.
- this.pollingFast = false
- // Self-resetting timeout for the poller
- this.polling = new Delayed()
- // Tracks when input.reset has punted to just putting a short
- // string into the textarea instead of the full selection.
- this.inaccurateSelection = false
- // Used to work around IE issue with selection being forgotten when focus moves away from textarea
- this.hasSelection = false
- this.composing = null
-}
-
-TextareaInput.prototype = copyObj({
- init: function(display) {
- var this$1 = this;
-
- var input = this, cm = this.cm
-
- // Wraps and hides input textarea
- var div = this.wrapper = hiddenTextarea()
- // The semihidden textarea that is focused when the editor is
- // focused, and receives input.
- var te = this.textarea = div.firstChild
- display.wrapper.insertBefore(div, display.wrapper.firstChild)
-
- // Needed to hide big blue blinking cursor on Mobile Safari (doesn't seem to work in iOS 8 anymore)
- if (ios) { te.style.width = "0px" }
-
- on(te, "input", function () {
- if (ie && ie_version >= 9 && this$1.hasSelection) { this$1.hasSelection = null }
- input.poll()
- })
-
- on(te, "paste", function (e) {
- if (signalDOMEvent(cm, e) || handlePaste(e, cm)) { return }
-
- cm.state.pasteIncoming = true
- input.fastPoll()
- })
-
- function prepareCopyCut(e) {
- if (signalDOMEvent(cm, e)) { return }
- if (cm.somethingSelected()) {
- setLastCopied({lineWise: false, text: cm.getSelections()})
- if (input.inaccurateSelection) {
- input.prevInput = ""
- input.inaccurateSelection = false
- te.value = lastCopied.text.join("\n")
- selectInput(te)
- }
- } else if (!cm.options.lineWiseCopyCut) {
- return
- } else {
- var ranges = copyableRanges(cm)
- setLastCopied({lineWise: true, text: ranges.text})
- if (e.type == "cut") {
- cm.setSelections(ranges.ranges, null, sel_dontScroll)
- } else {
- input.prevInput = ""
- te.value = ranges.text.join("\n")
- selectInput(te)
- }
- }
- if (e.type == "cut") { cm.state.cutIncoming = true }
- }
- on(te, "cut", prepareCopyCut)
- on(te, "copy", prepareCopyCut)
-
- on(display.scroller, "paste", function (e) {
- if (eventInWidget(display, e) || signalDOMEvent(cm, e)) { return }
- cm.state.pasteIncoming = true
- input.focus()
- })
-
- // Prevent normal selection in the editor (we handle our own)
- on(display.lineSpace, "selectstart", function (e) {
- if (!eventInWidget(display, e)) { e_preventDefault(e) }
- })
-
- on(te, "compositionstart", function () {
- var start = cm.getCursor("from")
- if (input.composing) { input.composing.range.clear() }
- input.composing = {
- start: start,
- range: cm.markText(start, cm.getCursor("to"), {className: "CodeMirror-composing"})
- }
- })
- on(te, "compositionend", function () {
- if (input.composing) {
- input.poll()
- input.composing.range.clear()
- input.composing = null
- }
- })
- },
-
- prepareSelection: function() {
- // Redraw the selection and/or cursor
- var cm = this.cm, display = cm.display, doc = cm.doc
- var result = prepareSelection(cm)
-
- // Move the hidden textarea near the cursor to prevent scrolling artifacts
- if (cm.options.moveInputWithCursor) {
- var headPos = cursorCoords(cm, doc.sel.primary().head, "div")
- var wrapOff = display.wrapper.getBoundingClientRect(), lineOff = display.lineDiv.getBoundingClientRect()
- result.teTop = Math.max(0, Math.min(display.wrapper.clientHeight - 10,
- headPos.top + lineOff.top - wrapOff.top))
- result.teLeft = Math.max(0, Math.min(display.wrapper.clientWidth - 10,
- headPos.left + lineOff.left - wrapOff.left))
- }
-
- return result
- },
-
- showSelection: function(drawn) {
- var cm = this.cm, display = cm.display
- removeChildrenAndAdd(display.cursorDiv, drawn.cursors)
- removeChildrenAndAdd(display.selectionDiv, drawn.selection)
- if (drawn.teTop != null) {
- this.wrapper.style.top = drawn.teTop + "px"
- this.wrapper.style.left = drawn.teLeft + "px"
- }
- },
-
- // Reset the input to correspond to the selection (or to be empty,
- // when not typing and nothing is selected)
- reset: function(typing) {
- if (this.contextMenuPending) { return }
- var minimal, selected, cm = this.cm, doc = cm.doc
- if (cm.somethingSelected()) {
- this.prevInput = ""
- var range$$1 = doc.sel.primary()
- minimal = hasCopyEvent &&
- (range$$1.to().line - range$$1.from().line > 100 || (selected = cm.getSelection()).length > 1000)
- var content = minimal ? "-" : selected || cm.getSelection()
- this.textarea.value = content
- if (cm.state.focused) { selectInput(this.textarea) }
- if (ie && ie_version >= 9) { this.hasSelection = content }
- } else if (!typing) {
- this.prevInput = this.textarea.value = ""
- if (ie && ie_version >= 9) { this.hasSelection = null }
- }
- this.inaccurateSelection = minimal
- },
-
- getField: function() { return this.textarea },
-
- supportsTouch: function() { return false },
-
- focus: function() {
- if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt() != this.textarea)) {
- try { this.textarea.focus() }
- catch (e) {} // IE8 will throw if the textarea is display: none or not in DOM
- }
- },
-
- blur: function() { this.textarea.blur() },
-
- resetPosition: function() {
- this.wrapper.style.top = this.wrapper.style.left = 0
- },
-
- receivedFocus: function() { this.slowPoll() },
-
- // Poll for input changes, using the normal rate of polling. This
- // runs as long as the editor is focused.
- slowPoll: function() {
- var this$1 = this;
-
- if (this.pollingFast) { return }
- this.polling.set(this.cm.options.pollInterval, function () {
- this$1.poll()
- if (this$1.cm.state.focused) { this$1.slowPoll() }
- })
- },
-
- // When an event has just come in that is likely to add or change
- // something in the input textarea, we poll faster, to ensure that
- // the change appears on the screen quickly.
- fastPoll: function() {
- var missed = false, input = this
- input.pollingFast = true
- function p() {
- var changed = input.poll()
- if (!changed && !missed) {missed = true; input.polling.set(60, p)}
- else {input.pollingFast = false; input.slowPoll()}
- }
- input.polling.set(20, p)
- },
-
- // Read input from the textarea, and update the document to match.
- // When something is selected, it is present in the textarea, and
- // selected (unless it is huge, in which case a placeholder is
- // used). When nothing is selected, the cursor sits after previously
- // seen text (can be empty), which is stored in prevInput (we must
- // not reset the textarea when typing, because that breaks IME).
- poll: function() {
- var this$1 = this;
-
- var cm = this.cm, input = this.textarea, prevInput = this.prevInput
- // Since this is called a *lot*, try to bail out as cheaply as
- // possible when it is clear that nothing happened. hasSelection
- // will be the case when there is a lot of text in the textarea,
- // in which case reading its value would be expensive.
- if (this.contextMenuPending || !cm.state.focused ||
- (hasSelection(input) && !prevInput && !this.composing) ||
- cm.isReadOnly() || cm.options.disableInput || cm.state.keySeq)
- { return false }
-
- var text = input.value
- // If nothing changed, bail.
- if (text == prevInput && !cm.somethingSelected()) { return false }
- // Work around nonsensical selection resetting in IE9/10, and
- // inexplicable appearance of private area unicode characters on
- // some key combos in Mac (#2689).
- if (ie && ie_version >= 9 && this.hasSelection === text ||
- mac && /[\uf700-\uf7ff]/.test(text)) {
- cm.display.input.reset()
- return false
- }
-
- if (cm.doc.sel == cm.display.selForContextMenu) {
- var first = text.charCodeAt(0)
- if (first == 0x200b && !prevInput) { prevInput = "\u200b" }
- if (first == 0x21da) { this.reset(); return this.cm.execCommand("undo") }
- }
- // Find the part of the input that is actually new
- var same = 0, l = Math.min(prevInput.length, text.length)
- while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) { ++same }
-
- runInOp(cm, function () {
- applyTextInput(cm, text.slice(same), prevInput.length - same,
- null, this$1.composing ? "*compose" : null)
-
- // Don't leave long text in the textarea, since it makes further polling slow
- if (text.length > 1000 || text.indexOf("\n") > -1) { input.value = this$1.prevInput = "" }
- else { this$1.prevInput = text }
-
- if (this$1.composing) {
- this$1.composing.range.clear()
- this$1.composing.range = cm.markText(this$1.composing.start, cm.getCursor("to"),
- {className: "CodeMirror-composing"})
- }
- })
- return true
- },
-
- ensurePolled: function() {
- if (this.pollingFast && this.poll()) { this.pollingFast = false }
- },
-
- onKeyPress: function() {
- if (ie && ie_version >= 9) { this.hasSelection = null }
- this.fastPoll()
- },
-
- onContextMenu: function(e) {
- var input = this, cm = input.cm, display = cm.display, te = input.textarea
- var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop
- if (!pos || presto) { return } // Opera is difficult.
-
- // Reset the current text selection only if the click is done outside of the selection
- // and 'resetSelectionOnContextMenu' option is true.
- var reset = cm.options.resetSelectionOnContextMenu
- if (reset && cm.doc.sel.contains(pos) == -1)
- { operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll) }
-
- var oldCSS = te.style.cssText, oldWrapperCSS = input.wrapper.style.cssText
- input.wrapper.style.cssText = "position: absolute"
- var wrapperBox = input.wrapper.getBoundingClientRect()
- te.style.cssText = "position: absolute; width: 30px; height: 30px;\n top: " + (e.clientY - wrapperBox.top - 5) + "px; left: " + (e.clientX - wrapperBox.left - 5) + "px;\n z-index: 1000; background: " + (ie ? "rgba(255, 255, 255, .05)" : "transparent") + ";\n outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);"
- var oldScrollY
- if (webkit) { oldScrollY = window.scrollY } // Work around Chrome issue (#2712)
- display.input.focus()
- if (webkit) { window.scrollTo(null, oldScrollY) }
- display.input.reset()
- // Adds "Select all" to context menu in FF
- if (!cm.somethingSelected()) { te.value = input.prevInput = " " }
- input.contextMenuPending = true
- display.selForContextMenu = cm.doc.sel
- clearTimeout(display.detectingSelectAll)
-
- // Select-all will be greyed out if there's nothing to select, so
- // this adds a zero-width space so that we can later check whether
- // it got selected.
- function prepareSelectAllHack() {
- if (te.selectionStart != null) {
- var selected = cm.somethingSelected()
- var extval = "\u200b" + (selected ? te.value : "")
- te.value = "\u21da" // Used to catch context-menu undo
- te.value = extval
- input.prevInput = selected ? "" : "\u200b"
- te.selectionStart = 1; te.selectionEnd = extval.length
- // Re-set this, in case some other handler touched the
- // selection in the meantime.
- display.selForContextMenu = cm.doc.sel
- }
- }
- function rehide() {
- input.contextMenuPending = false
- input.wrapper.style.cssText = oldWrapperCSS
- te.style.cssText = oldCSS
- if (ie && ie_version < 9) { display.scrollbars.setScrollTop(display.scroller.scrollTop = scrollPos) }
-
- // Try to detect the user choosing select-all
- if (te.selectionStart != null) {
- if (!ie || (ie && ie_version < 9)) { prepareSelectAllHack() }
- var i = 0, poll = function () {
- if (display.selForContextMenu == cm.doc.sel && te.selectionStart == 0 &&
- te.selectionEnd > 0 && input.prevInput == "\u200b")
- { operation(cm, selectAll)(cm) }
- else if (i++ < 10) { display.detectingSelectAll = setTimeout(poll, 500) }
- else { display.input.reset() }
- }
- display.detectingSelectAll = setTimeout(poll, 200)
- }
- }
-
- if (ie && ie_version >= 9) { prepareSelectAllHack() }
- if (captureRightClick) {
- e_stop(e)
- var mouseup = function () {
- off(window, "mouseup", mouseup)
- setTimeout(rehide, 20)
- }
- on(window, "mouseup", mouseup)
- } else {
- setTimeout(rehide, 50)
- }
- },
-
- readOnlyChanged: function(val) {
- if (!val) { this.reset() }
- },
-
- setUneditable: nothing,
-
- needsContentAttribute: false
-}, TextareaInput.prototype)
-
-function fromTextArea(textarea, options) {
- options = options ? copyObj(options) : {}
- options.value = textarea.value
- if (!options.tabindex && textarea.tabIndex)
- { options.tabindex = textarea.tabIndex }
- if (!options.placeholder && textarea.placeholder)
- { options.placeholder = textarea.placeholder }
- // Set autofocus to true if this textarea is focused, or if it has
- // autofocus and no other element is focused.
- if (options.autofocus == null) {
- var hasFocus = activeElt()
- options.autofocus = hasFocus == textarea ||
- textarea.getAttribute("autofocus") != null && hasFocus == document.body
- }
-
- function save() {textarea.value = cm.getValue()}
-
- var realSubmit
- if (textarea.form) {
- on(textarea.form, "submit", save)
- // Deplorable hack to make the submit method do the right thing.
- if (!options.leaveSubmitMethodAlone) {
- var form = textarea.form
- realSubmit = form.submit
- try {
- var wrappedSubmit = form.submit = function () {
- save()
- form.submit = realSubmit
- form.submit()
- form.submit = wrappedSubmit
- }
- } catch(e) {}
- }
- }
-
- options.finishInit = function (cm) {
- cm.save = save
- cm.getTextArea = function () { return textarea; }
- cm.toTextArea = function () {
- cm.toTextArea = isNaN // Prevent this from being ran twice
- save()
- textarea.parentNode.removeChild(cm.getWrapperElement())
- textarea.style.display = ""
- if (textarea.form) {
- off(textarea.form, "submit", save)
- if (typeof textarea.form.submit == "function")
- { textarea.form.submit = realSubmit }
- }
- }
- }
-
- textarea.style.display = "none"
- var cm = CodeMirror$1(function (node) { return textarea.parentNode.insertBefore(node, textarea.nextSibling); },
- options)
- return cm
-}
-
-function addLegacyProps(CodeMirror) {
- CodeMirror.off = off
- CodeMirror.on = on
- CodeMirror.wheelEventPixels = wheelEventPixels
- CodeMirror.Doc = Doc
- CodeMirror.splitLines = splitLinesAuto
- CodeMirror.countColumn = countColumn
- CodeMirror.findColumn = findColumn
- CodeMirror.isWordChar = isWordCharBasic
- CodeMirror.Pass = Pass
- CodeMirror.signal = signal
- CodeMirror.Line = Line
- CodeMirror.changeEnd = changeEnd
- CodeMirror.scrollbarModel = scrollbarModel
- CodeMirror.Pos = Pos
- CodeMirror.cmpPos = cmp
- CodeMirror.modes = modes
- CodeMirror.mimeModes = mimeModes
- CodeMirror.resolveMode = resolveMode
- CodeMirror.getMode = getMode
- CodeMirror.modeExtensions = modeExtensions
- CodeMirror.extendMode = extendMode
- CodeMirror.copyState = copyState
- CodeMirror.startState = startState
- CodeMirror.innerMode = innerMode
- CodeMirror.commands = commands
- CodeMirror.keyMap = keyMap
- CodeMirror.keyName = keyName
- CodeMirror.isModifierKey = isModifierKey
- CodeMirror.lookupKey = lookupKey
- CodeMirror.normalizeKeyMap = normalizeKeyMap
- CodeMirror.StringStream = StringStream
- CodeMirror.SharedTextMarker = SharedTextMarker
- CodeMirror.TextMarker = TextMarker
- CodeMirror.LineWidget = LineWidget
- CodeMirror.e_preventDefault = e_preventDefault
- CodeMirror.e_stopPropagation = e_stopPropagation
- CodeMirror.e_stop = e_stop
- CodeMirror.addClass = addClass
- CodeMirror.contains = contains
- CodeMirror.rmClass = rmClass
- CodeMirror.keyNames = keyNames
-}
-
-// EDITOR CONSTRUCTOR
-
-defineOptions(CodeMirror$1)
-
-addEditorMethods(CodeMirror$1)
-
-// Set up methods on CodeMirror's prototype to redirect to the editor's document.
-var dontDelegate = "iter insert remove copy getEditor constructor".split(" ")
-for (var prop in Doc.prototype) { if (Doc.prototype.hasOwnProperty(prop) && indexOf(dontDelegate, prop) < 0)
- { CodeMirror$1.prototype[prop] = (function(method) {
- return function() {return method.apply(this.doc, arguments)}
- })(Doc.prototype[prop]) } }
-
-eventMixin(Doc)
-
-// INPUT HANDLING
-
-CodeMirror$1.inputStyles = {"textarea": TextareaInput, "contenteditable": ContentEditableInput}
-
-// MODE DEFINITION AND QUERYING
-
-// Extra arguments are stored as the mode's dependencies, which is
-// used by (legacy) mechanisms like loadmode.js to automatically
-// load a mode. (Preferred mechanism is the require/define calls.)
-CodeMirror$1.defineMode = function(name/*, mode, …*/) {
- if (!CodeMirror$1.defaults.mode && name != "null") { CodeMirror$1.defaults.mode = name }
- defineMode.apply(this, arguments)
-}
-
-CodeMirror$1.defineMIME = defineMIME
-
-// Minimal default mode.
-CodeMirror$1.defineMode("null", function () { return ({token: function (stream) { return stream.skipToEnd(); }}); })
-CodeMirror$1.defineMIME("text/plain", "null")
-
-// EXTENSIONS
-
-CodeMirror$1.defineExtension = function (name, func) {
- CodeMirror$1.prototype[name] = func
-}
-CodeMirror$1.defineDocExtension = function (name, func) {
- Doc.prototype[name] = func
-}
-
-CodeMirror$1.fromTextArea = fromTextArea
-
-addLegacyProps(CodeMirror$1)
-
-CodeMirror$1.version = "5.20.2"
-
-return CodeMirror$1;
-
-})));
diff --git a/WebContent/addon/codemirror/mode/index.html b/WebContent/addon/codemirror/mode/index.html
deleted file mode 100644
index 3a2fe55..0000000
--- a/WebContent/addon/codemirror/mode/index.html
+++ /dev/null
@@ -1,164 +0,0 @@
-
-
-CodeMirror: Language Modes
-
-
- Language modes
-
- This is a list of every mode in the distribution. Each mode lives
-in a subdirectory of the mode/ directory, and typically
-defines a single JavaScript file that implements the mode. Loading
-such file will make the language available to CodeMirror, through
-the mode
-
-
-
-
diff --git a/WebContent/addon/codemirror/mode/javascript/index.html b/WebContent/addon/codemirror/mode/javascript/index.html
deleted file mode 100644
index 592a133..0000000
--- a/WebContent/addon/codemirror/mode/javascript/index.html
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
-CodeMirror: JavaScript mode
-
-JavaScript mode
-
-
-
-
-
-
-
- JavaScript mode supports several configuration options:
-
- json which will set the mode to expect JSON
- data rather than a JavaScript program.jsonld which will set the mode to expect
- JSON-LD linked data rather
- than a JavaScript program (demo ).typescript which will activate additional
- syntax highlighting and some other things for TypeScript code
- (demo ).statementIndent which (given a number) will
- determine the amount of indentation to use for statements
- continued on a new line.wordCharacters, a regexp that indicates which
- characters should be considered part of an identifier.
- Defaults to /[\w$]/, which does not handle
- non-ASCII identifiers. Can be set to something more elaborate
- to improve Unicode support.
-
-
- MIME types defined: text/javascript, application/json, application/ld+json, text/typescript, application/typescript.
-
diff --git a/WebContent/addon/codemirror/mode/javascript/javascript.js b/WebContent/addon/codemirror/mode/javascript/javascript.js
deleted file mode 100644
index a717745..0000000
--- a/WebContent/addon/codemirror/mode/javascript/javascript.js
+++ /dev/null
@@ -1,784 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
- if (typeof exports == "object" && typeof module == "object") // CommonJS
- mod(require("../../lib/codemirror"));
- else if (typeof define == "function" && define.amd) // AMD
- define(["../../lib/codemirror"], mod);
- else // Plain browser env
- mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-function expressionAllowed(stream, state, backUp) {
- return /^(?:operator|sof|keyword c|case|new|[\[{}\(,;:]|=>)$/.test(state.lastType) ||
- (state.lastType == "quasi" && /\{\s*$/.test(stream.string.slice(0, stream.pos - (backUp || 0))))
-}
-
-CodeMirror.defineMode("javascript", function(config, parserConfig) {
- var indentUnit = config.indentUnit;
- var statementIndent = parserConfig.statementIndent;
- var jsonldMode = parserConfig.jsonld;
- var jsonMode = parserConfig.json || jsonldMode;
- var isTS = parserConfig.typescript;
- var wordRE = parserConfig.wordCharacters || /[\w$\xa1-\uffff]/;
-
- // Tokenizer
-
- var keywords = function(){
- function kw(type) {return {type: type, style: "keyword"};}
- var A = kw("keyword a"), B = kw("keyword b"), C = kw("keyword c");
- var operator = kw("operator"), atom = {type: "atom", style: "atom"};
-
- var jsKeywords = {
- "if": kw("if"), "while": A, "with": A, "else": B, "do": B, "try": B, "finally": B,
- "return": C, "break": C, "continue": C, "new": kw("new"), "delete": C, "throw": C, "debugger": C,
- "var": kw("var"), "const": kw("var"), "let": kw("var"),
- "function": kw("function"), "catch": kw("catch"),
- "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"),
- "in": operator, "typeof": operator, "instanceof": operator,
- "true": atom, "false": atom, "null": atom, "undefined": atom, "NaN": atom, "Infinity": atom,
- "this": kw("this"), "class": kw("class"), "super": kw("atom"),
- "yield": C, "export": kw("export"), "import": kw("import"), "extends": C,
- "await": C, "async": kw("async")
- };
-
- // Extend the 'normal' keywords with the TypeScript language extensions
- if (isTS) {
- var type = {type: "variable", style: "variable-3"};
- var tsKeywords = {
- // object-like things
- "interface": kw("class"),
- "implements": C,
- "namespace": C,
- "module": kw("module"),
- "enum": kw("module"),
- "type": kw("type"),
-
- // scope modifiers
- "public": kw("modifier"),
- "private": kw("modifier"),
- "protected": kw("modifier"),
- "abstract": kw("modifier"),
-
- // operators
- "as": operator,
-
- // types
- "string": type, "number": type, "boolean": type, "any": type
- };
-
- for (var attr in tsKeywords) {
- jsKeywords[attr] = tsKeywords[attr];
- }
- }
-
- return jsKeywords;
- }();
-
- var isOperatorChar = /[+\-*&%=<>!?|~^]/;
- var isJsonldKeyword = /^@(context|id|value|language|type|container|list|set|reverse|index|base|vocab|graph)"/;
-
- function readRegexp(stream) {
- var escaped = false, next, inSet = false;
- while ((next = stream.next()) != null) {
- if (!escaped) {
- if (next == "/" && !inSet) return;
- if (next == "[") inSet = true;
- else if (inSet && next == "]") inSet = false;
- }
- escaped = !escaped && next == "\\";
- }
- }
-
- // Used as scratch variables to communicate multiple values without
- // consing up tons of objects.
- var type, content;
- function ret(tp, style, cont) {
- type = tp; content = cont;
- return style;
- }
- function tokenBase(stream, state) {
- var ch = stream.next();
- if (ch == '"' || ch == "'") {
- state.tokenize = tokenString(ch);
- return state.tokenize(stream, state);
- } else if (ch == "." && stream.match(/^\d+(?:[eE][+\-]?\d+)?/)) {
- return ret("number", "number");
- } else if (ch == "." && stream.match("..")) {
- return ret("spread", "meta");
- } else if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
- return ret(ch);
- } else if (ch == "=" && stream.eat(">")) {
- return ret("=>", "operator");
- } else if (ch == "0" && stream.eat(/x/i)) {
- stream.eatWhile(/[\da-f]/i);
- return ret("number", "number");
- } else if (ch == "0" && stream.eat(/o/i)) {
- stream.eatWhile(/[0-7]/i);
- return ret("number", "number");
- } else if (ch == "0" && stream.eat(/b/i)) {
- stream.eatWhile(/[01]/i);
- return ret("number", "number");
- } else if (/\d/.test(ch)) {
- stream.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/);
- return ret("number", "number");
- } else if (ch == "/") {
- if (stream.eat("*")) {
- state.tokenize = tokenComment;
- return tokenComment(stream, state);
- } else if (stream.eat("/")) {
- stream.skipToEnd();
- return ret("comment", "comment");
- } else if (expressionAllowed(stream, state, 1)) {
- readRegexp(stream);
- stream.match(/^\b(([gimyu])(?![gimyu]*\2))+\b/);
- return ret("regexp", "string-2");
- } else {
- stream.eatWhile(isOperatorChar);
- return ret("operator", "operator", stream.current());
- }
- } else if (ch == "`") {
- state.tokenize = tokenQuasi;
- return tokenQuasi(stream, state);
- } else if (ch == "#") {
- stream.skipToEnd();
- return ret("error", "error");
- } else if (isOperatorChar.test(ch)) {
- stream.eatWhile(isOperatorChar);
- return ret("operator", "operator", stream.current());
- } else if (wordRE.test(ch)) {
- stream.eatWhile(wordRE);
- var word = stream.current(), known = keywords.propertyIsEnumerable(word) && keywords[word];
- return (known && state.lastType != ".") ? ret(known.type, known.style, word) :
- ret("variable", "variable", word);
- }
- }
-
- function tokenString(quote) {
- return function(stream, state) {
- var escaped = false, next;
- if (jsonldMode && stream.peek() == "@" && stream.match(isJsonldKeyword)){
- state.tokenize = tokenBase;
- return ret("jsonld-keyword", "meta");
- }
- while ((next = stream.next()) != null) {
- if (next == quote && !escaped) break;
- escaped = !escaped && next == "\\";
- }
- if (!escaped) state.tokenize = tokenBase;
- return ret("string", "string");
- };
- }
-
- function tokenComment(stream, state) {
- var maybeEnd = false, ch;
- while (ch = stream.next()) {
- if (ch == "/" && maybeEnd) {
- state.tokenize = tokenBase;
- break;
- }
- maybeEnd = (ch == "*");
- }
- return ret("comment", "comment");
- }
-
- function tokenQuasi(stream, state) {
- var escaped = false, next;
- while ((next = stream.next()) != null) {
- if (!escaped && (next == "`" || next == "$" && stream.eat("{"))) {
- state.tokenize = tokenBase;
- break;
- }
- escaped = !escaped && next == "\\";
- }
- return ret("quasi", "string-2", stream.current());
- }
-
- var brackets = "([{}])";
- // This is a crude lookahead trick to try and notice that we're
- // parsing the argument patterns for a fat-arrow function before we
- // actually hit the arrow token. It only works if the arrow is on
- // the same line as the arguments and there's no strange noise
- // (comments) in between. Fallback is to only notice when we hit the
- // arrow, and not declare the arguments as locals for the arrow
- // body.
- function findFatArrow(stream, state) {
- if (state.fatArrowAt) state.fatArrowAt = null;
- var arrow = stream.string.indexOf("=>", stream.start);
- if (arrow < 0) return;
-
- if (isTS) { // Try to skip TypeScript return type declarations after the arguments
- var m = /:\s*(?:\w+(?:<[^>]*>|\[\])?|\{[^}]*\})\s*$/.exec(stream.string.slice(stream.start, arrow))
- if (m) arrow = m.index
- }
-
- var depth = 0, sawSomething = false;
- for (var pos = arrow - 1; pos >= 0; --pos) {
- var ch = stream.string.charAt(pos);
- var bracket = brackets.indexOf(ch);
- if (bracket >= 0 && bracket < 3) {
- if (!depth) { ++pos; break; }
- if (--depth == 0) { if (ch == "(") sawSomething = true; break; }
- } else if (bracket >= 3 && bracket < 6) {
- ++depth;
- } else if (wordRE.test(ch)) {
- sawSomething = true;
- } else if (/["'\/]/.test(ch)) {
- return;
- } else if (sawSomething && !depth) {
- ++pos;
- break;
- }
- }
- if (sawSomething && !depth) state.fatArrowAt = pos;
- }
-
- // Parser
-
- var atomicTypes = {"atom": true, "number": true, "variable": true, "string": true, "regexp": true, "this": true, "jsonld-keyword": true};
-
- function JSLexical(indented, column, type, align, prev, info) {
- this.indented = indented;
- this.column = column;
- this.type = type;
- this.prev = prev;
- this.info = info;
- if (align != null) this.align = align;
- }
-
- function inScope(state, varname) {
- for (var v = state.localVars; v; v = v.next)
- if (v.name == varname) return true;
- for (var cx = state.context; cx; cx = cx.prev) {
- for (var v = cx.vars; v; v = v.next)
- if (v.name == varname) return true;
- }
- }
-
- function parseJS(state, style, type, content, stream) {
- var cc = state.cc;
- // Communicate our context to the combinators.
- // (Less wasteful than consing up a hundred closures on every call.)
- cx.state = state; cx.stream = stream; cx.marked = null, cx.cc = cc; cx.style = style;
-
- if (!state.lexical.hasOwnProperty("align"))
- state.lexical.align = true;
-
- while(true) {
- var combinator = cc.length ? cc.pop() : jsonMode ? expression : statement;
- if (combinator(type, content)) {
- while(cc.length && cc[cc.length - 1].lex)
- cc.pop()();
- if (cx.marked) return cx.marked;
- if (type == "variable" && inScope(state, content)) return "variable-2";
- return style;
- }
- }
- }
-
- // Combinator utils
-
- var cx = {state: null, column: null, marked: null, cc: null};
- function pass() {
- for (var i = arguments.length - 1; i >= 0; i--) cx.cc.push(arguments[i]);
- }
- function cont() {
- pass.apply(null, arguments);
- return true;
- }
- function register(varname) {
- function inList(list) {
- for (var v = list; v; v = v.next)
- if (v.name == varname) return true;
- return false;
- }
- var state = cx.state;
- cx.marked = "def";
- if (state.context) {
- if (inList(state.localVars)) return;
- state.localVars = {name: varname, next: state.localVars};
- } else {
- if (inList(state.globalVars)) return;
- if (parserConfig.globalVars)
- state.globalVars = {name: varname, next: state.globalVars};
- }
- }
-
- // Combinators
-
- var defaultVars = {name: "this", next: {name: "arguments"}};
- function pushcontext() {
- cx.state.context = {prev: cx.state.context, vars: cx.state.localVars};
- cx.state.localVars = defaultVars;
- }
- function popcontext() {
- cx.state.localVars = cx.state.context.vars;
- cx.state.context = cx.state.context.prev;
- }
- function pushlex(type, info) {
- var result = function() {
- var state = cx.state, indent = state.indented;
- if (state.lexical.type == "stat") indent = state.lexical.indented;
- else for (var outer = state.lexical; outer && outer.type == ")" && outer.align; outer = outer.prev)
- indent = outer.indented;
- state.lexical = new JSLexical(indent, cx.stream.column(), type, null, state.lexical, info);
- };
- result.lex = true;
- return result;
- }
- function poplex() {
- var state = cx.state;
- if (state.lexical.prev) {
- if (state.lexical.type == ")")
- state.indented = state.lexical.indented;
- state.lexical = state.lexical.prev;
- }
- }
- poplex.lex = true;
-
- function expect(wanted) {
- function exp(type) {
- if (type == wanted) return cont();
- else if (wanted == ";") return pass();
- else return cont(exp);
- };
- return exp;
- }
-
- function statement(type, value) {
- if (type == "var") return cont(pushlex("vardef", value.length), vardef, expect(";"), poplex);
- if (type == "keyword a") return cont(pushlex("form"), parenExpr, statement, poplex);
- if (type == "keyword b") return cont(pushlex("form"), statement, poplex);
- if (type == "{") return cont(pushlex("}"), block, poplex);
- if (type == ";") return cont();
- if (type == "if") {
- if (cx.state.lexical.info == "else" && cx.state.cc[cx.state.cc.length - 1] == poplex)
- cx.state.cc.pop()();
- return cont(pushlex("form"), parenExpr, statement, poplex, maybeelse);
- }
- if (type == "function") return cont(functiondef);
- if (type == "for") return cont(pushlex("form"), forspec, statement, poplex);
- if (type == "variable") return cont(pushlex("stat"), maybelabel);
- if (type == "switch") return cont(pushlex("form"), parenExpr, pushlex("}", "switch"), expect("{"),
- block, poplex, poplex);
- if (type == "case") return cont(expression, expect(":"));
- if (type == "default") return cont(expect(":"));
- if (type == "catch") return cont(pushlex("form"), pushcontext, expect("("), funarg, expect(")"),
- statement, poplex, popcontext);
- if (type == "class") return cont(pushlex("form"), className, poplex);
- if (type == "export") return cont(pushlex("stat"), afterExport, poplex);
- if (type == "import") return cont(pushlex("stat"), afterImport, poplex);
- if (type == "module") return cont(pushlex("form"), pattern, pushlex("}"), expect("{"), block, poplex, poplex)
- if (type == "type") return cont(typeexpr, expect("operator"), typeexpr, expect(";"));
- if (type == "async") return cont(statement)
- return pass(pushlex("stat"), expression, expect(";"), poplex);
- }
- function expression(type) {
- return expressionInner(type, false);
- }
- function expressionNoComma(type) {
- return expressionInner(type, true);
- }
- function parenExpr(type) {
- if (type != "(") return pass()
- return cont(pushlex(")"), expression, expect(")"), poplex)
- }
- function expressionInner(type, noComma) {
- if (cx.state.fatArrowAt == cx.stream.start) {
- var body = noComma ? arrowBodyNoComma : arrowBody;
- if (type == "(") return cont(pushcontext, pushlex(")"), commasep(pattern, ")"), poplex, expect("=>"), body, popcontext);
- else if (type == "variable") return pass(pushcontext, pattern, expect("=>"), body, popcontext);
- }
-
- var maybeop = noComma ? maybeoperatorNoComma : maybeoperatorComma;
- if (atomicTypes.hasOwnProperty(type)) return cont(maybeop);
- if (type == "function") return cont(functiondef, maybeop);
- if (type == "class") return cont(pushlex("form"), classExpression, poplex);
- if (type == "keyword c" || type == "async") return cont(noComma ? maybeexpressionNoComma : maybeexpression);
- if (type == "(") return cont(pushlex(")"), maybeexpression, expect(")"), poplex, maybeop);
- if (type == "operator" || type == "spread") return cont(noComma ? expressionNoComma : expression);
- if (type == "[") return cont(pushlex("]"), arrayLiteral, poplex, maybeop);
- if (type == "{") return contCommasep(objprop, "}", null, maybeop);
- if (type == "quasi") return pass(quasi, maybeop);
- if (type == "new") return cont(maybeTarget(noComma));
- return cont();
- }
- function maybeexpression(type) {
- if (type.match(/[;\}\)\],]/)) return pass();
- return pass(expression);
- }
- function maybeexpressionNoComma(type) {
- if (type.match(/[;\}\)\],]/)) return pass();
- return pass(expressionNoComma);
- }
-
- function maybeoperatorComma(type, value) {
- if (type == ",") return cont(expression);
- return maybeoperatorNoComma(type, value, false);
- }
- function maybeoperatorNoComma(type, value, noComma) {
- var me = noComma == false ? maybeoperatorComma : maybeoperatorNoComma;
- var expr = noComma == false ? expression : expressionNoComma;
- if (type == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext);
- if (type == "operator") {
- if (/\+\+|--/.test(value)) return cont(me);
- if (value == "?") return cont(expression, expect(":"), expr);
- return cont(expr);
- }
- if (type == "quasi") { return pass(quasi, me); }
- if (type == ";") return;
- if (type == "(") return contCommasep(expressionNoComma, ")", "call", me);
- if (type == ".") return cont(property, me);
- if (type == "[") return cont(pushlex("]"), maybeexpression, expect("]"), poplex, me);
- }
- function quasi(type, value) {
- if (type != "quasi") return pass();
- if (value.slice(value.length - 2) != "${") return cont(quasi);
- return cont(expression, continueQuasi);
- }
- function continueQuasi(type) {
- if (type == "}") {
- cx.marked = "string-2";
- cx.state.tokenize = tokenQuasi;
- return cont(quasi);
- }
- }
- function arrowBody(type) {
- findFatArrow(cx.stream, cx.state);
- return pass(type == "{" ? statement : expression);
- }
- function arrowBodyNoComma(type) {
- findFatArrow(cx.stream, cx.state);
- return pass(type == "{" ? statement : expressionNoComma);
- }
- function maybeTarget(noComma) {
- return function(type) {
- if (type == ".") return cont(noComma ? targetNoComma : target);
- else return pass(noComma ? expressionNoComma : expression);
- };
- }
- function target(_, value) {
- if (value == "target") { cx.marked = "keyword"; return cont(maybeoperatorComma); }
- }
- function targetNoComma(_, value) {
- if (value == "target") { cx.marked = "keyword"; return cont(maybeoperatorNoComma); }
- }
- function maybelabel(type) {
- if (type == ":") return cont(poplex, statement);
- return pass(maybeoperatorComma, expect(";"), poplex);
- }
- function property(type) {
- if (type == "variable") {cx.marked = "property"; return cont();}
- }
- function objprop(type, value) {
- if (type == "async") {
- cx.marked = "property";
- return cont(objprop);
- } else if (type == "variable" || cx.style == "keyword") {
- cx.marked = "property";
- if (value == "get" || value == "set") return cont(getterSetter);
- return cont(afterprop);
- } else if (type == "number" || type == "string") {
- cx.marked = jsonldMode ? "property" : (cx.style + " property");
- return cont(afterprop);
- } else if (type == "jsonld-keyword") {
- return cont(afterprop);
- } else if (type == "modifier") {
- return cont(objprop)
- } else if (type == "[") {
- return cont(expression, expect("]"), afterprop);
- } else if (type == "spread") {
- return cont(expression);
- } else if (type == ":") {
- return pass(afterprop)
- }
- }
- function getterSetter(type) {
- if (type != "variable") return pass(afterprop);
- cx.marked = "property";
- return cont(functiondef);
- }
- function afterprop(type) {
- if (type == ":") return cont(expressionNoComma);
- if (type == "(") return pass(functiondef);
- }
- function commasep(what, end) {
- function proceed(type, value) {
- if (type == ",") {
- var lex = cx.state.lexical;
- if (lex.info == "call") lex.pos = (lex.pos || 0) + 1;
- return cont(function(type, value) {
- if (type == end || value == end) return pass()
- return pass(what)
- }, proceed);
- }
- if (type == end || value == end) return cont();
- return cont(expect(end));
- }
- return function(type, value) {
- if (type == end || value == end) return cont();
- return pass(what, proceed);
- };
- }
- function contCommasep(what, end, info) {
- for (var i = 3; i < arguments.length; i++)
- cx.cc.push(arguments[i]);
- return cont(pushlex(end, info), commasep(what, end), poplex);
- }
- function block(type) {
- if (type == "}") return cont();
- return pass(statement, block);
- }
- function maybetype(type, value) {
- if (isTS) {
- if (type == ":") return cont(typeexpr);
- if (value == "?") return cont(maybetype);
- }
- }
- function typeexpr(type) {
- if (type == "variable") {cx.marked = "variable-3"; return cont(afterType);}
- if (type == "{") return cont(commasep(typeprop, "}"))
- if (type == "(") return cont(commasep(typearg, ")"), maybeReturnType)
- }
- function maybeReturnType(type) {
- if (type == "=>") return cont(typeexpr)
- }
- function typeprop(type) {
- if (type == "variable" || cx.style == "keyword") {
- cx.marked = "property"
- return cont(typeprop)
- } else if (type == ":") {
- return cont(typeexpr)
- }
- }
- function typearg(type) {
- if (type == "variable") return cont(typearg)
- else if (type == ":") return cont(typeexpr)
- }
- function afterType(type, value) {
- if (value == "<") return cont(commasep(typeexpr, ">"), afterType)
- if (type == "[") return cont(expect("]"), afterType)
- }
- function vardef() {
- return pass(pattern, maybetype, maybeAssign, vardefCont);
- }
- function pattern(type, value) {
- if (type == "modifier") return cont(pattern)
- if (type == "variable") { register(value); return cont(); }
- if (type == "spread") return cont(pattern);
- if (type == "[") return contCommasep(pattern, "]");
- if (type == "{") return contCommasep(proppattern, "}");
- }
- function proppattern(type, value) {
- if (type == "variable" && !cx.stream.match(/^\s*:/, false)) {
- register(value);
- return cont(maybeAssign);
- }
- if (type == "variable") cx.marked = "property";
- if (type == "spread") return cont(pattern);
- if (type == "}") return pass();
- return cont(expect(":"), pattern, maybeAssign);
- }
- function maybeAssign(_type, value) {
- if (value == "=") return cont(expressionNoComma);
- }
- function vardefCont(type) {
- if (type == ",") return cont(vardef);
- }
- function maybeelse(type, value) {
- if (type == "keyword b" && value == "else") return cont(pushlex("form", "else"), statement, poplex);
- }
- function forspec(type) {
- if (type == "(") return cont(pushlex(")"), forspec1, expect(")"), poplex);
- }
- function forspec1(type) {
- if (type == "var") return cont(vardef, expect(";"), forspec2);
- if (type == ";") return cont(forspec2);
- if (type == "variable") return cont(formaybeinof);
- return pass(expression, expect(";"), forspec2);
- }
- function formaybeinof(_type, value) {
- if (value == "in" || value == "of") { cx.marked = "keyword"; return cont(expression); }
- return cont(maybeoperatorComma, forspec2);
- }
- function forspec2(type, value) {
- if (type == ";") return cont(forspec3);
- if (value == "in" || value == "of") { cx.marked = "keyword"; return cont(expression); }
- return pass(expression, expect(";"), forspec3);
- }
- function forspec3(type) {
- if (type != ")") cont(expression);
- }
- function functiondef(type, value) {
- if (value == "*") {cx.marked = "keyword"; return cont(functiondef);}
- if (type == "variable") {register(value); return cont(functiondef);}
- if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, maybetype, statement, popcontext);
- }
- function funarg(type) {
- if (type == "spread") return cont(funarg);
- return pass(pattern, maybetype, maybeAssign);
- }
- function classExpression(type, value) {
- // Class expressions may have an optional name.
- if (type == "variable") return className(type, value);
- return classNameAfter(type, value);
- }
- function className(type, value) {
- if (type == "variable") {register(value); return cont(classNameAfter);}
- }
- function classNameAfter(type, value) {
- if (value == "extends" || value == "implements") return cont(isTS ? typeexpr : expression, classNameAfter);
- if (type == "{") return cont(pushlex("}"), classBody, poplex);
- }
- function classBody(type, value) {
- if (type == "variable" || cx.style == "keyword") {
- if ((value == "static" || value == "get" || value == "set" ||
- (isTS && (value == "public" || value == "private" || value == "protected" || value == "readonly" || value == "abstract"))) &&
- cx.stream.match(/^\s+[\w$\xa1-\uffff]/, false)) {
- cx.marked = "keyword";
- return cont(classBody);
- }
- cx.marked = "property";
- return cont(isTS ? classfield : functiondef, classBody);
- }
- if (value == "*") {
- cx.marked = "keyword";
- return cont(classBody);
- }
- if (type == ";") return cont(classBody);
- if (type == "}") return cont();
- }
- function classfield(type, value) {
- if (value == "?") return cont(classfield)
- if (type == ":") return cont(typeexpr, maybeAssign)
- return pass(functiondef)
- }
- function afterExport(_type, value) {
- if (value == "*") { cx.marked = "keyword"; return cont(maybeFrom, expect(";")); }
- if (value == "default") { cx.marked = "keyword"; return cont(expression, expect(";")); }
- return pass(statement);
- }
- function afterImport(type) {
- if (type == "string") return cont();
- return pass(importSpec, maybeFrom);
- }
- function importSpec(type, value) {
- if (type == "{") return contCommasep(importSpec, "}");
- if (type == "variable") register(value);
- if (value == "*") cx.marked = "keyword";
- return cont(maybeAs);
- }
- function maybeAs(_type, value) {
- if (value == "as") { cx.marked = "keyword"; return cont(importSpec); }
- }
- function maybeFrom(_type, value) {
- if (value == "from") { cx.marked = "keyword"; return cont(expression); }
- }
- function arrayLiteral(type) {
- if (type == "]") return cont();
- return pass(commasep(expressionNoComma, "]"));
- }
-
- function isContinuedStatement(state, textAfter) {
- return state.lastType == "operator" || state.lastType == "," ||
- isOperatorChar.test(textAfter.charAt(0)) ||
- /[,.]/.test(textAfter.charAt(0));
- }
-
- // Interface
-
- return {
- startState: function(basecolumn) {
- var state = {
- tokenize: tokenBase,
- lastType: "sof",
- cc: [],
- lexical: new JSLexical((basecolumn || 0) - indentUnit, 0, "block", false),
- localVars: parserConfig.localVars,
- context: parserConfig.localVars && {vars: parserConfig.localVars},
- indented: basecolumn || 0
- };
- if (parserConfig.globalVars && typeof parserConfig.globalVars == "object")
- state.globalVars = parserConfig.globalVars;
- return state;
- },
-
- token: function(stream, state) {
- if (stream.sol()) {
- if (!state.lexical.hasOwnProperty("align"))
- state.lexical.align = false;
- state.indented = stream.indentation();
- findFatArrow(stream, state);
- }
- if (state.tokenize != tokenComment && stream.eatSpace()) return null;
- var style = state.tokenize(stream, state);
- if (type == "comment") return style;
- state.lastType = type == "operator" && (content == "++" || content == "--") ? "incdec" : type;
- return parseJS(state, style, type, content, stream);
- },
-
- indent: function(state, textAfter) {
- if (state.tokenize == tokenComment) return CodeMirror.Pass;
- if (state.tokenize != tokenBase) return 0;
- var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical, top
- // Kludge to prevent 'maybelse' from blocking lexical scope pops
- if (!/^\s*else\b/.test(textAfter)) for (var i = state.cc.length - 1; i >= 0; --i) {
- var c = state.cc[i];
- if (c == poplex) lexical = lexical.prev;
- else if (c != maybeelse) break;
- }
- while ((lexical.type == "stat" || lexical.type == "form") &&
- (firstChar == "}" || ((top = state.cc[state.cc.length - 1]) &&
- (top == maybeoperatorComma || top == maybeoperatorNoComma) &&
- !/^[,\.=+\-*:?[\(]/.test(textAfter))))
- lexical = lexical.prev;
- if (statementIndent && lexical.type == ")" && lexical.prev.type == "stat")
- lexical = lexical.prev;
- var type = lexical.type, closing = firstChar == type;
-
- if (type == "vardef") return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? lexical.info + 1 : 0);
- else if (type == "form" && firstChar == "{") return lexical.indented;
- else if (type == "form") return lexical.indented + indentUnit;
- else if (type == "stat")
- return lexical.indented + (isContinuedStatement(state, textAfter) ? statementIndent || indentUnit : 0);
- else if (lexical.info == "switch" && !closing && parserConfig.doubleIndentSwitch != false)
- return lexical.indented + (/^(?:case|default)\b/.test(textAfter) ? indentUnit : 2 * indentUnit);
- else if (lexical.align) return lexical.column + (closing ? 0 : 1);
- else return lexical.indented + (closing ? 0 : indentUnit);
- },
-
- electricInput: /^\s*(?:case .*?:|default:|\{|\})$/,
- blockCommentStart: jsonMode ? null : "/*",
- blockCommentEnd: jsonMode ? null : "*/",
- lineComment: jsonMode ? null : "//",
- fold: "brace",
- closeBrackets: "()[]{}''\"\"``",
-
- helperType: jsonMode ? "json" : "javascript",
- jsonldMode: jsonldMode,
- jsonMode: jsonMode,
-
- expressionAllowed: expressionAllowed,
- skipExpression: function(state) {
- var top = state.cc[state.cc.length - 1]
- if (top == expression || top == expressionNoComma) state.cc.pop()
- }
- };
-});
-
-CodeMirror.registerHelper("wordChars", "javascript", /[\w$]/);
-
-CodeMirror.defineMIME("text/javascript", "javascript");
-CodeMirror.defineMIME("text/ecmascript", "javascript");
-CodeMirror.defineMIME("application/javascript", "javascript");
-CodeMirror.defineMIME("application/x-javascript", "javascript");
-CodeMirror.defineMIME("application/ecmascript", "javascript");
-CodeMirror.defineMIME("application/json", {name: "javascript", json: true});
-CodeMirror.defineMIME("application/x-json", {name: "javascript", json: true});
-CodeMirror.defineMIME("application/ld+json", {name: "javascript", jsonld: true});
-CodeMirror.defineMIME("text/typescript", { name: "javascript", typescript: true });
-CodeMirror.defineMIME("application/typescript", { name: "javascript", typescript: true });
-
-});
diff --git a/WebContent/addon/codemirror/mode/javascript/json-ld.html b/WebContent/addon/codemirror/mode/javascript/json-ld.html
deleted file mode 100644
index 3a37f0b..0000000
--- a/WebContent/addon/codemirror/mode/javascript/json-ld.html
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-CodeMirror: JSON-LD mode
-
-JSON-LD mode
-
-
-
-
-
-
- This is a specialization of the JavaScript mode .
-
diff --git a/WebContent/addon/codemirror/mode/javascript/test.js b/WebContent/addon/codemirror/mode/javascript/test.js
deleted file mode 100644
index 41765e7..0000000
--- a/WebContent/addon/codemirror/mode/javascript/test.js
+++ /dev/null
@@ -1,247 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function() {
- var mode = CodeMirror.getMode({indentUnit: 2}, "javascript");
- function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
-
- MT("locals",
- "[keyword function] [def foo]([def a], [def b]) { [keyword var] [def c] [operator =] [number 10]; [keyword return] [variable-2 a] [operator +] [variable-2 c] [operator +] [variable d]; }");
-
- MT("comma-and-binop",
- "[keyword function](){ [keyword var] [def x] [operator =] [number 1] [operator +] [number 2], [def y]; }");
-
- MT("destructuring",
- "([keyword function]([def a], [[[def b], [def c] ]]) {",
- " [keyword let] {[def d], [property foo]: [def c][operator =][number 10], [def x]} [operator =] [variable foo]([variable-2 a]);",
- " [[[variable-2 c], [variable y] ]] [operator =] [variable-2 c];",
- "})();");
-
- MT("destructure_trailing_comma",
- "[keyword let] {[def a], [def b],} [operator =] [variable foo];",
- "[keyword let] [def c];"); // Parser still in good state?
-
- MT("class_body",
- "[keyword class] [def Foo] {",
- " [property constructor]() {}",
- " [property sayName]() {",
- " [keyword return] [string-2 `foo${][variable foo][string-2 }oo`];",
- " }",
- "}");
-
- MT("class",
- "[keyword class] [def Point] [keyword extends] [variable SuperThing] {",
- " [keyword get] [property prop]() { [keyword return] [number 24]; }",
- " [property constructor]([def x], [def y]) {",
- " [keyword super]([string 'something']);",
- " [keyword this].[property x] [operator =] [variable-2 x];",
- " }",
- "}");
-
- MT("anonymous_class_expression",
- "[keyword const] [def Adder] [operator =] [keyword class] [keyword extends] [variable Arithmetic] {",
- " [property add]([def a], [def b]) {}",
- "};");
-
- MT("named_class_expression",
- "[keyword const] [def Subber] [operator =] [keyword class] [def Subtract] {",
- " [property sub]([def a], [def b]) {}",
- "};");
-
- MT("import",
- "[keyword function] [def foo]() {",
- " [keyword import] [def $] [keyword from] [string 'jquery'];",
- " [keyword import] { [def encrypt], [def decrypt] } [keyword from] [string 'crypto'];",
- "}");
-
- MT("import_trailing_comma",
- "[keyword import] {[def foo], [def bar],} [keyword from] [string 'baz']")
-
- MT("const",
- "[keyword function] [def f]() {",
- " [keyword const] [[ [def a], [def b] ]] [operator =] [[ [number 1], [number 2] ]];",
- "}");
-
- MT("for/of",
- "[keyword for]([keyword let] [def of] [keyword of] [variable something]) {}");
-
- MT("generator",
- "[keyword function*] [def repeat]([def n]) {",
- " [keyword for]([keyword var] [def i] [operator =] [number 0]; [variable-2 i] [operator <] [variable-2 n]; [operator ++][variable-2 i])",
- " [keyword yield] [variable-2 i];",
- "}");
-
- MT("quotedStringAddition",
- "[keyword let] [def f] [operator =] [variable a] [operator +] [string 'fatarrow'] [operator +] [variable c];");
-
- MT("quotedFatArrow",
- "[keyword let] [def f] [operator =] [variable a] [operator +] [string '=>'] [operator +] [variable c];");
-
- MT("fatArrow",
- "[variable array].[property filter]([def a] [operator =>] [variable-2 a] [operator +] [number 1]);",
- "[variable a];", // No longer in scope
- "[keyword let] [def f] [operator =] ([[ [def a], [def b] ]], [def c]) [operator =>] [variable-2 a] [operator +] [variable-2 c];",
- "[variable c];");
-
- MT("spread",
- "[keyword function] [def f]([def a], [meta ...][def b]) {",
- " [variable something]([variable-2 a], [meta ...][variable-2 b]);",
- "}");
-
- MT("quasi",
- "[variable re][string-2 `fofdlakj${][variable x] [operator +] ([variable re][string-2 `foo`]) [operator +] [number 1][string-2 }fdsa`] [operator +] [number 2]");
-
- MT("quasi_no_function",
- "[variable x] [operator =] [string-2 `fofdlakj${][variable x] [operator +] [string-2 `foo`] [operator +] [number 1][string-2 }fdsa`] [operator +] [number 2]");
-
- MT("indent_statement",
- "[keyword var] [def x] [operator =] [number 10]",
- "[variable x] [operator +=] [variable y] [operator +]",
- " [atom Infinity]",
- "[keyword debugger];");
-
- MT("indent_if",
- "[keyword if] ([number 1])",
- " [keyword break];",
- "[keyword else] [keyword if] ([number 2])",
- " [keyword continue];",
- "[keyword else]",
- " [number 10];",
- "[keyword if] ([number 1]) {",
- " [keyword break];",
- "} [keyword else] [keyword if] ([number 2]) {",
- " [keyword continue];",
- "} [keyword else] {",
- " [number 10];",
- "}");
-
- MT("indent_for",
- "[keyword for] ([keyword var] [def i] [operator =] [number 0];",
- " [variable i] [operator <] [number 100];",
- " [variable i][operator ++])",
- " [variable doSomething]([variable i]);",
- "[keyword debugger];");
-
- MT("indent_c_style",
- "[keyword function] [def foo]()",
- "{",
- " [keyword debugger];",
- "}");
-
- MT("indent_else",
- "[keyword for] (;;)",
- " [keyword if] ([variable foo])",
- " [keyword if] ([variable bar])",
- " [number 1];",
- " [keyword else]",
- " [number 2];",
- " [keyword else]",
- " [number 3];");
-
- MT("indent_funarg",
- "[variable foo]([number 10000],",
- " [keyword function]([def a]) {",
- " [keyword debugger];",
- "};");
-
- MT("indent_below_if",
- "[keyword for] (;;)",
- " [keyword if] ([variable foo])",
- " [number 1];",
- "[number 2];");
-
- MT("indent_semicolonless_if",
- "[keyword function] [def foo]() {",
- " [keyword if] ([variable x])",
- " [variable foo]()",
- "}")
-
- MT("indent_semicolonless_if_with_statement",
- "[keyword function] [def foo]() {",
- " [keyword if] ([variable x])",
- " [variable foo]()",
- " [variable bar]()",
- "}")
-
- MT("multilinestring",
- "[keyword var] [def x] [operator =] [string 'foo\\]",
- "[string bar'];");
-
- MT("scary_regexp",
- "[string-2 /foo[[/]]bar/];");
-
- MT("indent_strange_array",
- "[keyword var] [def x] [operator =] [[",
- " [number 1],,",
- " [number 2],",
- "]];",
- "[number 10];");
-
- MT("param_default",
- "[keyword function] [def foo]([def x] [operator =] [string-2 `foo${][number 10][string-2 }bar`]) {",
- " [keyword return] [variable-2 x];",
- "}");
-
- MT("new_target",
- "[keyword function] [def F]([def target]) {",
- " [keyword if] ([variable-2 target] [operator &&] [keyword new].[keyword target].[property name]) {",
- " [keyword return] [keyword new]",
- " .[keyword target];",
- " }",
- "}");
-
- var ts_mode = CodeMirror.getMode({indentUnit: 2}, "application/typescript")
- function TS(name) {
- test.mode(name, ts_mode, Array.prototype.slice.call(arguments, 1))
- }
-
- TS("extend_type",
- "[keyword class] [def Foo] [keyword extends] [variable-3 Some][operator <][variable-3 Type][operator >] {}")
-
- TS("arrow_type",
- "[keyword let] [def x]: ([variable arg]: [variable-3 Type]) [operator =>] [variable-3 ReturnType]")
-
- TS("typescript_class",
- "[keyword class] [def Foo] {",
- " [keyword public] [keyword static] [property main]() {}",
- " [keyword private] [property _foo]: [variable-3 string];",
- "}")
-
- var jsonld_mode = CodeMirror.getMode(
- {indentUnit: 2},
- {name: "javascript", jsonld: true}
- );
- function LD(name) {
- test.mode(name, jsonld_mode, Array.prototype.slice.call(arguments, 1));
- }
-
- LD("json_ld_keywords",
- '{',
- ' [meta "@context"]: {',
- ' [meta "@base"]: [string "http://example.com"],',
- ' [meta "@vocab"]: [string "http://xmlns.com/foaf/0.1/"],',
- ' [property "likesFlavor"]: {',
- ' [meta "@container"]: [meta "@list"]',
- ' [meta "@reverse"]: [string "@beFavoriteOf"]',
- ' },',
- ' [property "nick"]: { [meta "@container"]: [meta "@set"] },',
- ' [property "nick"]: { [meta "@container"]: [meta "@index"] }',
- ' },',
- ' [meta "@graph"]: [[ {',
- ' [meta "@id"]: [string "http://dbpedia.org/resource/John_Lennon"],',
- ' [property "name"]: [string "John Lennon"],',
- ' [property "modified"]: {',
- ' [meta "@value"]: [string "2010-05-29T14:17:39+02:00"],',
- ' [meta "@type"]: [string "http://www.w3.org/2001/XMLSchema#dateTime"]',
- ' }',
- ' } ]]',
- '}');
-
- LD("json_ld_fake",
- '{',
- ' [property "@fake"]: [string "@fake"],',
- ' [property "@contextual"]: [string "@identifier"],',
- ' [property "user@domain.com"]: [string "@graphical"],',
- ' [property "@ID"]: [string "@@ID"]',
- '}');
-})();
diff --git a/WebContent/addon/codemirror/mode/javascript/typescript.html b/WebContent/addon/codemirror/mode/javascript/typescript.html
deleted file mode 100644
index 1f26d7f..0000000
--- a/WebContent/addon/codemirror/mode/javascript/typescript.html
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-CodeMirror: TypeScript mode
-
-TypeScript mode
-
-
-
-
-
-
- This is a specialization of the JavaScript mode .
-
diff --git a/WebContent/addon/codemirror/mode/meta.js b/WebContent/addon/codemirror/mode/meta.js
deleted file mode 100644
index 47e9a31..0000000
--- a/WebContent/addon/codemirror/mode/meta.js
+++ /dev/null
@@ -1,209 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
- if (typeof exports == "object" && typeof module == "object") // CommonJS
- mod(require("../lib/codemirror"));
- else if (typeof define == "function" && define.amd) // AMD
- define(["../lib/codemirror"], mod);
- else // Plain browser env
- mod(CodeMirror);
-})(function(CodeMirror) {
- "use strict";
-
- CodeMirror.modeInfo = [
- {name: "APL", mime: "text/apl", mode: "apl", ext: ["dyalog", "apl"]},
- {name: "PGP", mimes: ["application/pgp", "application/pgp-keys", "application/pgp-signature"], mode: "asciiarmor", ext: ["pgp"]},
- {name: "ASN.1", mime: "text/x-ttcn-asn", mode: "asn.1", ext: ["asn", "asn1"]},
- {name: "Asterisk", mime: "text/x-asterisk", mode: "asterisk", file: /^extensions\.conf$/i},
- {name: "Brainfuck", mime: "text/x-brainfuck", mode: "brainfuck", ext: ["b", "bf"]},
- {name: "C", mime: "text/x-csrc", mode: "clike", ext: ["c", "h"]},
- {name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "cc", "cxx", "hpp", "h++", "hh", "hxx"], alias: ["cpp"]},
- {name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy"]},
- {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"], alias: ["csharp"]},
- {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj", "cljc", "cljx"]},
- {name: "ClojureScript", mime: "text/x-clojurescript", mode: "clojure", ext: ["cljs"]},
- {name: "Closure Stylesheets (GSS)", mime: "text/x-gss", mode: "css", ext: ["gss"]},
- {name: "CMake", mime: "text/x-cmake", mode: "cmake", ext: ["cmake", "cmake.in"], file: /^CMakeLists.txt$/},
- {name: "CoffeeScript", mime: "text/x-coffeescript", mode: "coffeescript", ext: ["coffee"], alias: ["coffee", "coffee-script"]},
- {name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp", ext: ["cl", "lisp", "el"], alias: ["lisp"]},
- {name: "Cypher", mime: "application/x-cypher-query", mode: "cypher", ext: ["cyp", "cypher"]},
- {name: "Cython", mime: "text/x-cython", mode: "python", ext: ["pyx", "pxd", "pxi"]},
- {name: "Crystal", mime: "text/x-crystal", mode: "crystal", ext: ["cr"]},
- {name: "CSS", mime: "text/css", mode: "css", ext: ["css"]},
- {name: "CQL", mime: "text/x-cassandra", mode: "sql", ext: ["cql"]},
- {name: "D", mime: "text/x-d", mode: "d", ext: ["d"]},
- {name: "Dart", mimes: ["application/dart", "text/x-dart"], mode: "dart", ext: ["dart"]},
- {name: "diff", mime: "text/x-diff", mode: "diff", ext: ["diff", "patch"]},
- {name: "Django", mime: "text/x-django", mode: "django"},
- {name: "Dockerfile", mime: "text/x-dockerfile", mode: "dockerfile", file: /^Dockerfile$/},
- {name: "DTD", mime: "application/xml-dtd", mode: "dtd", ext: ["dtd"]},
- {name: "Dylan", mime: "text/x-dylan", mode: "dylan", ext: ["dylan", "dyl", "intr"]},
- {name: "EBNF", mime: "text/x-ebnf", mode: "ebnf"},
- {name: "ECL", mime: "text/x-ecl", mode: "ecl", ext: ["ecl"]},
- {name: "edn", mime: "application/edn", mode: "clojure", ext: ["edn"]},
- {name: "Eiffel", mime: "text/x-eiffel", mode: "eiffel", ext: ["e"]},
- {name: "Elm", mime: "text/x-elm", mode: "elm", ext: ["elm"]},
- {name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded", ext: ["ejs"]},
- {name: "Embedded Ruby", mime: "application/x-erb", mode: "htmlembedded", ext: ["erb"]},
- {name: "Erlang", mime: "text/x-erlang", mode: "erlang", ext: ["erl"]},
- {name: "Factor", mime: "text/x-factor", mode: "factor", ext: ["factor"]},
- {name: "FCL", mime: "text/x-fcl", mode: "fcl"},
- {name: "Forth", mime: "text/x-forth", mode: "forth", ext: ["forth", "fth", "4th"]},
- {name: "Fortran", mime: "text/x-fortran", mode: "fortran", ext: ["f", "for", "f77", "f90"]},
- {name: "F#", mime: "text/x-fsharp", mode: "mllike", ext: ["fs"], alias: ["fsharp"]},
- {name: "Gas", mime: "text/x-gas", mode: "gas", ext: ["s"]},
- {name: "Gherkin", mime: "text/x-feature", mode: "gherkin", ext: ["feature"]},
- {name: "GitHub Flavored Markdown", mime: "text/x-gfm", mode: "gfm", file: /^(readme|contributing|history).md$/i},
- {name: "Go", mime: "text/x-go", mode: "go", ext: ["go"]},
- {name: "Groovy", mime: "text/x-groovy", mode: "groovy", ext: ["groovy", "gradle"], file: /^Jenkinsfile$/},
- {name: "HAML", mime: "text/x-haml", mode: "haml", ext: ["haml"]},
- {name: "Haskell", mime: "text/x-haskell", mode: "haskell", ext: ["hs"]},
- {name: "Haskell (Literate)", mime: "text/x-literate-haskell", mode: "haskell-literate", ext: ["lhs"]},
- {name: "Haxe", mime: "text/x-haxe", mode: "haxe", ext: ["hx"]},
- {name: "HXML", mime: "text/x-hxml", mode: "haxe", ext: ["hxml"]},
- {name: "ASP.NET", mime: "application/x-aspx", mode: "htmlembedded", ext: ["aspx"], alias: ["asp", "aspx"]},
- {name: "HTML", mime: "text/html", mode: "htmlmixed", ext: ["html", "htm"], alias: ["xhtml"]},
- {name: "HTTP", mime: "message/http", mode: "http"},
- {name: "IDL", mime: "text/x-idl", mode: "idl", ext: ["pro"]},
- {name: "Pug", mime: "text/x-pug", mode: "pug", ext: ["jade", "pug"], alias: ["jade"]},
- {name: "Java", mime: "text/x-java", mode: "clike", ext: ["java"]},
- {name: "Java Server Pages", mime: "application/x-jsp", mode: "htmlembedded", ext: ["jsp"], alias: ["jsp"]},
- {name: "JavaScript", mimes: ["text/javascript", "text/ecmascript", "application/javascript", "application/x-javascript", "application/ecmascript"],
- mode: "javascript", ext: ["js"], alias: ["ecmascript", "js", "node"]},
- {name: "JSON", mimes: ["application/json", "application/x-json"], mode: "javascript", ext: ["json", "map"], alias: ["json5"]},
- {name: "JSON-LD", mime: "application/ld+json", mode: "javascript", ext: ["jsonld"], alias: ["jsonld"]},
- {name: "JSX", mime: "text/jsx", mode: "jsx", ext: ["jsx"]},
- {name: "Jinja2", mime: "null", mode: "jinja2"},
- {name: "Julia", mime: "text/x-julia", mode: "julia", ext: ["jl"]},
- {name: "Kotlin", mime: "text/x-kotlin", mode: "clike", ext: ["kt"]},
- {name: "LESS", mime: "text/x-less", mode: "css", ext: ["less"]},
- {name: "LiveScript", mime: "text/x-livescript", mode: "livescript", ext: ["ls"], alias: ["ls"]},
- {name: "Lua", mime: "text/x-lua", mode: "lua", ext: ["lua"]},
- {name: "Markdown", mime: "text/x-markdown", mode: "markdown", ext: ["markdown", "md", "mkd"]},
- {name: "mIRC", mime: "text/mirc", mode: "mirc"},
- {name: "MariaDB SQL", mime: "text/x-mariadb", mode: "sql"},
- {name: "Mathematica", mime: "text/x-mathematica", mode: "mathematica", ext: ["m", "nb"]},
- {name: "Modelica", mime: "text/x-modelica", mode: "modelica", ext: ["mo"]},
- {name: "MUMPS", mime: "text/x-mumps", mode: "mumps", ext: ["mps"]},
- {name: "MS SQL", mime: "text/x-mssql", mode: "sql"},
- {name: "mbox", mime: "application/mbox", mode: "mbox", ext: ["mbox"]},
- {name: "MySQL", mime: "text/x-mysql", mode: "sql"},
- {name: "Nginx", mime: "text/x-nginx-conf", mode: "nginx", file: /nginx.*\.conf$/i},
- {name: "NSIS", mime: "text/x-nsis", mode: "nsis", ext: ["nsh", "nsi"]},
- {name: "NTriples", mime: "text/n-triples", mode: "ntriples", ext: ["nt"]},
- {name: "Objective C", mime: "text/x-objectivec", mode: "clike", ext: ["m", "mm"], alias: ["objective-c", "objc"]},
- {name: "OCaml", mime: "text/x-ocaml", mode: "mllike", ext: ["ml", "mli", "mll", "mly"]},
- {name: "Octave", mime: "text/x-octave", mode: "octave", ext: ["m"]},
- {name: "Oz", mime: "text/x-oz", mode: "oz", ext: ["oz"]},
- {name: "Pascal", mime: "text/x-pascal", mode: "pascal", ext: ["p", "pas"]},
- {name: "PEG.js", mime: "null", mode: "pegjs", ext: ["jsonld"]},
- {name: "Perl", mime: "text/x-perl", mode: "perl", ext: ["pl", "pm"]},
- {name: "PHP", mime: "application/x-httpd-php", mode: "php", ext: ["php", "php3", "php4", "php5", "phtml"]},
- {name: "Pig", mime: "text/x-pig", mode: "pig", ext: ["pig"]},
- {name: "Plain Text", mime: "text/plain", mode: "null", ext: ["txt", "text", "conf", "def", "list", "log"]},
- {name: "PLSQL", mime: "text/x-plsql", mode: "sql", ext: ["pls"]},
- {name: "PowerShell", mime: "application/x-powershell", mode: "powershell", ext: ["ps1", "psd1", "psm1"]},
- {name: "Properties files", mime: "text/x-properties", mode: "properties", ext: ["properties", "ini", "in"], alias: ["ini", "properties"]},
- {name: "ProtoBuf", mime: "text/x-protobuf", mode: "protobuf", ext: ["proto"]},
- {name: "Python", mime: "text/x-python", mode: "python", ext: ["BUILD", "bzl", "py", "pyw"], file: /^(BUCK|BUILD)$/},
- {name: "Puppet", mime: "text/x-puppet", mode: "puppet", ext: ["pp"]},
- {name: "Q", mime: "text/x-q", mode: "q", ext: ["q"]},
- {name: "R", mime: "text/x-rsrc", mode: "r", ext: ["r"], alias: ["rscript"]},
- {name: "reStructuredText", mime: "text/x-rst", mode: "rst", ext: ["rst"], alias: ["rst"]},
- {name: "RPM Changes", mime: "text/x-rpm-changes", mode: "rpm"},
- {name: "RPM Spec", mime: "text/x-rpm-spec", mode: "rpm", ext: ["spec"]},
- {name: "Ruby", mime: "text/x-ruby", mode: "ruby", ext: ["rb"], alias: ["jruby", "macruby", "rake", "rb", "rbx"]},
- {name: "Rust", mime: "text/x-rustsrc", mode: "rust", ext: ["rs"]},
- {name: "SAS", mime: "text/x-sas", mode: "sas", ext: ["sas"]},
- {name: "Sass", mime: "text/x-sass", mode: "sass", ext: ["sass"]},
- {name: "Scala", mime: "text/x-scala", mode: "clike", ext: ["scala"]},
- {name: "Scheme", mime: "text/x-scheme", mode: "scheme", ext: ["scm", "ss"]},
- {name: "SCSS", mime: "text/x-scss", mode: "css", ext: ["scss"]},
- {name: "Shell", mime: "text/x-sh", mode: "shell", ext: ["sh", "ksh", "bash"], alias: ["bash", "sh", "zsh"], file: /^PKGBUILD$/},
- {name: "Sieve", mime: "application/sieve", mode: "sieve", ext: ["siv", "sieve"]},
- {name: "Slim", mimes: ["text/x-slim", "application/x-slim"], mode: "slim", ext: ["slim"]},
- {name: "Smalltalk", mime: "text/x-stsrc", mode: "smalltalk", ext: ["st"]},
- {name: "Smarty", mime: "text/x-smarty", mode: "smarty", ext: ["tpl"]},
- {name: "Solr", mime: "text/x-solr", mode: "solr"},
- {name: "Soy", mime: "text/x-soy", mode: "soy", ext: ["soy"], alias: ["closure template"]},
- {name: "SPARQL", mime: "application/sparql-query", mode: "sparql", ext: ["rq", "sparql"], alias: ["sparul"]},
- {name: "Spreadsheet", mime: "text/x-spreadsheet", mode: "spreadsheet", alias: ["excel", "formula"]},
- {name: "SQL", mime: "text/x-sql", mode: "sql", ext: ["sql"]},
- {name: "Squirrel", mime: "text/x-squirrel", mode: "clike", ext: ["nut"]},
- {name: "Stylus", mime: "text/x-styl", mode: "stylus", ext: ["styl"]},
- {name: "Swift", mime: "text/x-swift", mode: "swift", ext: ["swift"]},
- {name: "sTeX", mime: "text/x-stex", mode: "stex"},
- {name: "LaTeX", mime: "text/x-latex", mode: "stex", ext: ["text", "ltx"], alias: ["tex"]},
- {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog", ext: ["v"]},
- {name: "Tcl", mime: "text/x-tcl", mode: "tcl", ext: ["tcl"]},
- {name: "Textile", mime: "text/x-textile", mode: "textile", ext: ["textile"]},
- {name: "TiddlyWiki ", mime: "text/x-tiddlywiki", mode: "tiddlywiki"},
- {name: "Tiki wiki", mime: "text/tiki", mode: "tiki"},
- {name: "TOML", mime: "text/x-toml", mode: "toml", ext: ["toml"]},
- {name: "Tornado", mime: "text/x-tornado", mode: "tornado"},
- {name: "troff", mime: "text/troff", mode: "troff", ext: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]},
- {name: "TTCN", mime: "text/x-ttcn", mode: "ttcn", ext: ["ttcn", "ttcn3", "ttcnpp"]},
- {name: "TTCN_CFG", mime: "text/x-ttcn-cfg", mode: "ttcn-cfg", ext: ["cfg"]},
- {name: "Turtle", mime: "text/turtle", mode: "turtle", ext: ["ttl"]},
- {name: "TypeScript", mime: "application/typescript", mode: "javascript", ext: ["ts"], alias: ["ts"]},
- {name: "Twig", mime: "text/x-twig", mode: "twig"},
- {name: "Web IDL", mime: "text/x-webidl", mode: "webidl", ext: ["webidl"]},
- {name: "VB.NET", mime: "text/x-vb", mode: "vb", ext: ["vb"]},
- {name: "VBScript", mime: "text/vbscript", mode: "vbscript", ext: ["vbs"]},
- {name: "Velocity", mime: "text/velocity", mode: "velocity", ext: ["vtl"]},
- {name: "Verilog", mime: "text/x-verilog", mode: "verilog", ext: ["v"]},
- {name: "VHDL", mime: "text/x-vhdl", mode: "vhdl", ext: ["vhd", "vhdl"]},
- {name: "XML", mimes: ["application/xml", "text/xml"], mode: "xml", ext: ["xml", "xsl", "xsd"], alias: ["rss", "wsdl", "xsd"]},
- {name: "XQuery", mime: "application/xquery", mode: "xquery", ext: ["xy", "xquery"]},
- {name: "Yacas", mime: "text/x-yacas", mode: "yacas", ext: ["ys"]},
- {name: "YAML", mime: "text/x-yaml", mode: "yaml", ext: ["yaml", "yml"], alias: ["yml"]},
- {name: "Z80", mime: "text/x-z80", mode: "z80", ext: ["z80"]},
- {name: "mscgen", mime: "text/x-mscgen", mode: "mscgen", ext: ["mscgen", "mscin", "msc"]},
- {name: "xu", mime: "text/x-xu", mode: "mscgen", ext: ["xu"]},
- {name: "msgenny", mime: "text/x-msgenny", mode: "mscgen", ext: ["msgenny"]}
- ];
- // Ensure all modes have a mime property for backwards compatibility
- for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
- var info = CodeMirror.modeInfo[i];
- if (info.mimes) info.mime = info.mimes[0];
- }
-
- CodeMirror.findModeByMIME = function(mime) {
- mime = mime.toLowerCase();
- for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
- var info = CodeMirror.modeInfo[i];
- if (info.mime == mime) return info;
- if (info.mimes) for (var j = 0; j < info.mimes.length; j++)
- if (info.mimes[j] == mime) return info;
- }
- };
-
- CodeMirror.findModeByExtension = function(ext) {
- for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
- var info = CodeMirror.modeInfo[i];
- if (info.ext) for (var j = 0; j < info.ext.length; j++)
- if (info.ext[j] == ext) return info;
- }
- };
-
- CodeMirror.findModeByFileName = function(filename) {
- for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
- var info = CodeMirror.modeInfo[i];
- if (info.file && info.file.test(filename)) return info;
- }
- var dot = filename.lastIndexOf(".");
- var ext = dot > -1 && filename.substring(dot + 1, filename.length);
- if (ext) return CodeMirror.findModeByExtension(ext);
- };
-
- CodeMirror.findModeByName = function(name) {
- name = name.toLowerCase();
- for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
- var info = CodeMirror.modeInfo[i];
- if (info.name.toLowerCase() == name) return info;
- if (info.alias) for (var j = 0; j < info.alias.length; j++)
- if (info.alias[j].toLowerCase() == name) return info;
- }
- };
-});
diff --git a/WebContent/addon/codemirror/theme/3024-day.css b/WebContent/addon/codemirror/theme/3024-day.css
deleted file mode 100644
index 7132655..0000000
--- a/WebContent/addon/codemirror/theme/3024-day.css
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-
- Name: 3024 day
- Author: Jan T. Sott (http://github.com/idleberg)
-
- CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
- Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-3024-day.CodeMirror { background: #f7f7f7; color: #3a3432; }
-.cm-s-3024-day div.CodeMirror-selected { background: #d6d5d4; }
-
-.cm-s-3024-day .CodeMirror-line::selection, .cm-s-3024-day .CodeMirror-line > span::selection, .cm-s-3024-day .CodeMirror-line > span > span::selection { background: #d6d5d4; }
-.cm-s-3024-day .CodeMirror-line::-moz-selection, .cm-s-3024-day .CodeMirror-line > span::-moz-selection, .cm-s-3024-day .CodeMirror-line > span > span::selection { background: #d9d9d9; }
-
-.cm-s-3024-day .CodeMirror-gutters { background: #f7f7f7; border-right: 0px; }
-.cm-s-3024-day .CodeMirror-guttermarker { color: #db2d20; }
-.cm-s-3024-day .CodeMirror-guttermarker-subtle { color: #807d7c; }
-.cm-s-3024-day .CodeMirror-linenumber { color: #807d7c; }
-
-.cm-s-3024-day .CodeMirror-cursor { border-left: 1px solid #5c5855; }
-
-.cm-s-3024-day span.cm-comment { color: #cdab53; }
-.cm-s-3024-day span.cm-atom { color: #a16a94; }
-.cm-s-3024-day span.cm-number { color: #a16a94; }
-
-.cm-s-3024-day span.cm-property, .cm-s-3024-day span.cm-attribute { color: #01a252; }
-.cm-s-3024-day span.cm-keyword { color: #db2d20; }
-.cm-s-3024-day span.cm-string { color: #fded02; }
-
-.cm-s-3024-day span.cm-variable { color: #01a252; }
-.cm-s-3024-day span.cm-variable-2 { color: #01a0e4; }
-.cm-s-3024-day span.cm-def { color: #e8bbd0; }
-.cm-s-3024-day span.cm-bracket { color: #3a3432; }
-.cm-s-3024-day span.cm-tag { color: #db2d20; }
-.cm-s-3024-day span.cm-link { color: #a16a94; }
-.cm-s-3024-day span.cm-error { background: #db2d20; color: #5c5855; }
-
-.cm-s-3024-day .CodeMirror-activeline-background { background: #e8f2ff; }
-.cm-s-3024-day .CodeMirror-matchingbracket { text-decoration: underline; color: #a16a94 !important; }
diff --git a/WebContent/addon/codemirror/theme/3024-night.css b/WebContent/addon/codemirror/theme/3024-night.css
deleted file mode 100644
index adc5900..0000000
--- a/WebContent/addon/codemirror/theme/3024-night.css
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-
- Name: 3024 night
- Author: Jan T. Sott (http://github.com/idleberg)
-
- CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
- Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-3024-night.CodeMirror { background: #090300; color: #d6d5d4; }
-.cm-s-3024-night div.CodeMirror-selected { background: #3a3432; }
-.cm-s-3024-night .CodeMirror-line::selection, .cm-s-3024-night .CodeMirror-line > span::selection, .cm-s-3024-night .CodeMirror-line > span > span::selection { background: rgba(58, 52, 50, .99); }
-.cm-s-3024-night .CodeMirror-line::-moz-selection, .cm-s-3024-night .CodeMirror-line > span::-moz-selection, .cm-s-3024-night .CodeMirror-line > span > span::-moz-selection { background: rgba(58, 52, 50, .99); }
-.cm-s-3024-night .CodeMirror-gutters { background: #090300; border-right: 0px; }
-.cm-s-3024-night .CodeMirror-guttermarker { color: #db2d20; }
-.cm-s-3024-night .CodeMirror-guttermarker-subtle { color: #5c5855; }
-.cm-s-3024-night .CodeMirror-linenumber { color: #5c5855; }
-
-.cm-s-3024-night .CodeMirror-cursor { border-left: 1px solid #807d7c; }
-
-.cm-s-3024-night span.cm-comment { color: #cdab53; }
-.cm-s-3024-night span.cm-atom { color: #a16a94; }
-.cm-s-3024-night span.cm-number { color: #a16a94; }
-
-.cm-s-3024-night span.cm-property, .cm-s-3024-night span.cm-attribute { color: #01a252; }
-.cm-s-3024-night span.cm-keyword { color: #db2d20; }
-.cm-s-3024-night span.cm-string { color: #fded02; }
-
-.cm-s-3024-night span.cm-variable { color: #01a252; }
-.cm-s-3024-night span.cm-variable-2 { color: #01a0e4; }
-.cm-s-3024-night span.cm-def { color: #e8bbd0; }
-.cm-s-3024-night span.cm-bracket { color: #d6d5d4; }
-.cm-s-3024-night span.cm-tag { color: #db2d20; }
-.cm-s-3024-night span.cm-link { color: #a16a94; }
-.cm-s-3024-night span.cm-error { background: #db2d20; color: #807d7c; }
-
-.cm-s-3024-night .CodeMirror-activeline-background { background: #2F2F2F; }
-.cm-s-3024-night .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/WebContent/addon/codemirror/theme/abcdef.css b/WebContent/addon/codemirror/theme/abcdef.css
deleted file mode 100644
index 7f9d788..0000000
--- a/WebContent/addon/codemirror/theme/abcdef.css
+++ /dev/null
@@ -1,32 +0,0 @@
-.cm-s-abcdef.CodeMirror { background: #0f0f0f; color: #defdef; }
-.cm-s-abcdef div.CodeMirror-selected { background: #515151; }
-.cm-s-abcdef .CodeMirror-line::selection, .cm-s-abcdef .CodeMirror-line > span::selection, .cm-s-abcdef .CodeMirror-line > span > span::selection { background: rgba(56, 56, 56, 0.99); }
-.cm-s-abcdef .CodeMirror-line::-moz-selection, .cm-s-abcdef .CodeMirror-line > span::-moz-selection, .cm-s-abcdef .CodeMirror-line > span > span::-moz-selection { background: rgba(56, 56, 56, 0.99); }
-.cm-s-abcdef .CodeMirror-gutters { background: #555; border-right: 2px solid #314151; }
-.cm-s-abcdef .CodeMirror-guttermarker { color: #222; }
-.cm-s-abcdef .CodeMirror-guttermarker-subtle { color: azure; }
-.cm-s-abcdef .CodeMirror-linenumber { color: #FFFFFF; }
-.cm-s-abcdef .CodeMirror-cursor { border-left: 1px solid #00FF00; }
-
-.cm-s-abcdef span.cm-keyword { color: darkgoldenrod; font-weight: bold; }
-.cm-s-abcdef span.cm-atom { color: #77F; }
-.cm-s-abcdef span.cm-number { color: violet; }
-.cm-s-abcdef span.cm-def { color: #fffabc; }
-.cm-s-abcdef span.cm-variable { color: #abcdef; }
-.cm-s-abcdef span.cm-variable-2 { color: #cacbcc; }
-.cm-s-abcdef span.cm-variable-3 { color: #def; }
-.cm-s-abcdef span.cm-property { color: #fedcba; }
-.cm-s-abcdef span.cm-operator { color: #ff0; }
-.cm-s-abcdef span.cm-comment { color: #7a7b7c; font-style: italic;}
-.cm-s-abcdef span.cm-string { color: #2b4; }
-.cm-s-abcdef span.cm-meta { color: #C9F; }
-.cm-s-abcdef span.cm-qualifier { color: #FFF700; }
-.cm-s-abcdef span.cm-builtin { color: #30aabc; }
-.cm-s-abcdef span.cm-bracket { color: #8a8a8a; }
-.cm-s-abcdef span.cm-tag { color: #FFDD44; }
-.cm-s-abcdef span.cm-attribute { color: #DDFF00; }
-.cm-s-abcdef span.cm-error { color: #FF0000; }
-.cm-s-abcdef span.cm-header { color: aquamarine; font-weight: bold; }
-.cm-s-abcdef span.cm-link { color: blueviolet; }
-
-.cm-s-abcdef .CodeMirror-activeline-background { background: #314151; }
diff --git a/WebContent/addon/codemirror/theme/ambiance-mobile.css b/WebContent/addon/codemirror/theme/ambiance-mobile.css
deleted file mode 100644
index 88d332e..0000000
--- a/WebContent/addon/codemirror/theme/ambiance-mobile.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.cm-s-ambiance.CodeMirror {
- -webkit-box-shadow: none;
- -moz-box-shadow: none;
- box-shadow: none;
-}
diff --git a/WebContent/addon/codemirror/theme/ambiance.css b/WebContent/addon/codemirror/theme/ambiance.css
deleted file mode 100644
index bce3446..0000000
--- a/WebContent/addon/codemirror/theme/ambiance.css
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ambiance theme for codemirror */
-
-/* Color scheme */
-
-.cm-s-ambiance .cm-header { color: blue; }
-.cm-s-ambiance .cm-quote { color: #24C2C7; }
-
-.cm-s-ambiance .cm-keyword { color: #cda869; }
-.cm-s-ambiance .cm-atom { color: #CF7EA9; }
-.cm-s-ambiance .cm-number { color: #78CF8A; }
-.cm-s-ambiance .cm-def { color: #aac6e3; }
-.cm-s-ambiance .cm-variable { color: #ffb795; }
-.cm-s-ambiance .cm-variable-2 { color: #eed1b3; }
-.cm-s-ambiance .cm-variable-3 { color: #faded3; }
-.cm-s-ambiance .cm-property { color: #eed1b3; }
-.cm-s-ambiance .cm-operator { color: #fa8d6a; }
-.cm-s-ambiance .cm-comment { color: #555; font-style:italic; }
-.cm-s-ambiance .cm-string { color: #8f9d6a; }
-.cm-s-ambiance .cm-string-2 { color: #9d937c; }
-.cm-s-ambiance .cm-meta { color: #D2A8A1; }
-.cm-s-ambiance .cm-qualifier { color: yellow; }
-.cm-s-ambiance .cm-builtin { color: #9999cc; }
-.cm-s-ambiance .cm-bracket { color: #24C2C7; }
-.cm-s-ambiance .cm-tag { color: #fee4ff; }
-.cm-s-ambiance .cm-attribute { color: #9B859D; }
-.cm-s-ambiance .cm-hr { color: pink; }
-.cm-s-ambiance .cm-link { color: #F4C20B; }
-.cm-s-ambiance .cm-special { color: #FF9D00; }
-.cm-s-ambiance .cm-error { color: #AF2018; }
-
-.cm-s-ambiance .CodeMirror-matchingbracket { color: #0f0; }
-.cm-s-ambiance .CodeMirror-nonmatchingbracket { color: #f22; }
-
-.cm-s-ambiance div.CodeMirror-selected { background: rgba(255, 255, 255, 0.15); }
-.cm-s-ambiance.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
-.cm-s-ambiance .CodeMirror-line::selection, .cm-s-ambiance .CodeMirror-line > span::selection, .cm-s-ambiance .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
-.cm-s-ambiance .CodeMirror-line::-moz-selection, .cm-s-ambiance .CodeMirror-line > span::-moz-selection, .cm-s-ambiance .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
-
-/* Editor styling */
-
-.cm-s-ambiance.CodeMirror {
- line-height: 1.40em;
- color: #E6E1DC;
- background-color: #202020;
- -webkit-box-shadow: inset 0 0 10px black;
- -moz-box-shadow: inset 0 0 10px black;
- box-shadow: inset 0 0 10px black;
-}
-
-.cm-s-ambiance .CodeMirror-gutters {
- background: #3D3D3D;
- border-right: 1px solid #4D4D4D;
- box-shadow: 0 10px 20px black;
-}
-
-.cm-s-ambiance .CodeMirror-linenumber {
- text-shadow: 0px 1px 1px #4d4d4d;
- color: #111;
- padding: 0 5px;
-}
-
-.cm-s-ambiance .CodeMirror-guttermarker { color: #aaa; }
-.cm-s-ambiance .CodeMirror-guttermarker-subtle { color: #111; }
-
-.cm-s-ambiance .CodeMirror-cursor { border-left: 1px solid #7991E8; }
-
-.cm-s-ambiance .CodeMirror-activeline-background {
- background: none repeat scroll 0% 0% rgba(255, 255, 255, 0.031);
-}
-
-.cm-s-ambiance.CodeMirror,
-.cm-s-ambiance .CodeMirror-gutters {
- background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAQAAAAHUWYVAABFFUlEQVQYGbzBCeDVU/74/6fj9HIcx/FRHx9JCFmzMyGRURhLZIkUsoeRfUjS2FNDtr6WkMhO9sm+S8maJfu+Jcsg+/o/c+Z4z/t97/vezy3z+z8ekGlnYICG/o7gdk+wmSHZ1z4pJItqapjoKXWahm8NmV6eOTbWUOp6/6a/XIg6GQqmenJ2lDHyvCFZ2cBDbmtHA043VFhHwXxClWmeYAdLhV00Bd85go8VmaFCkbVkzlQENzfBDZ5gtN7HwF0KDrTwJ0dypSOzpaKCMwQHKTIreYIxlmhXTzTWkVm+LTynZhiSBT3RZQ7aGfjGEd3qyXQ1FDymqbKxpspERQN2MiRjNZlFFQXfCNFm9nM1zpAsoYjmtRTc5ajwuaXc5xrWskT97RaKzAGe5ARHhVUsDbjKklziiX5WROcJwSNCNI+9w1Jwv4Zb2r7lCMZ4oq5C0EdTx+2GzNuKpJ+iFf38JEWkHJn9DNF7mmBDITrWEg0VWL3pHU20tSZnuqWu+R3BtYa8XxV1HO7GyD32UkOpL/yDloINFTmvtId+nmAjxRw40VMwVKiwrKLE4bK5UOVntYwhOcSSXKrJHKPJedocpGjVz/ZMIbnYUPB10/eKCrs5apqpgVmWzBYWpmtKHecJPjaUuEgRDDaU0oZghCJ6zNMQ5ZhDYx05r5v2muQdM0EILtXUsaKiQX9WMEUotagQzFbUNN6NUPC2nm5pxEWGCjMc3GdJHjSU2kORLK/JGSrkfGEIjncU/CYUnOipoYemwj8tST9NsJmB7TUVXtbUtXATJVZXBMvYeTXJfobgJUPmGMP/yFaWonaa6BcFO3nqcIqCozSZoZoSr1g4zJOzuyGnxTEX3lUEJ7WcZgme8ddaWvWJo2AJR9DZU3CUIbhCSG6ybSwN6qtJVnCU2svDTP2ZInOw2cBTrqtQahtNZn9NcJ4l2NaSmSkkP1noZWnVwkLmdUPOwLZEwy2Z3S3R+4rIG9hcbpPXHFVWcQdZkn2FOta3cKWQnNRC5g1LsJah4GCzSVsKnCOY5OAFRTBekyyryeyilhFKva75r4Mc0aWanGEaThcy31s439KKxTzJYY5WTHPU1FtIHjQU3Oip4xlNzj/lBw23dYZVliQa7WAXf4shetcQfatI+jWRDBPmyNeW6A1P5kdDgyYJlba0BIM8BZu1JfrFwItyjcAMR3K0BWOIrtMEXyhyrlVEx3ui5dUBjmB/Q3CXW85R4mBD0s7B+4q5tKUjOlb9qqmhi5AZ6GFIC5HXtOobdYGlVdMVbNJ8toNTFcHxnoL+muBagcctjWnbNMuR00uI7nQESwg5q2qqrKWIfrNUmeQocY6HuyxJV02wj36w00yhpmUFenv4p6fUkZYqLyuinx2RGOjhCXYyJF84oiU00YMOOhhquNdfbOB7gU88pY4xJO8LVdp6/q2voeB4R04vIdhSE40xZObx1HGGJ/ja0LBthFInKaLPPFzuCaYaoj8JjPME8yoyxo6zlBqkiUZYgq00OYMswbWO5NGmq+xhipxHLRW29ARjNKXO0wRnear8XSg4XFPLKEPUS1GqvyLwiuBUoa7zpZ0l5xxFwWmWZC1H5h5FwU8eQ7K+g8UcVY6TMQreVQT/8uQ8Z+ALIXnSEa2pYZQneE9RZbSBNYXfWYJzW/h/4j4Dp1tYVcFIC5019Vyi4ThPqSFCzjGWaHQTBU8q6vrVwgxP9Lkm840imWKpcLCjYTtrKuwvsKSnrvHCXGkSMk9p6lhckfRpIeis+N2PiszT+mFLspyGleUhDwcLrZqmyeylxwjBcKHEapqkmyangyLZRVOijwOtCY5SsG5zL0OwlCJ4y5KznF3EUNDDrinwiyLZRzOXtlBbK5ITHFGLp8Q0R6ab6mS7enI2cFrxOyHvOCFaT1HThS1krjCwqWeurCkk+willhCC+RSZnRXBiZaC5RXRIZYKp2lyfrHwiKPKR0JDzrdU2EFgpidawlFDR6FgXUMNa+g1FY3bUQh2cLCwosRdnuQTS/S+JVrGLeWIvtQUvONJxlqSQYYKpwoN2kaocLjdVsis4Mk80ESF2YpSkzwldjHkjFCUutI/r+EHDU8oCs6yzL3PhWiEooZdFMkymlas4AcI3KmoMMNSQ3tHzjGWCrcJJdYyZC7QFGwjRL9p+MrRkAGWzIaWCn9W0F3TsK01c2ZvQw0byvxuQU0r1lM0qJO7wW0kRIMdDTtXEdzi4VIh+EoIHm0mWtAtpCixlabgn83fKTI7anJe9ST7WIK1DMGpQmYeA58ImV6ezOGOzK2Kgq01pd60cKWiUi9Lievb/0vIDPHQ05Kzt4ddPckQBQtoaurjyHnek/nKzpQLrVgKPjIkh2v4uyezpv+Xoo7fPFXaGFp1vaLKxQ4uUpQQS5VuQs7BCq4xRJv7fwpVvvFEB3j+620haOuocqMhWd6TTPAEx+mdFNGHdranFe95WrWmIvlY4F1Dle2ECgc6cto7SryuqGGGha0tFQ5V53migUKmg6XKAo4qS3mik+0OZpAhOLeZKicacgaYcyx5hypYQE02ZA4xi/pNhOQxR4klNKyqacj+mpxnLTnnGSo85++3ZCZq6lrZkXlGEX3o+C9FieccJbZWVFjC0Yo1FZnJhoYMFoI1hEZ9r6hwg75HwzBNhbZCdJEfJwTPGzJvaKImw1yYX1HDAmpXR+ZJQ/SmgqMNVQb5vgamGwLtt7VwvP7Qk1xpiM5x5Cyv93E06MZmgs0Nya2azIKOYKCGBQQW97RmhKNKF02JZqHEJ4o58qp7X5EcZmc56trXEqzjCBZ1MFGR87Ql2tSTs6CGxS05PTzRQorkbw7aKoKXFDXsYW42VJih/q+FP2BdTzDTwVqOYB13liM50vG7wy28qagyuIXMeQI/Oqq8bcn5wJI50xH00CRntyfpL1T4hydYpoXgNiFzoIUTDZnLNRzh4TBHwbYGDvZkxmlyJloyr6tRihpeUG94GnKtIznREF0tzJG/OOr73JBcrSh1k6WuTprgLU+mnSGnv6Zge0NNz+kTDdH8nuAuTdJDCNb21LCiIuqlYbqGzT3RAoZofQfjFazkqeNWdYaGvYTM001EW2oKPvVk1ldUGSgUtHFwjKM1h9jnFcmy5lChoLNaQMGGDsYbKixlaMBmmsx1QjCfflwTfO/gckW0ruZ3jugKR3R5W9hGUWqCgxuFgsuaCHorotGKzGaeZB9DMsaTnKCpMtwTvOzhYk0rdrArKCqcaWmVk1+F372ur1YkKxgatI8Qfe1gIX9wE9FgS8ESmuABIXnRUbCapcKe+nO7slClSZFzpV/LkLncEb1qiO42fS3R855Su2mCLh62t1SYZZYVmKwIHjREF2uihTzB20JOkz7dkxzYQnK0UOU494wh+VWRc6Un2kpTaVgLDFEkJ/uhzRcI0YKGgpGWOlocBU/a4fKoJ/pEaNV6jip3+Es9VXY078rGnmAdf7t9ylPXS34RBSuYPs1UecZTU78WanhBCHpZ5sAoTz0LGZKjPf9TRypqWEiTvOFglL1fCEY3wY/++rbk7C8bWebA6p6om6PgOL2kp44TFJlVNBXae2rqqdZztOJpT87GQsE9jqCPIe9VReZuQ/CIgacsyZdCpIScSYqcZk8r+nsyCzhyfhOqHGOIvrLknC8wTpFcaYiGC/RU1NRbUeUpocQOnkRpGOrIOcNRx+1uA0UrzhSSt+VyS3SJpnFWkzNDqOFGIWcfR86DnmARTQ1HKIL33ExPiemeOhYSSjzlSUZZuE4TveoJLnBUOFof6KiysCbnAEcZgcUNTDOwkqWu3RWtmGpZwlHhJENdZ3miGz0lJlsKnjbwqSHQjpxnFDlTLLwqJPMZMjd7KrzkSG7VsxXBZE+F8YZkb01Oe00yyRK9psh5SYh29ySPKBo2ylNht7ZkZnsKenjKNJu9PNEyZpaCHv4Kt6RQsLvAVp7M9kIimmCUwGeWqLMmGuIotYMmWNpSahkhZw9FqZsVnKJhsjAHvtHMsTM9fCI06Dx/u3vfUXCqfsKRc4oFY2jMsoo/7DJDwZ1CsIKnJu+J9ldkpmiCxQx1rWjI+T9FwcWWzOuaYH0Hj7klNRVWEQpmaqosakiGNTFHdjS/qnUdmf0NJW5xsL0HhimCCZZSRzmSPTXJQ4aaztAwtZnoabebJ+htCaZ7Cm535ByoqXKbX1WRc4Eh2MkRXWzImVc96Cj4VdOKVxR84VdQsIUM8Psoou2byVHyZFuq7O8otbSQ2UAoeEWTudATLGSpZzVLlXVkPU2Jc+27lsw2jmg5T5VhbeE3BT083K9WsTTkFU/Osi0rC5lRlpwRHUiesNS0sOvmqGML1aRbPAxTJD9ZKtxuob+hhl8cwYGWpJ8nub7t5p6coYbMovZ1BTdaKn1jYD6h4GFDNFyT/Kqe1XCXphXHOKLZmuRSRdBPEfVUXQzJm5YGPGGJdvAEr7hHNdGZnuBvrpciGmopOLf5N0uVMy0FfYToJk90uUCbJupaVpO53UJXR2bVpoU00V2KOo4zMFrBd0Jtz2pa0clT5Q5L8IpQ177mWQejPMEJhuQjS10ref6HHjdEhy1P1EYR7GtO0uSsKJQYLiTnG1rVScj5lyazpqWGl5uBbRWl7m6ixGOOnEsMJR7z8J0n6KMnCdxhiNYQCoZ6CmYLnO8omC3MkW3bktlPmEt/VQQHejL3+dOE5FlPdK/Mq8hZxxJtLyRrepLThYKbLZxkSb5W52vYxNOaOxUF0yxMUPwBTYqCzy01XayYK0sJyWBLqX0MwU5CzoymRzV0EjjeUeLgDpTo6ij42ZAzvD01dHUUTPLU96MdLbBME8nFBn7zJCMtJcZokn8YoqU0FS5WFKyniHobguMcmW8N0XkWZjkyN3hqOMtS08r+/xTBwpZSZ3qiVRX8SzMHHjfUNFjgHEPmY9PL3ykEzxkSre/1ZD6z/NuznuB0RcE1TWTm9zRgfUWVJiG6yrzgmWPXC8EAR4Wxhlad0ZbgQyEz3pG5RVEwwDJH2mgKpjcTiCOzn1lfUWANFbZ2BA8balnEweJC9J0iuaeZoI+ippFCztEKVvckR2iice1JvhVytrQwUAZpgsubCPaU7xUe9vWnaOpaSBEspalykhC9bUlOMpT42ZHca6hyrqKmw/wMR8H5ZmdFoBVJb03O4UL0tSNnvIeRmkrLWqrs78gcrEn2tpcboh0UPOW3UUR9PMk4T4nnNKWmCjlrefhCwxRNztfmIQVdDElvS4m1/WuOujoZCs5XVOjtKPGokJzsYCtFYoWonSPT21DheU/wWhM19FcElwqNGOsp9Q8N/cwXaiND1MmeL1Q5XROtYYgGeFq1aTMsoMmcrKjQrOFQTQ1fmBYhmW6o8Jkjc7iDJRTBIo5kgJD5yMEYA3srCg7VFKwiVJkmRCc5ohGOKhsYMn/XBLdo5taZjlb9YAlGWRimqbCsoY7HFAXLa5I1HPRxMMsQDHFkWtRNniqT9UEeNjcE7RUlrCJ4R2CSJuqlKHWvJXjAUNcITYkenuBRB84TbeepcqTj3zZyFJzgYQdHnqfgI0ddUwS6GqWpsKWhjq9cV0vBAEMN2znq+EBfIWT+pClYw5xsTlJU6GeIBsjGmmANTzJZiIYpgrM0Oa8ZMjd7NP87jxhqGOhJlnQtjuQpB+8aEE00wZFznSJPyHxgH3HkPOsJFvYk8zqCHzTs1BYOa4J3PFU+UVRZxlHDM4YavlNUuMoRveiZA2d7grMNc2g+RbSCEKzmgYsUmWmazFJyoiOZ4KnyhKOGRzWJa0+moyV4TVHDzn51Awtqaphfk/lRQ08FX1iiqxTB/kLwd0VynKfEvI6cd4XMV5bMhZ7gZUWVzYQ6Nm2BYzxJbw3bGthEUUMfgbGeorae6DxHtJoZ6alhZ0+ytiVoK1R4z5PTrOECT/SugseEOlb1MMNR4VRNcJy+V1Hg9ONClSZFZjdHlc6W6FBLdJja2MC5hhpu0DBYEY1TFGwiFAxRRCsYkiM9JRb0JNMVkW6CZYT/2EiTGWmo8k+h4FhDNE7BvppoTSFnmCV5xZKzvcCdDo7VVPnIU+I+Rc68juApC90MwcFCsJ5hDqxgScYKreruyQwTqrzoqDCmhWi4IbhB0Yrt3RGa6GfDv52rKXWhh28dyZaWUvcZeMTBaZoSGyiCtRU5J8iviioHaErs7Jkj61syVzTTgOcUOQ8buFBTYWdL5g3T4qlpe0+wvD63heAXRfCCIed9RbCsp2CiI7raUOYOTU13N8PNHvpaGvayo4a3LLT1lDrVEPT2zLUlheB1R+ZTRfKWJ+dcocLJfi11vyJ51lLqJ0WD7tRwryezjiV5W28uJO9qykzX8JDe2lHl/9oyBwa2UMfOngpXCixvKdXTk3wrsKmiVYdZIqsoWEERjbcUNDuiaQomGoIbFdEHmsyWnuR+IeriKDVLnlawlyNHKwKlSU631PKep8J4Q+ayjkSLKYLhalNHlYvttb6fHm0p6OApsZ4l2VfdqZkjuysy6ysKLlckf1KUutCTs39bmCgEyyoasIWlVaMF7mgmWtBT8Kol5xpH9IGllo8cJdopcvZ2sImlDmMIbtDk3KIpeNiS08lQw11NFPTwVFlPP6pJ2gvRfI7gQUfmNAtf6Gs0wQxDsKGlVBdF8rCa3jzdwMaGHOsItrZk7hAyOzpK9VS06j5F49b0VNGOOfKs3lDToMsMBe9ZWtHFEgxTJLs7qrygKZjUnmCYoeAqeU6jqWuLJup4WghOdvCYJnrSkSzoyRkm5M2StQwVltPkfCAk58tET/CSg+8MUecmotMEnhBKfWBIZsg2ihruMJQaoIm+tkTLKEqspMh00w95gvFCQRtDwTT1gVDDSEVdlwqZfxoQRbK0g+tbiBZxzKlpnpypejdDwTaeOvorMk/IJE10h9CqRe28hhLbe0pMsdSwv4ZbhKivo2BjDWfL8UKJgeavwlwb5KlwhyE4u4XkGE2ytZCznKLCDZZq42VzT8HLCrpruFbIfOIINmh/qCdZ1ZBc65kLHR1Bkyf5zn6pN3SvGKIlFNGplhrO9QSXanLOMQTLCa0YJCRrCZm/CZmrLTm7WzCK4GJDiWUdFeYx1LCFg3NMd0XmCuF3Y5rITLDUsYS9zoHVzwnJoYpSTQoObyEzr4cFBNqYTopoaU/wkyLZ2lPhX/5Y95ulxGTV7KjhWrOZgl8MyUUafjYraNjNU1N3IWcjT5WzWqjwtoarHSUObGYO3GCJZpsBlnJGPd6ZYLyl1GdCA2625IwwJDP8GUKymbzuyPlZlvTUsaUh5zFDhRWFzPKKZLAlWdcQbObgF9tOqOsmB1dqcqYJmWstFbZRRI9poolmqiLnU0POvxScpah2iSL5UJNzgScY5+AuIbpO0YD3NCW+dLMszFSdFCWGqG6eVq2uYVNDdICGD6W7EPRWZEY5gpsE9rUkS3mijzzJnm6UpUFXG1hCUeVoS5WfNcFpblELL2qqrCvMvRfd45oalvKU2tiQ6ePJOVMRXase9iTtLJztPxJKLWpo2CRDcJwn2sWSLKIO1WQWNTCvpVUvOZhgSC40JD0dOctaSqzkCRbXsKlb11Oip6PCJ0IwSJM31j3akRxlP7Rwn6aGaUL0qiLnJkvB3xWZ2+Q1TfCwpQH3G0o92UzmX4o/oJNQMMSQc547wVHhdk+VCw01DFYEnTxzZKAm74QmeNNR1w6WzEhNK15VJzuCdxQ53dRUDws5KvwgBMOEgpcVNe0hZI6RXT1Jd0cyj5nsaEAHgVmGaJIlWdsc5Ui2ElrRR6jrRAttNMEAIWrTDFubkZaok7/AkzfIwfuWVq0jHzuCK4QabtLUMVPB3kJ0oyHTSVFlqMALilJf2Rf8k5aaHtMfayocLBS8L89oKoxpJvnAkDPa0qp5DAUTHKWmCcnthlou8iCKaFFLHWcINd1nyIwXqrSxMNmSs6KmoL2QrKuWtlQ5V0120xQ5vRyZS1rgFkWwhiOwiuQbR0OOVhQM9iS3tiXp4RawRPMp5tDletOOBL95MpM01dZTBM9pkn5qF010rIeHFcFZhmSGpYpTsI6nwhqe5C9ynhlpp5ophuRb6WcJFldkVnVEwwxVfrVkvnWUuNLCg5bgboFHPDlDPDmnK7hUrWiIbjadDclujlZcaokOFup4Ri1kacV6jmrrK1hN9bGwpKEBQ4Q6DvIUXOmo6U5LqQM6EPyiKNjVkPnJkDPNEaxhiFay5ExW1NXVUGqcpYYdPcGiCq7z/TSlbhL4pplWXKd7NZO5QQFrefhRQW/NHOsqcIglc4UhWklR8K0QzbAw08CBDnpbgqXdeD/QUsM4RZXDFBW6WJKe/mFPdH0LtBgiq57wFLzlyQzz82qYx5D5WJP5yVJDW01BfyHnS6HKO/reZqId1WGa4Hkh2kWodJ8i6KoIPlAj2hPt76CzXsVR6koPRzWTfKqIentatYpQw2me4AA3y1Kind3SwoOKZDcFXTwl9tWU6mfgRk9d71sKtlNwrjnYw5tC5n5LdKiGry3JKNlHEd3oaMCFHrazBPMp/uNJ+V7IudcSbeOIdjUEdwl0VHCOZo5t6YluEuaC9mQeMgSfOyKnYGFHcIeQ84yQWbuJYJpZw5CzglDH7gKnWqqM9ZTaXcN0TeYhR84eQtJT76JJ1lREe7WnnvsMmRc9FQ7SBBM9mV3lCUdmHk/S2RAMt0QjFNFqQpWjDPQ01DXWUdDBkXziKPjGEP3VP+zIWU2t7im41FOloyWzn/L6dkUy3VLDaZ6appgDLHPjJEsyvJngWEPUyVBiAaHCTEXwrLvSEbV1e1gKJniicWorC1MUrVjB3uDhJE/wgSOzk1DXpk0k73qCM8xw2UvD5kJmDUfOomqMpWCkJRlvKXGmoeBm18USjVIk04SClxTB6YrgLAPLWYK9HLUt5cmc0vYES8GnTeRc6skZbQkWdxRsIcyBRzx1DbTk9FbU0caTPOgJHhJKnOGIVhQqvKmo0llRw9sabrZkDtdg3PqaKi9oatjY8B+G371paMg6+mZFNNtQ04mWBq3rYLOmtWWQp8KJnpy9DdFensyjdqZ+yY40VJlH8wcdLzC8PZnvHMFUTZUrDTkLyQaGus5X5LzpYAf3i+e/ZlhqGqWhh6Ou6xTR9Z6oi5AZZtp7Mj2EEm8oSpxiYZCHU/1fbGdNNNRRoZMhmilEb2gqHOEJDtXkHK/JnG6IrvbPCwV3NhONVdS1thBMs1T4QOBcTWa2IzhMk2nW5Kyn9tXUtpv9RsG2msxk+ZsQzRQacJncpgke0+T8y5Fzj8BiGo7XlJjaTIlpQs7KFjpqGnKuoyEPeIKnFMkZHvopgh81ySxNFWvJWcKRs70j2FOT012IllEEO1n4pD1513Yg2ssQPOThOkvyrqHUdEXOSEsihmBbTbKX1kLBPWqWkLOqJbjB3GBIZmoa8qWl4CG/iZ7oiA72ZL7TJNeZUY7kFQftDcHHluBzRbCegzMtrRjVQpX2lgoPKKLJAkcbMl01XK2p7yhL8pCBbQ3BN2avJgKvttcrWDK3CiUOVxQ8ZP+pqXKyIxnmBymCg5vJjNfkPK4+c8cIfK8ocVt7kmfd/I5SR1hKvCzUtb+lhgc00ZaO6CyhIQP1Uv4yIZjload72PXX0OIJvnFU+0Zf6MhsJwTfW0r0UwQfW4LNLZl5HK261JCZ4qnBaAreVAS3WrjV0LBnNDUNNDToCEeFfwgcb4gOEqLRhirWkexrCEYKVV711DLYEE1XBEsp5tpTGjorkomKYF9FDXv7fR3BGwbettSxnyL53MBPjsxDZjMh+VUW9NRxq1DhVk+FSxQcaGjV9Pawv6eGByw5qzoy7xk4RsOShqjJwWKe/1pEEfzkobeD/dQJmpqedcyBTy2sr4nGNRH0c0SPWTLrqAc0OQcb/gemKgqucQT7ySWKCn2EUotoCvpZct7RO2sy/QW0IWcXd7pQRQyZVwT2USRO87uhjioTLKV2brpMUcMQRbKH/N2T+UlTpaMls6cmc6CCNy3JdYYSUzzJQ4oSD3oKLncULOiJvjBEC2oqnCJkJluCYy2ZQ5so9YYlZ1VLlQU1mXEW1jZERwj/MUSRc24TdexlqLKfQBtDTScJUV8FszXBEY5ktpD5Ur9hYB4Nb1iikw3JoYpkKX+RodRKFt53MMuRnKSpY31PwYaGaILh3wxJGz9TkTPEETxoCWZrgvOlmyMzxFEwVJE5xZKzvyJ4WxEc16Gd4Xe3Weq4XH2jKRikqOkGQ87hQnC7wBmGYLAnesX3M+S87eFATauuN+Qcrh7xIxXJbUIdMw3JGE3ylCWzrieaqCn4zhGM19TQ3z1oH1AX+pWEqIc7wNGAkULBo/ZxRaV9NNyh4Br3rCHZzbzmSfawBL0dNRwpW1kK9mxPXR9povcdrGSZK9c2k0xwFGzjuniCtRSZCZ6ccZ7gaktmgAOtKbG/JnOkJrjcQTdFMsxRQ2cLY3WTIrlCw1eWKn8R6pvt4GFDso3QoL4a3nLk3G6JrtME3dSenpx7PNFTmga0EaJTLQ061sEeQoWXhSo9LTXsaSjoJQRXeZLtDclbCrYzfzHHeaKjHCVOUkQHO3JeEepr56mhiyaYYKjjNU+Fed1wS5VlhWSqI/hYUdDOkaxiKehoyOnrCV5yBHtbWFqTHCCwtpDcYolesVR5yUzTZBb3RNMd0d6WP+SvhuBmRcGxnuQzT95IC285cr41cLGQ6aJJhmi4TMGempxeimBRQw1tFKV+8jd6KuzoSTqqDxzRtpZkurvKEHxlqXKRIjjfUNNXQsNOsRScoWFLT+YeRZVD3GRN0MdQcKqQjHDMrdGGVu3iYJpQx3WGUvfbmxwFfR20WBq0oYY7LMFhhgYtr8jpaEnaOzjawWWaTP8mMr0t/EPDPoqcnxTBI5o58L7uoWnMrpoqPwgVrlAUWE+V+TQl9rawoyP6QGAlQw2TPRX+YSkxyBC8Z6jhHkXBgQL7WII3DVFnRfCrBfxewv9D6xsyjys4VkhWb9pUU627JllV0YDNHMku/ldNMMXDEo4aFnAkk4U6frNEU4XgZUPmEKHUl44KrzmYamjAbh0JFvGnaTLPu1s9jPCwjFpYiN7z1DTOk/nc07CfDFzmCf7i+bfNHXhDtLeBXzTBT5rkMvWOIxpl4EMh2LGJBu2syDnAEx2naEhHDWMMzPZEhygyS1mS5RTJr5ZkoKbEUoYqr2kqdDUE8ztK7OaIntJkFrIECwv8LJTaVx5XJE86go8dFeZ3FN3rjabCAYpoYEeC9zzJVULBbmZhDyd7ko09ydpNZ3nm2Kee4FPPXHnYEF1nqOFEC08LUVcDvYXkJHW8gTaKCk9YGOeIJhqiE4ToPEepdp7IWFjdwnWaufGMwJJCMtUTTBBK9BGCOy2tGGrJTHIwyEOzp6aPzNMOtlZkDvcEWpP5SVNhfkvDxhmSazTJXYrM9U1E0xwFVwqZQwzJxw6+kGGGUj2FglGGmnb1/G51udRSMNlTw6GGnCcUwVcOpmsqTHa06o72sw1RL02p9z0VbnMLOaIX3QKaYKSCFQzBKEUNHTSc48k53RH9wxGMtpQa5KjjW0W0n6XCCCG4yxNNdhQ4R4l1Ff+2sSd6UFHiIEOyqqFgT01mEUMD+joy75jPhOA+oVVLm309FR4yVOlp4RhLiScNmSmaYF5Pw0STrOIoWMSR2UkRXOMp+M4SHW8o8Zoi6OZgjKOaFar8zZDzkWzvKOjkKBjmCXby8JahhjXULY4KlzgKLvAwxVGhvyd4zxB1d9T0piazmKLCVZY5sKiD0y2ZSYrkUEPUbIk+dlQ4SJHTR50k1DPaUWIdTZW9NJwnJMOECgd7ou/MnppMJ02O1VT4Wsh85MnZzcFTngpXGKo84qmwgKbCL/orR/SzJ2crA+t6Mp94KvxJUeIbT3CQu1uIdlQEOzlKfS3UMcrTiFmOuroocrZrT2AcmamOKg8YomeEKm/rlT2sociMaybaUlFhuqHCM2qIJ+rg4EcDFymiDSxzaHdPcpE62pD5kyM5SBMoA1PaUtfIthS85ig1VPiPPYXgYEMNk4Qq7TXBgo7oT57gPUdwgCHzhIVFPFU6OYJzHAX9m5oNrVjeE61miDrqQ4VSa1oiURTsKHC0IfjNwU2WzK6eqK8jWln4g15TVBnqmDteCJ501PGAocJhhqjZdtBEB6lnhLreFJKxmlKbeGrqLiSThVIbCdGzloasa6lpMQXHCME2boLpJgT7yWaemu6wBONbqGNVRS0PKIL7LckbjmQtR7K8I5qtqel+T/ChJTNIKLjdUMNIRyvOEko9YYl2cwQveBikCNawJKcLBbc7+JM92mysNvd/Fqp8a0k6CNEe7cnZrxlW0wQXaXjaktnRwNOGZKYiONwS7a1JVheq3WgJHlQUGKHKmp4KAxXR/ULURcNgoa4zhKSLpZR3kxRRb0NmD0OFn+UCS7CzI1nbP6+o4x47QZE5xRCt3ZagnYcvmpYQktXdk5YKXTzBC57kKEe0VVuiSYqapssMS3C9p2CKkHOg8B8Pa8p5atrIw3qezIWanMGa5HRDNF6RM9wcacl0N+Q8Z8hsIkSnaIIdHRUOEebAPy1zbCkhM062FCJtif7PU+UtoVXzWKqM1PxXO8cfdruhFQ/a6x3JKYagvVDhQEtNiyiiSQ7OsuRsZUku0CRNDs4Sog6KKjsZgk2bYJqijgsEenoKeniinRXBn/U3lgpPdyDZynQx8IiioMnCep5Ky8mjGs6Wty0l1hUQTcNWswS3WRp2kCNZwJG8omG8JphPUaFbC8lEfabwP7VtM9yoaNCAjpR41VNhrD9LkbN722v0CoZMByFzhaW+MyzRYEWFDQwN2M4/JiT76PuljT3VU/A36eaIThb+R9oZGOAJ9tewkgGvqOMNRWYjT/Cwu99Q8LqDE4TgbLWxJ1jaDDAERsFOFrobgjUsBScaguXU8kKm2RL19tRypSHnHNlHiIZqgufs4opgQdVdwxBNNFBR6kVFqb8ogimOzB6a6HTzrlDHEpYaxjiiA4TMQobkDg2vejjfwJGWmnbVFAw3H3hq2NyQfG7hz4aC+w3BbwbesG0swYayvpAs6++Ri1Vfzx93mFChvyN5xVHTS+0p9aqCAxyZ6ZacZyw5+7uuQkFPR9DDk9NOiE7X1PCYJVjVUqq7JlrHwWALF5nfHNGjApdpqgzx5OwilDhCiDYTgnc9waGW4BdLNNUQvOtpzDOWHDH8D7TR/A/85KljEQu3NREc4Pl/6B1Hhc8Umb5CsKMmGC9EPcxoT2amwHNCmeOEnOPbklnMkbOgIvO5UMOpQrS9UGVdt6iH/fURjhI/WOpaW9OKLYRod6HCUEdOX000wpDZQ6hwg6LgZfOqo1RfT/CrJzjekXOGhpc1VW71ZLbXyyp+93ILbC1kPtIEYx0FIx1VDrLoVzXRKRYWk809yYlC9ImcrinxtabKnzRJk3lAU1OLEN1j2zrYzr2myHRXJFf4h4QKT1qSTzTB5+ZNTzTRkAxX8FcLV2uS8eoQQ2aAkFzvCM72sJIcJET3WPjRk5wi32uSS9rfZajpWEvj9hW42F4o5NytSXYy8IKHay10VYdrcl4SkqscrXpMwyGOgtkajheSxdQqmpxP1L3t4R5PqasFnrQEjytq6qgp9Y09Qx9o4S1FzhUCn1kyHSzBWLemoSGvOqLNhZyBjmCaAUYpMgt4Ck7wBBMMwWKWgjsUwTaGVsxWC1mYoKiyqqeGKYqonSIRQ3KIkHO0pmAxTdBHkbOvfllfr+AA+7gnc50huVKYK393FOyg7rbPO/izI7hE4CnHHHnJ0ogNPRUGeUpsrZZTBJcrovUcJe51BPsr6GkJdhCCsZ6aTtMEb2pqWkqeVtDXE/QVggsU/Nl86d9RMF3DxvZTA58agu810RWawCiSzzXBeU3MMW9oyJUedvNEvQyNu1f10BSMddR1vaLCYpYa/mGocLSiYDcLbQz8aMn5iyF4xBNMs1P0QEOV7o5gaWGuzSeLue4tt3ro7y4Tgm4G/mopdZgl6q0o6KzJWE3mMksNr3r+a6CbT8g5wZNzT9O7fi/zpaOmnz3BRoqos+tv9zMbdpxsqDBOEewtJLt7cg5wtKKbvldpSzRRCD43VFheCI7yZLppggMVBS/KMAdHODJvOwq2NQSbKKKPLdFWQs7Fqo+mpl01JXYRgq8dnGLhTiFzqmWsUMdpllZdbKlyvSdYxhI9YghOtxR8LgSLWHK62mGGVoxzBE8LNWzqH9CUesQzFy5RQzTc56mhi6fgXEWwpKfE5Z7M05ZgZUPmo6auiv8YKzDYwWBLMErIbKHJvOwIrvEdhOBcQ9JdU1NHQ7CXn2XIDFBKU2WAgcX9UAUzDXWd5alwuyJ41Z9rjKLCL4aCp4WarhPm2rH+SaHUYE001JDZ2ZAzXPjdMpZWvC9wmqIB2lLhQ01D5jO06hghWMndbM7yRJMsoCj1vYbnFQVrW9jak3OlEJ3s/96+p33dEPRV5GxiqaGjIthUU6FFEZyqCa5qJrpBdzSw95IUnOPIrCUUjRZQFrbw5PR0R1qiYx3cb6nrWUMrBmmiBQxVHtTew5ICP/ip6g4hed/Akob/32wvBHsIOX83cI8hGeNeNPCIkPmXe8fPKx84OMSRM1MTdXSwjCZ4S30jVGhvqTRak/OVhgGazHuOCud5onEO1lJr6ecVyaOK6H7zqlBlIaHE0oroCgfvGJIdPcmfLNGLjpz7hZwZQpUbFME0A1cIJa7VNORkgfsMBatbKgwwJM9bSvQXeNOvbIjelg6WWvo5kvbKaJJNHexkKNHL9xRyFlH8Ti2riB5wVPhUk7nGkJnoCe428LR/wRGdYIlmWebCyxou1rCk4g/ShugBDX0V0ZQWkh0dOVsagkM0yV6OoLd5ye+pRlsCr0n+KiQrGuq5yJDzrTAXHtLUMduTDBVKrSm3eHL+6ijxhFDX9Z5gVU/wliHYTMiMFpKLNMEywu80wd3meoFmt6VbRMPenhrOc6DVe4pgXU8DnnHakLOIIrlF4FZPIw6R+zxBP0dyq6OOZ4Q5sLKCcz084ok+VsMMyQhNZmmBgX5xIXOEJTmi7VsGTvMTNdHHhpzdbE8Du2oKxgvBqQKdDDnTFOylCFaxR1syz2iqrOI/FEpNc3C6f11/7+ASS6l2inq2ciTrCCzgyemrCL5SVPjQkdPZUmGy2c9Sw9FtR1sS30RmsKPCS4rkIC/2U0MduwucYolGaPjKEyhzmiPYXagyWbYz8LWBDdzRimAXzxx4z8K9hpzlhLq+NiQ97HuKorMUfK/OVvC2JfiHUPCQI/q7J2gjK+tTDNxkCc4TMssqCs4TGtLVwQihyoAWgj9bosU80XGW6Ac9TJGziaUh5+hnFcHOnlaM1iRn29NaqGENTTTSUHCH2tWTeV0osUhH6psuVLjRUmGWhm6OZEshGeNowABHcJ2Bpy2ZszRcKkRXd2QuKVEeXnbfaEq825FguqfgfE2whlChSRMdron+LATTPQ2Z369t4B9C5gs/ylzv+CMmepIDPclFQl13W0rspPd1JOcbghGOEutqCv5qacURQl3dDKyvyJlqKXGPgcM9FfawJAMVmdcspcYKOZc4GjDYkFlK05olNMHyHn4zFNykyOxt99RkHlfwmiHo60l2EKI+mhreEKp080Tbug08BVPcgoqC5zWt+NLDTZ7oNSF51N1qie7Va3uCCwyZbkINf/NED6jzOsBdZjFN8oqG3wxVunqCSYYKf3EdhJyf9YWGf7tRU2oH3VHgPr1fe5J9hOgHd7xQ0y7qBwXr23aGErP0cm64JVjZwsOGqL+mhNgZmhJLW2oY4UhedsyBgzrCKrq7BmcpNVhR6jBPq64Vgi+kn6XE68pp8J5/+0wRHGOpsKenQn9DZntPzjRLZpDAdD2fnSgkG9tmIXnUwQ6WVighs7Yi2MxQ0N3CqYaCXkJ0oyOztMDJjmSSpcpvlrk0RMMOjmArQ04PRV1DO1FwhCVaUVPpKUM03JK5SxPsIWRu8/CGHi8UHChiqGFDTbSRJWeYUDDcH6vJWUxR4k1FXbMUwV6e4AJFXS8oMqsZKqzvYQ9DDQdZckY4aGsIhtlubbd2r3j4QBMoTamdPZk7O/Bf62lacZwneNjQoGcdVU7zJOd7ghsUHOkosagic6cnWc8+4gg285R6zZP5s1/LUbCKIznTwK36PkdwlOrl4U1LwfdCCa+IrvFkmgw1PCAUXKWo0sURXWcI2muKJlgyFzhynCY4RBOsqCjoI1R5zREco0n2Vt09BQtYSizgKNHfUmUrQ5UOCh51BFcLmY7umhYqXKQomOop8bUnWNNQcIiBcYaC6xzMNOS8JQQfeqKBmmglB+97ok/lfk3ygaHSyZaCRTzRxQo6GzLfa2jWBPepw+UmT7SQEJyiyRkhBLMVOfcoMjcK0eZChfUNzFAUzCsEN5vP/X1uP/n/aoMX+K+nw/Hjr/9xOo7j7Pju61tLcgvJpTWXNbfN5jLpi6VfCOviTktKlFusQixdEKWmEBUKNaIpjZRSSOXSgzaaKLdabrm1/9nZ+/f+vd/vz/v9+Xy+zZ7PRorYoZqyLrCwQdEAixxVOEXNNnjX2nUSRlkqGmWowk8lxR50JPy9Bo6qJXaXwNvREBvnThPEPrewryLhcAnj5WE15Fqi8W7R1sAuEu86S4ENikItFN4xkv9Af4nXSnUVcLiA9xzesFpivRRVeFKtsMRaKBhuSbjOELnAUtlSQUpXgdfB4Z1oSbnFEetbQ0IrAe+Y+pqnDcEJFj6S8LDZzZHwY4e3XONNlARraomNEt2bkvGsosA3ioyHm+6jCMbI59wqt4eeara28IzEmyPgoRaUOEDhTVdEJhmCoTWfC0p8aNkCp0oYqih2iqGi4yXeMkOsn4LdLLnmKfh/YogjNsPebeFGR4m9BJHLzB61XQ3BtpISfS2FugsK9FAtLWX1dCRcrCnUp44CNzuCowUZmxSRgYaE6Za0W2u/E7CVXCiI/UOR8aAm1+OSyE3mOUcwyc1zBBeoX1kiKy0Zfxck1Gsyulti11i83QTBF5Kg3pDQThFMVHiPSlK+0cSedng/VaS8bOZbtsBcTcZAR8JP5KeqQ1OYKAi20njdNNRpgnsU//K+JnaXJaGTomr7aYIphoRn9aeShJWKEq9LcozSF7QleEfDI5LYm5bgVkFkRwVDBCVu0DDIkGupo8TZBq+/pMQURYErJQmPKGKjNDkWOLx7Jd5QizdUweIaKrlP7SwJDhZvONjLkOsBBX9UpGxnydhXkfBLQ8IxgojQbLFnJf81JytSljclYYyEFyx0kVBvKWOFJmONpshGAcsduQY5giVNCV51eOdJYo/pLhbvM0uDHSevNKRcrKZIqnCtJeEsO95RoqcgGK4ocZcho1tTYtcZvH41pNQ7vA0WrhIfOSraIIntIAi+NXWCErdbkvrWwjRLrt0NKUdL6KSOscTOdMSOUtBHwL6OLA0vNSdynaWQEnCpIvKaIrJJEbvHkmuNhn6OjM8VkSGSqn1uYJCGHnq9I3aLhNME3t6GjIkO7xrNFumpyTNX/NrwX7CrIRiqqWijI9JO4d1iieykyfiposQIQ8YjjsjlBh6oHWbwRjgYJQn2NgSnNycmJAk3NiXhx44Sxykihxm8ybUwT1OVKySc7vi3OXVkdBJ4AyXBeksDXG0IhgtYY0lY5ahCD0ehborIk5aUWRJviMA7Xt5kyRjonrXENkm8yYqgs8VzgrJmClK20uMM3jRJ0FiQICQF9hdETlLQWRIb5ki6WDfWRPobvO6a4GP5mcOrNzDFELtTkONLh9dXE8xypEg7z8A9jkhrQ6Fhjlg/QVktJXxt4WXzT/03Q8IaQWSqIuEvloQ2mqC9Jfi7wRul4RX3pSPlzpoVlmCtI2jvKHCFhjcM3sN6lqF6HxnKelLjXWbwrpR4xzuCrTUZx2qq9oAh8p6ixCUGr78g8oyjRAtB5CZFwi80VerVpI0h+IeBxa6Zg6kWvpDHaioYYuEsRbDC3eOmC2JvGYLeioxGknL2UATNJN6hmtj1DlpLvDVmocYbrGCVJKOrg4X6DgddLA203BKMFngdJJFtFd7vJLm6KEpc5yjQrkk7M80SGe34X24nSex1Ra5Omgb71JKyg8SrU3i/kARKwWpH0kOGhKkObyfd0ZGjvyXlAkVZ4xRbYJ2irFMkFY1SwyWxr2oo4zlNiV+7zmaweFpT4kR3kaDAFW6xpSqzJay05FtYR4HmZhc9UxKbbfF2V8RG1MBmSaE+kmC6JnaRXK9gsiXhJHl/U0qM0WTcbyhwkYIvFGwjSbjfwhiJt8ZSQU+Bd5+marPMOkVkD0muxYLIfEuhh60x/J92itguihJSEMySVPQnTewnEm+620rTQEMsOfo4/kP/0ARvWjitlpSX7GxBgcMEsd3EEeYWvdytd+Saawi6aCIj1CkGb6Aj9rwhx16Cf3vAwFy5pyLhVonXzy51FDpdEblbkdJbUcEPDEFzQ8qNmhzzLTmmKWKbFCXeEuRabp6rxbvAtLF442QjQ+wEA9eL1xSR7Q0JXzlSHjJ4exq89yR0laScJ/FW6z4a73pFMEfDiRZvuvijIt86RaSFOl01riV2mD1UEvxGk/Geg5aWwGki1zgKPG9J2U8PEg8qYvMsZeytiTRXBMslCU8JSlxi8EabjwUldlDNLfzTUmCgxWsjqWCOHavYAqsknKFIO0yQ61VL5AVFxk6WhEaCAkdJgt9aSkzXlKNX2jEa79waYuc7gq0N3GDJGCBhoiTXUEPsdknCUE1CK0fwsiaylSF2uiDyO4XX3pFhNd7R4itFGc0k/ElBZwWvq+GC6szVeEoS/MZ+qylwpKNKv9Z469UOjqCjwlusicyTxG6VpNxcQ8IncoR4RhLbR+NdpGGmJWOcIzJGUuKPGpQg8rrG21dOMqQssJQ4RxH5jaUqnZuQ0F4Q+cjxLwPtpZbIAk3QTJHQWBE5S1BokoVtDd6lhqr9UpHSUxMcIYl9pojsb8h4SBOsMQcqvOWC2E8EVehqiJ1hrrAEbQxeK0NGZ0Gkq+guSRgniM23bIHVkqwx4hiHd7smaOyglyIyQuM978j4VS08J/A2G1KeMBRo4fBaSNhKUEZfQewVQ/C1I+MgfbEleEzCUw7mKXI0M3hd1EESVji8x5uQ41nxs1q4RMJCCXs7Iq9acpxn22oSDnQ/sJTxsCbHIYZiLyhY05TY0ZLIOQrGaSJDDN4t8pVaIrsqqFdEegtizc1iTew5Q4ayBDMUsQMkXocaYkc0hZua412siZ1rSXlR460zRJ5SlHGe5j801RLMlJTxtaOM3Q1pvxJ45zUlWFD7rsAbpfEm1JHxG0eh8w2R7QQVzBUw28FhFp5QZzq8t2rx2joqulYTWSuJdTYfWwqMFMcovFmSyJPNyLhE4E10pHzYjOC3huArRa571ZsGajQpQx38SBP5pyZB6lMU3khDnp0MBV51BE9o2E+TY5Ml2E8S7C0o6w1xvCZjf0HkVEHCzFoyNmqC+9wdcqN+Tp7jSDheE9ws8Y5V0NJCn2bk2tqSY4okdrEhx1iDN8cSudwepWmAGXKcJXK65H9to8jYQRH7SBF01ESUJdd0TayVInaWhLkOjlXE5irKGOnI6GSWGCJa482zBI9rCr0jyTVcEuzriC1vcr6mwFGSiqy5zMwxBH/TJHwjSPhL8+01kaaSUuMFKTcLEvaUePcrSmwn8DZrgikWb7CGPxkSjhQwrRk57tctmxLsb9sZvL9LSlyuSLlWkqOjwduo8b6Uv1DkmudIeFF2dHCgxVtk8dpIvHpBxhEOdhKk7OLIUSdJ+cSRY57B+0DgGUUlNfpthTfGkauzxrvTsUUaCVhlKeteTXCoJDCa2NOKhOmC4G1H8JBd4OBZReSRGkqcb/CO1PyLJTLB4j1q8JYaIutEjSLX8YKM+a6phdMsdLFUoV5RTm9JSkuDN8WcIon0NZMNZWh1q8C7SJEwV5HxrmnnTrf3KoJBlmCYI2ilSLlfEvlE4011NNgjgthzEua0oKK7JLE7HZHlEl60BLMVFewg4EWNt0ThrVNEVkkiTwpKXSWJzdRENgvKGq4IhjsiezgSFtsfCUq8qki5S1LRQeYQQ4nemmCkImWMw3tFUoUBZk4NOeZYEp4XRKTGa6wJjrWNHBVJR4m3FCnbuD6aak2WsMTh3SZImGCIPKNgsDpVwnsa70K31lCFJZYcwwSMFcQulGTsZuEaSdBXkPGZhu0FsdUO73RHjq8MPGGIfaGIbVTk6iuI3GFgucHrIQkmWSJdBd7BBu+uOryWAhY7+Lki9rK5wtEQzWwvtbqGhIMFwWRJsElsY4m9IIg9L6lCX0VklaPAYkfkZEGDnOWowlBJjtMUkcGK4Lg6EtoZInMUBVYLgn0UsdmCyCz7gIGHFfk+k1QwTh5We7A9x+IdJ6CvIkEagms0hR50eH9UnTQJ+2oiKyVlLFUE+8gBGu8MQ3CppUHesnjTHN4QB/UGPhCTHLFPHMFrCqa73gqObUJGa03wgbhHkrCfpEpzNLE7JDS25FMKhlhKKWKfCgqstLCPu1zBXy0J2ztwjtixBu8UTRn9LVtkmCN2iyFhtME70JHRQ1KVZXqKI/KNIKYMCYs1GUMEKbM1bKOI9LDXC7zbHS+bt+1MTWS9odA9DtrYtpbImQJ2VHh/lisEwaHqUk1kjKTAKknkBEXkbkdMGwq0dnhzLJF3NJH3JVwrqOB4Sca2hti75nmJN0WzxS6UxDYoEpxpa4htVlRjkYE7DZGzJVU72uC9IyhQL4i8YfGWSYLLNcHXloyz7QhNifmKSE9JgfGmuyLhc403Xm9vqcp6gXe3xuuv8F6VJNxkyTHEkHG2g0aKXL0MsXc1bGfgas2//dCONXiNLCX+5mB7eZIl1kHh7ajwpikyzlUUWOVOsjSQlsS+M0R+pPje/dzBXRZGO0rMtgQrLLG9VSu9n6CMXS3BhwYmSoIBhsjNBmZbgusE9BCPCP5triU4VhNbJfE+swSP27aayE8tuTpYYjtrYjMVGZdp2NpS1s6aBnKSHDsbKuplKbHM4a0wMFd/5/DmGyKrJSUaW4IBrqUhx0vyfzTBBLPIUcnZdrAkNsKR0sWRspumSns6Ch0v/qqIbBYUWKvPU/CFoyrDJGwSNFhbA/MlzKqjrO80hRbpKx0Jewsi/STftwGSlKc1JZyAzx05dhLEdnfQvhZOqiHWWEAHC7+30FuRcZUgaO5gpaIK+xsiHRUsqaPElTV40xQZQ107Q9BZE1nryDVGU9ZSQ47bmhBpLcYpUt7S+xuK/FiT8qKjwXYw5ypS2iuCv7q1gtgjhuBuB8LCFY5cUuCNtsQOFcT+4Ih9JX+k8Ea6v0iCIRZOtCT0Et00JW5UeC85Cg0ScK0k411HcG1zKtre3SeITBRk7WfwDhEvaYLTHP9le0m8By0JDwn4TlLW/aJOvGHxdjYUes+ScZigCkYQdNdEOhkiezgShqkx8ueKjI8lDfK2oNiOFvrZH1hS+tk7NV7nOmLHicGWEgubkXKdwdtZknCLJXaCpkrjZBtLZFsDP9CdxWsSr05Sxl6CMmoFbCOgryX40uDtamB7SVmXW4Ihlgpmq+00tBKUUa83WbjLUNkzDmY7cow1JDygyPGlhgGKYKz4vcV7QBNbJIgM11TUqZaMdwTeSguH6rOaw1JRKzaaGyxVm2EJ/uCIrVWUcZUkcp2grMsEjK+DMwS59jQk3Kd6SEq1d0S6uVmO4Bc1lDXTUcHjluCXEq+1OlBDj1pi9zgiXxnKuE0SqTXwhqbETW6RggMEnGl/q49UT2iCzgJvRwVXS2K/d6+ZkyUl7jawSVLit46EwxVljDZwoSQ20sDBihztHfk2yA8NVZghiXwrYHQdfKAOtzsayjhY9bY0yE2CWEeJ9xfzO423xhL5syS2TFJofO2pboHob0nY4GiAgRrvGQEDa/FWSsoaaYl0syRsEt3kWoH3B01shCXhTUWe9w3Bt44SC9QCh3eShQctwbaK2ApLroGCMlZrYqvlY3qYhM0aXpFkPOuoqJ3Dm6fxXrGwVF9gCWZagjPqznfkuMKQ8DPTQRO8ZqG1hPGKEm9IgpGW4DZDgTNriTxvFiq+Lz+0cKfp4wj6OCK9JSnzNSn9LFU7UhKZZMnYwcJ8s8yRsECScK4j5UOB95HFO0CzhY4xJxuCix0lDlEUeMdS6EZBkTsUkZ4K74dugyTXS7aNgL8aqjDfkCE0ZbwkCXpaWCKhl8P7VD5jxykivSyxyZrYERbe168LYu9ZYh86IkscgVLE7tWPKmJv11CgoyJltMEbrohtVAQfO4ImltiHEroYEs7RxAarVpY8AwXMcMReFOTYWe5iiLRQxJ5Q8DtJ8LQhWOhIeFESPGsILhbNDRljNbHzNRlTFbk2S3L0NOS6V1KFJYKUbSTcIIhM0wQ/s2TM0SRMNcQmSap3jCH4yhJZKSkwyRHpYYgsFeQ4U7xoCB7VVOExhXepo9ABBsYbvGWKXPME3lyH95YioZ0gssQRWWbI+FaSMkXijZXwgiTlYdPdkNLaETxlyDVIwqeaEus0aTcYcg0RVOkpR3CSJqIddK+90JCxzsDVloyrFd5ZAr4TBKfaWa6boEA7C7s6EpYaeFPjveooY72mjIccLHJ9HUwVlDhKkmutJDJBwnp1rvulJZggKDRfbXAkvC/4l3ozQOG9a8lxjx0i7nV4jSXc7vhe3OwIxjgSHjdEhhsif9YkPGlus3iLFDnWOFhtCZbJg0UbQcIaR67JjthoCyMEZRwhiXWyxO5QxI6w5NhT4U1WsJvDO60J34fW9hwzwlKij6ZAW9ne4L0s8C6XeBMEkd/LQy1VucBRot6QMlbivaBhoBgjqGiCJNhsqVp/S2SsG6DIONCR0dXhvWbJ+MRRZJkkuEjgDXJjFQW6SSL7GXK8Z2CZg7cVsbWGoKmEpzQ5elpiy8Ryg7dMkLLUEauzeO86CuwlSOlgYLojZWeJ9xM3S1PWfEfKl5ISLQ0MEKR8YOB2QfCxJBjrKPCN4f9MkaSsqoVXJBmP7EpFZ9UQfOoOFwSzBN4MQ8LsGrymlipcJQhmy0GaQjPqCHaXRwuCZwRbqK2Fg9wlClZqYicrIgMdZfxTQ0c7TBIbrChxmuzoKG8XRaSrIhhiyNFJkrC7oIAWMEOQa5aBekPCRknCo4IKPrYkvCDI8aYmY7WFtprgekcJZ3oLIqssCSMtFbQTJKwXYy3BY5oCh2iKPCpJOE+zRdpYgi6O2KmOAgvVCYaU4ySRek1sgyFhJ403QFHiVEmJHwtybO1gs8Hr5+BETQX3War0qZngYGgtVZtoqd6vFSk/UwdZElYqyjrF4HXUeFspIi9IGKf4j92pKGAdCYMVsbcV3kRF0N+R8LUd5PCsIGWoxDtBkCI0nKofdJQxT+LtZflvuc8Q3CjwWkq8KwUpHzkK/NmSsclCL0nseQdj5FRH5CNHSgtLiW80Of5HU9Hhlsga9bnBq3fEVltKfO5IaSTmGjjc4J0otcP7QsJUSQM8pEj5/wCuUuC2DWz8AAAAAElFTkSuQmCC");
-}
diff --git a/WebContent/addon/codemirror/theme/base16-dark.css b/WebContent/addon/codemirror/theme/base16-dark.css
deleted file mode 100644
index 026a816..0000000
--- a/WebContent/addon/codemirror/theme/base16-dark.css
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-
- Name: Base16 Default Dark
- Author: Chris Kempson (http://chriskempson.com)
-
- CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
- Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-base16-dark.CodeMirror { background: #151515; color: #e0e0e0; }
-.cm-s-base16-dark div.CodeMirror-selected { background: #303030; }
-.cm-s-base16-dark .CodeMirror-line::selection, .cm-s-base16-dark .CodeMirror-line > span::selection, .cm-s-base16-dark .CodeMirror-line > span > span::selection { background: rgba(48, 48, 48, .99); }
-.cm-s-base16-dark .CodeMirror-line::-moz-selection, .cm-s-base16-dark .CodeMirror-line > span::-moz-selection, .cm-s-base16-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(48, 48, 48, .99); }
-.cm-s-base16-dark .CodeMirror-gutters { background: #151515; border-right: 0px; }
-.cm-s-base16-dark .CodeMirror-guttermarker { color: #ac4142; }
-.cm-s-base16-dark .CodeMirror-guttermarker-subtle { color: #505050; }
-.cm-s-base16-dark .CodeMirror-linenumber { color: #505050; }
-.cm-s-base16-dark .CodeMirror-cursor { border-left: 1px solid #b0b0b0; }
-
-.cm-s-base16-dark span.cm-comment { color: #8f5536; }
-.cm-s-base16-dark span.cm-atom { color: #aa759f; }
-.cm-s-base16-dark span.cm-number { color: #aa759f; }
-
-.cm-s-base16-dark span.cm-property, .cm-s-base16-dark span.cm-attribute { color: #90a959; }
-.cm-s-base16-dark span.cm-keyword { color: #ac4142; }
-.cm-s-base16-dark span.cm-string { color: #f4bf75; }
-
-.cm-s-base16-dark span.cm-variable { color: #90a959; }
-.cm-s-base16-dark span.cm-variable-2 { color: #6a9fb5; }
-.cm-s-base16-dark span.cm-def { color: #d28445; }
-.cm-s-base16-dark span.cm-bracket { color: #e0e0e0; }
-.cm-s-base16-dark span.cm-tag { color: #ac4142; }
-.cm-s-base16-dark span.cm-link { color: #aa759f; }
-.cm-s-base16-dark span.cm-error { background: #ac4142; color: #b0b0b0; }
-
-.cm-s-base16-dark .CodeMirror-activeline-background { background: #202020; }
-.cm-s-base16-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/WebContent/addon/codemirror/theme/base16-light.css b/WebContent/addon/codemirror/theme/base16-light.css
deleted file mode 100644
index 474e0ca..0000000
--- a/WebContent/addon/codemirror/theme/base16-light.css
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-
- Name: Base16 Default Light
- Author: Chris Kempson (http://chriskempson.com)
-
- CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
- Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-base16-light.CodeMirror { background: #f5f5f5; color: #202020; }
-.cm-s-base16-light div.CodeMirror-selected { background: #e0e0e0; }
-.cm-s-base16-light .CodeMirror-line::selection, .cm-s-base16-light .CodeMirror-line > span::selection, .cm-s-base16-light .CodeMirror-line > span > span::selection { background: #e0e0e0; }
-.cm-s-base16-light .CodeMirror-line::-moz-selection, .cm-s-base16-light .CodeMirror-line > span::-moz-selection, .cm-s-base16-light .CodeMirror-line > span > span::-moz-selection { background: #e0e0e0; }
-.cm-s-base16-light .CodeMirror-gutters { background: #f5f5f5; border-right: 0px; }
-.cm-s-base16-light .CodeMirror-guttermarker { color: #ac4142; }
-.cm-s-base16-light .CodeMirror-guttermarker-subtle { color: #b0b0b0; }
-.cm-s-base16-light .CodeMirror-linenumber { color: #b0b0b0; }
-.cm-s-base16-light .CodeMirror-cursor { border-left: 1px solid #505050; }
-
-.cm-s-base16-light span.cm-comment { color: #8f5536; }
-.cm-s-base16-light span.cm-atom { color: #aa759f; }
-.cm-s-base16-light span.cm-number { color: #aa759f; }
-
-.cm-s-base16-light span.cm-property, .cm-s-base16-light span.cm-attribute { color: #90a959; }
-.cm-s-base16-light span.cm-keyword { color: #ac4142; }
-.cm-s-base16-light span.cm-string { color: #f4bf75; }
-
-.cm-s-base16-light span.cm-variable { color: #90a959; }
-.cm-s-base16-light span.cm-variable-2 { color: #6a9fb5; }
-.cm-s-base16-light span.cm-def { color: #d28445; }
-.cm-s-base16-light span.cm-bracket { color: #202020; }
-.cm-s-base16-light span.cm-tag { color: #ac4142; }
-.cm-s-base16-light span.cm-link { color: #aa759f; }
-.cm-s-base16-light span.cm-error { background: #ac4142; color: #505050; }
-
-.cm-s-base16-light .CodeMirror-activeline-background { background: #DDDCDC; }
-.cm-s-base16-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/WebContent/addon/codemirror/theme/bespin.css b/WebContent/addon/codemirror/theme/bespin.css
deleted file mode 100644
index 60913ba..0000000
--- a/WebContent/addon/codemirror/theme/bespin.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-
- Name: Bespin
- Author: Mozilla / Jan T. Sott
-
- CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
- Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-bespin.CodeMirror {background: #28211c; color: #9d9b97;}
-.cm-s-bespin div.CodeMirror-selected {background: #36312e !important;}
-.cm-s-bespin .CodeMirror-gutters {background: #28211c; border-right: 0px;}
-.cm-s-bespin .CodeMirror-linenumber {color: #666666;}
-.cm-s-bespin .CodeMirror-cursor {border-left: 1px solid #797977 !important;}
-
-.cm-s-bespin span.cm-comment {color: #937121;}
-.cm-s-bespin span.cm-atom {color: #9b859d;}
-.cm-s-bespin span.cm-number {color: #9b859d;}
-
-.cm-s-bespin span.cm-property, .cm-s-bespin span.cm-attribute {color: #54be0d;}
-.cm-s-bespin span.cm-keyword {color: #cf6a4c;}
-.cm-s-bespin span.cm-string {color: #f9ee98;}
-
-.cm-s-bespin span.cm-variable {color: #54be0d;}
-.cm-s-bespin span.cm-variable-2 {color: #5ea6ea;}
-.cm-s-bespin span.cm-def {color: #cf7d34;}
-.cm-s-bespin span.cm-error {background: #cf6a4c; color: #797977;}
-.cm-s-bespin span.cm-bracket {color: #9d9b97;}
-.cm-s-bespin span.cm-tag {color: #cf6a4c;}
-.cm-s-bespin span.cm-link {color: #9b859d;}
-
-.cm-s-bespin .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
-.cm-s-bespin .CodeMirror-activeline-background { background: #404040; }
diff --git a/WebContent/addon/codemirror/theme/blackboard.css b/WebContent/addon/codemirror/theme/blackboard.css
deleted file mode 100644
index b6eaedb..0000000
--- a/WebContent/addon/codemirror/theme/blackboard.css
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Port of TextMate's Blackboard theme */
-
-.cm-s-blackboard.CodeMirror { background: #0C1021; color: #F8F8F8; }
-.cm-s-blackboard div.CodeMirror-selected { background: #253B76; }
-.cm-s-blackboard .CodeMirror-line::selection, .cm-s-blackboard .CodeMirror-line > span::selection, .cm-s-blackboard .CodeMirror-line > span > span::selection { background: rgba(37, 59, 118, .99); }
-.cm-s-blackboard .CodeMirror-line::-moz-selection, .cm-s-blackboard .CodeMirror-line > span::-moz-selection, .cm-s-blackboard .CodeMirror-line > span > span::-moz-selection { background: rgba(37, 59, 118, .99); }
-.cm-s-blackboard .CodeMirror-gutters { background: #0C1021; border-right: 0; }
-.cm-s-blackboard .CodeMirror-guttermarker { color: #FBDE2D; }
-.cm-s-blackboard .CodeMirror-guttermarker-subtle { color: #888; }
-.cm-s-blackboard .CodeMirror-linenumber { color: #888; }
-.cm-s-blackboard .CodeMirror-cursor { border-left: 1px solid #A7A7A7; }
-
-.cm-s-blackboard .cm-keyword { color: #FBDE2D; }
-.cm-s-blackboard .cm-atom { color: #D8FA3C; }
-.cm-s-blackboard .cm-number { color: #D8FA3C; }
-.cm-s-blackboard .cm-def { color: #8DA6CE; }
-.cm-s-blackboard .cm-variable { color: #FF6400; }
-.cm-s-blackboard .cm-operator { color: #FBDE2D; }
-.cm-s-blackboard .cm-comment { color: #AEAEAE; }
-.cm-s-blackboard .cm-string { color: #61CE3C; }
-.cm-s-blackboard .cm-string-2 { color: #61CE3C; }
-.cm-s-blackboard .cm-meta { color: #D8FA3C; }
-.cm-s-blackboard .cm-builtin { color: #8DA6CE; }
-.cm-s-blackboard .cm-tag { color: #8DA6CE; }
-.cm-s-blackboard .cm-attribute { color: #8DA6CE; }
-.cm-s-blackboard .cm-header { color: #FF6400; }
-.cm-s-blackboard .cm-hr { color: #AEAEAE; }
-.cm-s-blackboard .cm-link { color: #8DA6CE; }
-.cm-s-blackboard .cm-error { background: #9D1E15; color: #F8F8F8; }
-
-.cm-s-blackboard .CodeMirror-activeline-background { background: #3C3636; }
-.cm-s-blackboard .CodeMirror-matchingbracket { outline:1px solid grey;color:white !important; }
diff --git a/WebContent/addon/codemirror/theme/cobalt.css b/WebContent/addon/codemirror/theme/cobalt.css
deleted file mode 100644
index d88223e..0000000
--- a/WebContent/addon/codemirror/theme/cobalt.css
+++ /dev/null
@@ -1,25 +0,0 @@
-.cm-s-cobalt.CodeMirror { background: #002240; color: white; }
-.cm-s-cobalt div.CodeMirror-selected { background: #b36539; }
-.cm-s-cobalt .CodeMirror-line::selection, .cm-s-cobalt .CodeMirror-line > span::selection, .cm-s-cobalt .CodeMirror-line > span > span::selection { background: rgba(179, 101, 57, .99); }
-.cm-s-cobalt .CodeMirror-line::-moz-selection, .cm-s-cobalt .CodeMirror-line > span::-moz-selection, .cm-s-cobalt .CodeMirror-line > span > span::-moz-selection { background: rgba(179, 101, 57, .99); }
-.cm-s-cobalt .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
-.cm-s-cobalt .CodeMirror-guttermarker { color: #ffee80; }
-.cm-s-cobalt .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
-.cm-s-cobalt .CodeMirror-linenumber { color: #d0d0d0; }
-.cm-s-cobalt .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-cobalt span.cm-comment { color: #08f; }
-.cm-s-cobalt span.cm-atom { color: #845dc4; }
-.cm-s-cobalt span.cm-number, .cm-s-cobalt span.cm-attribute { color: #ff80e1; }
-.cm-s-cobalt span.cm-keyword { color: #ffee80; }
-.cm-s-cobalt span.cm-string { color: #3ad900; }
-.cm-s-cobalt span.cm-meta { color: #ff9d00; }
-.cm-s-cobalt span.cm-variable-2, .cm-s-cobalt span.cm-tag { color: #9effff; }
-.cm-s-cobalt span.cm-variable-3, .cm-s-cobalt span.cm-def { color: white; }
-.cm-s-cobalt span.cm-bracket { color: #d8d8d8; }
-.cm-s-cobalt span.cm-builtin, .cm-s-cobalt span.cm-special { color: #ff9e59; }
-.cm-s-cobalt span.cm-link { color: #845dc4; }
-.cm-s-cobalt span.cm-error { color: #9d1e15; }
-
-.cm-s-cobalt .CodeMirror-activeline-background { background: #002D57; }
-.cm-s-cobalt .CodeMirror-matchingbracket { outline:1px solid grey;color:white !important; }
diff --git a/WebContent/addon/codemirror/theme/colorforth.css b/WebContent/addon/codemirror/theme/colorforth.css
deleted file mode 100644
index 606899f..0000000
--- a/WebContent/addon/codemirror/theme/colorforth.css
+++ /dev/null
@@ -1,33 +0,0 @@
-.cm-s-colorforth.CodeMirror { background: #000000; color: #f8f8f8; }
-.cm-s-colorforth .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
-.cm-s-colorforth .CodeMirror-guttermarker { color: #FFBD40; }
-.cm-s-colorforth .CodeMirror-guttermarker-subtle { color: #78846f; }
-.cm-s-colorforth .CodeMirror-linenumber { color: #bababa; }
-.cm-s-colorforth .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-colorforth span.cm-comment { color: #ededed; }
-.cm-s-colorforth span.cm-def { color: #ff1c1c; font-weight:bold; }
-.cm-s-colorforth span.cm-keyword { color: #ffd900; }
-.cm-s-colorforth span.cm-builtin { color: #00d95a; }
-.cm-s-colorforth span.cm-variable { color: #73ff00; }
-.cm-s-colorforth span.cm-string { color: #007bff; }
-.cm-s-colorforth span.cm-number { color: #00c4ff; }
-.cm-s-colorforth span.cm-atom { color: #606060; }
-
-.cm-s-colorforth span.cm-variable-2 { color: #EEE; }
-.cm-s-colorforth span.cm-variable-3 { color: #DDD; }
-.cm-s-colorforth span.cm-property {}
-.cm-s-colorforth span.cm-operator {}
-
-.cm-s-colorforth span.cm-meta { color: yellow; }
-.cm-s-colorforth span.cm-qualifier { color: #FFF700; }
-.cm-s-colorforth span.cm-bracket { color: #cc7; }
-.cm-s-colorforth span.cm-tag { color: #FFBD40; }
-.cm-s-colorforth span.cm-attribute { color: #FFF700; }
-.cm-s-colorforth span.cm-error { color: #f00; }
-
-.cm-s-colorforth div.CodeMirror-selected { background: #333d53; }
-
-.cm-s-colorforth span.cm-compilation { background: rgba(255, 255, 255, 0.12); }
-
-.cm-s-colorforth .CodeMirror-activeline-background { background: #253540; }
diff --git a/WebContent/addon/codemirror/theme/dracula.css b/WebContent/addon/codemirror/theme/dracula.css
deleted file mode 100644
index b2ef629..0000000
--- a/WebContent/addon/codemirror/theme/dracula.css
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-
- Name: dracula
- Author: Michael Kaminsky (http://github.com/mkaminsky11)
-
- Original dracula color scheme by Zeno Rocha (https://github.com/zenorocha/dracula-theme)
-
-*/
-
-
-.cm-s-dracula.CodeMirror, .cm-s-dracula .CodeMirror-gutters {
- background-color: #282a36 !important;
- color: #f8f8f2 !important;
- border: none;
-}
-.cm-s-dracula .CodeMirror-gutters { color: #282a36; }
-.cm-s-dracula .CodeMirror-cursor { border-left: solid thin #f8f8f0; }
-.cm-s-dracula .CodeMirror-linenumber { color: #6D8A88; }
-.cm-s-dracula .CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
-.cm-s-dracula .CodeMirror-line::selection, .cm-s-dracula .CodeMirror-line > span::selection, .cm-s-dracula .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
-.cm-s-dracula .CodeMirror-line::-moz-selection, .cm-s-dracula .CodeMirror-line > span::-moz-selection, .cm-s-dracula .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
-.cm-s-dracula span.cm-comment { color: #6272a4; }
-.cm-s-dracula span.cm-string, .cm-s-dracula span.cm-string-2 { color: #f1fa8c; }
-.cm-s-dracula span.cm-number { color: #bd93f9; }
-.cm-s-dracula span.cm-variable { color: #50fa7b; }
-.cm-s-dracula span.cm-variable-2 { color: white; }
-.cm-s-dracula span.cm-def { color: #ffb86c; }
-.cm-s-dracula span.cm-keyword { color: #ff79c6; }
-.cm-s-dracula span.cm-operator { color: #ff79c6; }
-.cm-s-dracula span.cm-keyword { color: #ff79c6; }
-.cm-s-dracula span.cm-atom { color: #bd93f9; }
-.cm-s-dracula span.cm-meta { color: #f8f8f2; }
-.cm-s-dracula span.cm-tag { color: #ff79c6; }
-.cm-s-dracula span.cm-attribute { color: #50fa7b; }
-.cm-s-dracula span.cm-qualifier { color: #50fa7b; }
-.cm-s-dracula span.cm-property { color: #66d9ef; }
-.cm-s-dracula span.cm-builtin { color: #50fa7b; }
-.cm-s-dracula span.cm-variable-3 { color: #50fa7b; }
-
-.cm-s-dracula .CodeMirror-activeline-background { background: rgba(255,255,255,0.1); }
-.cm-s-dracula .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/WebContent/addon/codemirror/theme/duotone-dark.css b/WebContent/addon/codemirror/theme/duotone-dark.css
deleted file mode 100644
index b09a585..0000000
--- a/WebContent/addon/codemirror/theme/duotone-dark.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Name: DuoTone-Dark
-Author: by Bram de Haan, adapted from DuoTone themes by Simurai (http://simurai.com/projects/2016/01/01/duotone-themes)
-
-CodeMirror template by Jan T. Sott (https://github.com/idleberg), adapted by Bram de Haan (https://github.com/atelierbram/)
-*/
-
-.cm-s-duotone-dark.CodeMirror { background: #2a2734; color: #6c6783; }
-.cm-s-duotone-dark div.CodeMirror-selected { background: #545167!important; }
-.cm-s-duotone-dark .CodeMirror-gutters { background: #2a2734; border-right: 0px; }
-.cm-s-duotone-dark .CodeMirror-linenumber { color: #545167; }
-
-/* begin cursor */
-.cm-s-duotone-dark .CodeMirror-cursor { border-left: 1px solid #ffad5c; /* border-left: 1px solid #ffad5c80; */ border-right: .5em solid #ffad5c; /* border-right: .5em solid #ffad5c80; */ opacity: .5; }
-.cm-s-duotone-dark .CodeMirror-activeline-background { background: #363342; /* background: #36334280; */ opacity: .5;}
-.cm-s-duotone-dark .cm-fat-cursor .CodeMirror-cursor { background: #ffad5c; /* background: #ffad5c80; */ opacity: .5;}
-/* end cursor */
-
-.cm-s-duotone-dark span.cm-atom, .cm-s-duotone-dark span.cm-number, .cm-s-duotone-dark span.cm-keyword, .cm-s-duotone-dark span.cm-variable, .cm-s-duotone-dark span.cm-attribute, .cm-s-duotone-dark span.cm-quote, .cm-s-duotone-dark span.cm-hr, .cm-s-duotone-dark span.cm-link { color: #ffcc99; }
-
-.cm-s-duotone-dark span.cm-property { color: #9a86fd; }
-.cm-s-duotone-dark span.cm-punctuation, .cm-s-duotone-dark span.cm-unit, .cm-s-duotone-dark span.cm-negative { color: #e09142; }
-.cm-s-duotone-dark span.cm-string { color: #ffb870; }
-.cm-s-duotone-dark span.cm-operator { color: #ffad5c; }
-.cm-s-duotone-dark span.cm-positive { color: #6a51e6; }
-
-.cm-s-duotone-dark span.cm-variable-2, .cm-s-duotone-dark span.cm-variable-3, .cm-s-duotone-dark span.cm-string-2, .cm-s-duotone-dark span.cm-url { color: #7a63ee; }
-.cm-s-duotone-dark span.cm-def, .cm-s-duotone-dark span.cm-tag, .cm-s-duotone-dark span.cm-builtin, .cm-s-duotone-dark span.cm-qualifier, .cm-s-duotone-dark span.cm-header, .cm-s-duotone-dark span.cm-em { color: #eeebff; }
-.cm-s-duotone-dark span.cm-bracket, .cm-s-duotone-dark span.cm-comment { color: #6c6783; }
-
-/* using #f00 red for errors, don't think any of the colorscheme variables will stand out enough, ... maybe by giving it a background-color ... */
-.cm-s-duotone-dark span.cm-error, .cm-s-duotone-dark span.cm-invalidchar { color: #f00; }
-
-.cm-s-duotone-dark span.cm-header { font-weight: normal; }
-.cm-s-duotone-dark .CodeMirror-matchingbracket { text-decoration: underline; color: #eeebff !important; }
diff --git a/WebContent/addon/codemirror/theme/duotone-light.css b/WebContent/addon/codemirror/theme/duotone-light.css
deleted file mode 100644
index 80203d1..0000000
--- a/WebContent/addon/codemirror/theme/duotone-light.css
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Name: DuoTone-Light
-Author: by Bram de Haan, adapted from DuoTone themes by Simurai (http://simurai.com/projects/2016/01/01/duotone-themes)
-
-CodeMirror template by Jan T. Sott (https://github.com/idleberg), adapted by Bram de Haan (https://github.com/atelierbram/)
-*/
-
-.cm-s-duotone-light.CodeMirror { background: #faf8f5; color: #b29762; }
-.cm-s-duotone-light div.CodeMirror-selected { background: #e3dcce !important; }
-.cm-s-duotone-light .CodeMirror-gutters { background: #faf8f5; border-right: 0px; }
-.cm-s-duotone-light .CodeMirror-linenumber { color: #cdc4b1; }
-
-/* begin cursor */
-.cm-s-duotone-light .CodeMirror-cursor { border-left: 1px solid #93abdc; /* border-left: 1px solid #93abdc80; */ border-right: .5em solid #93abdc; /* border-right: .5em solid #93abdc80; */ opacity: .5; }
-.cm-s-duotone-light .CodeMirror-activeline-background { background: #e3dcce; /* background: #e3dcce80; */ opacity: .5; }
-.cm-s-duotone-light .cm-fat-cursor .CodeMirror-cursor { background: #93abdc; /* #93abdc80; */ opacity: .5; }
-/* end cursor */
-
-.cm-s-duotone-light span.cm-atom, .cm-s-duotone-light span.cm-number, .cm-s-duotone-light span.cm-keyword, .cm-s-duotone-light span.cm-variable, .cm-s-duotone-light span.cm-attribute, .cm-s-duotone-light span.cm-quote, .cm-s-duotone-light-light span.cm-hr, .cm-s-duotone-light-light span.cm-link { color: #063289; }
-
-.cm-s-duotone-light span.cm-property { color: #b29762; }
-.cm-s-duotone-light span.cm-punctuation, .cm-s-duotone-light span.cm-unit, .cm-s-duotone-light span.cm-negative { color: #063289; }
-.cm-s-duotone-light span.cm-string, .cm-s-duotone-light span.cm-operator { color: #1659df; }
-.cm-s-duotone-light span.cm-positive { color: #896724; }
-
-.cm-s-duotone-light span.cm-variable-2, .cm-s-duotone-light span.cm-variable-3, .cm-s-duotone-light span.cm-string-2, .cm-s-duotone-light span.cm-url { color: #896724; }
-.cm-s-duotone-light span.cm-def, .cm-s-duotone-light span.cm-tag, .cm-s-duotone-light span.cm-builtin, .cm-s-duotone-light span.cm-qualifier, .cm-s-duotone-light span.cm-header, .cm-s-duotone-light span.cm-em { color: #2d2006; }
-.cm-s-duotone-light span.cm-bracket, .cm-s-duotone-light span.cm-comment { color: #b6ad9a; }
-
-/* using #f00 red for errors, don't think any of the colorscheme variables will stand out enough, ... maybe by giving it a background-color ... */
-/* .cm-s-duotone-light span.cm-error { background: #896724; color: #728fcb; } */
-.cm-s-duotone-light span.cm-error, .cm-s-duotone-light span.cm-invalidchar { color: #f00; }
-
-.cm-s-duotone-light span.cm-header { font-weight: normal; }
-.cm-s-duotone-light .CodeMirror-matchingbracket { text-decoration: underline; color: #faf8f5 !important; }
-
diff --git a/WebContent/addon/codemirror/theme/eclipse.css b/WebContent/addon/codemirror/theme/eclipse.css
deleted file mode 100644
index 1bde460..0000000
--- a/WebContent/addon/codemirror/theme/eclipse.css
+++ /dev/null
@@ -1,23 +0,0 @@
-.cm-s-eclipse span.cm-meta { color: #FF1717; }
-.cm-s-eclipse span.cm-keyword { line-height: 1em; font-weight: bold; color: #7F0055; }
-.cm-s-eclipse span.cm-atom { color: #219; }
-.cm-s-eclipse span.cm-number { color: #164; }
-.cm-s-eclipse span.cm-def { color: #00f; }
-.cm-s-eclipse span.cm-variable { color: black; }
-.cm-s-eclipse span.cm-variable-2 { color: #0000C0; }
-.cm-s-eclipse span.cm-variable-3 { color: #0000C0; }
-.cm-s-eclipse span.cm-property { color: black; }
-.cm-s-eclipse span.cm-operator { color: black; }
-.cm-s-eclipse span.cm-comment { color: #3F7F5F; }
-.cm-s-eclipse span.cm-string { color: #2A00FF; }
-.cm-s-eclipse span.cm-string-2 { color: #f50; }
-.cm-s-eclipse span.cm-qualifier { color: #555; }
-.cm-s-eclipse span.cm-builtin { color: #30a; }
-.cm-s-eclipse span.cm-bracket { color: #cc7; }
-.cm-s-eclipse span.cm-tag { color: #170; }
-.cm-s-eclipse span.cm-attribute { color: #00c; }
-.cm-s-eclipse span.cm-link { color: #219; }
-.cm-s-eclipse span.cm-error { color: #f00; }
-
-.cm-s-eclipse .CodeMirror-activeline-background { background: #e8f2ff; }
-.cm-s-eclipse .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/WebContent/addon/codemirror/theme/elegant.css b/WebContent/addon/codemirror/theme/elegant.css
deleted file mode 100644
index 45b3ea6..0000000
--- a/WebContent/addon/codemirror/theme/elegant.css
+++ /dev/null
@@ -1,13 +0,0 @@
-.cm-s-elegant span.cm-number, .cm-s-elegant span.cm-string, .cm-s-elegant span.cm-atom { color: #762; }
-.cm-s-elegant span.cm-comment { color: #262; font-style: italic; line-height: 1em; }
-.cm-s-elegant span.cm-meta { color: #555; font-style: italic; line-height: 1em; }
-.cm-s-elegant span.cm-variable { color: black; }
-.cm-s-elegant span.cm-variable-2 { color: #b11; }
-.cm-s-elegant span.cm-qualifier { color: #555; }
-.cm-s-elegant span.cm-keyword { color: #730; }
-.cm-s-elegant span.cm-builtin { color: #30a; }
-.cm-s-elegant span.cm-link { color: #762; }
-.cm-s-elegant span.cm-error { background-color: #fdd; }
-
-.cm-s-elegant .CodeMirror-activeline-background { background: #e8f2ff; }
-.cm-s-elegant .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/WebContent/addon/codemirror/theme/erlang-dark.css b/WebContent/addon/codemirror/theme/erlang-dark.css
deleted file mode 100644
index 65fe481..0000000
--- a/WebContent/addon/codemirror/theme/erlang-dark.css
+++ /dev/null
@@ -1,34 +0,0 @@
-.cm-s-erlang-dark.CodeMirror { background: #002240; color: white; }
-.cm-s-erlang-dark div.CodeMirror-selected { background: #b36539; }
-.cm-s-erlang-dark .CodeMirror-line::selection, .cm-s-erlang-dark .CodeMirror-line > span::selection, .cm-s-erlang-dark .CodeMirror-line > span > span::selection { background: rgba(179, 101, 57, .99); }
-.cm-s-erlang-dark .CodeMirror-line::-moz-selection, .cm-s-erlang-dark .CodeMirror-line > span::-moz-selection, .cm-s-erlang-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(179, 101, 57, .99); }
-.cm-s-erlang-dark .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
-.cm-s-erlang-dark .CodeMirror-guttermarker { color: white; }
-.cm-s-erlang-dark .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
-.cm-s-erlang-dark .CodeMirror-linenumber { color: #d0d0d0; }
-.cm-s-erlang-dark .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-erlang-dark span.cm-quote { color: #ccc; }
-.cm-s-erlang-dark span.cm-atom { color: #f133f1; }
-.cm-s-erlang-dark span.cm-attribute { color: #ff80e1; }
-.cm-s-erlang-dark span.cm-bracket { color: #ff9d00; }
-.cm-s-erlang-dark span.cm-builtin { color: #eaa; }
-.cm-s-erlang-dark span.cm-comment { color: #77f; }
-.cm-s-erlang-dark span.cm-def { color: #e7a; }
-.cm-s-erlang-dark span.cm-keyword { color: #ffee80; }
-.cm-s-erlang-dark span.cm-meta { color: #50fefe; }
-.cm-s-erlang-dark span.cm-number { color: #ffd0d0; }
-.cm-s-erlang-dark span.cm-operator { color: #d55; }
-.cm-s-erlang-dark span.cm-property { color: #ccc; }
-.cm-s-erlang-dark span.cm-qualifier { color: #ccc; }
-.cm-s-erlang-dark span.cm-special { color: #ffbbbb; }
-.cm-s-erlang-dark span.cm-string { color: #3ad900; }
-.cm-s-erlang-dark span.cm-string-2 { color: #ccc; }
-.cm-s-erlang-dark span.cm-tag { color: #9effff; }
-.cm-s-erlang-dark span.cm-variable { color: #50fe50; }
-.cm-s-erlang-dark span.cm-variable-2 { color: #e0e; }
-.cm-s-erlang-dark span.cm-variable-3 { color: #ccc; }
-.cm-s-erlang-dark span.cm-error { color: #9d1e15; }
-
-.cm-s-erlang-dark .CodeMirror-activeline-background { background: #013461; }
-.cm-s-erlang-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/WebContent/addon/codemirror/theme/hopscotch.css b/WebContent/addon/codemirror/theme/hopscotch.css
deleted file mode 100644
index 7d05431..0000000
--- a/WebContent/addon/codemirror/theme/hopscotch.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-
- Name: Hopscotch
- Author: Jan T. Sott
-
- CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
- Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-hopscotch.CodeMirror {background: #322931; color: #d5d3d5;}
-.cm-s-hopscotch div.CodeMirror-selected {background: #433b42 !important;}
-.cm-s-hopscotch .CodeMirror-gutters {background: #322931; border-right: 0px;}
-.cm-s-hopscotch .CodeMirror-linenumber {color: #797379;}
-.cm-s-hopscotch .CodeMirror-cursor {border-left: 1px solid #989498 !important;}
-
-.cm-s-hopscotch span.cm-comment {color: #b33508;}
-.cm-s-hopscotch span.cm-atom {color: #c85e7c;}
-.cm-s-hopscotch span.cm-number {color: #c85e7c;}
-
-.cm-s-hopscotch span.cm-property, .cm-s-hopscotch span.cm-attribute {color: #8fc13e;}
-.cm-s-hopscotch span.cm-keyword {color: #dd464c;}
-.cm-s-hopscotch span.cm-string {color: #fdcc59;}
-
-.cm-s-hopscotch span.cm-variable {color: #8fc13e;}
-.cm-s-hopscotch span.cm-variable-2 {color: #1290bf;}
-.cm-s-hopscotch span.cm-def {color: #fd8b19;}
-.cm-s-hopscotch span.cm-error {background: #dd464c; color: #989498;}
-.cm-s-hopscotch span.cm-bracket {color: #d5d3d5;}
-.cm-s-hopscotch span.cm-tag {color: #dd464c;}
-.cm-s-hopscotch span.cm-link {color: #c85e7c;}
-
-.cm-s-hopscotch .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
-.cm-s-hopscotch .CodeMirror-activeline-background { background: #302020; }
diff --git a/WebContent/addon/codemirror/theme/icecoder.css b/WebContent/addon/codemirror/theme/icecoder.css
deleted file mode 100644
index ffebaf2..0000000
--- a/WebContent/addon/codemirror/theme/icecoder.css
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-ICEcoder default theme by Matt Pass, used in code editor available at https://icecoder.net
-*/
-
-.cm-s-icecoder { color: #666; background: #1d1d1b; }
-
-.cm-s-icecoder span.cm-keyword { color: #eee; font-weight:bold; } /* off-white 1 */
-.cm-s-icecoder span.cm-atom { color: #e1c76e; } /* yellow */
-.cm-s-icecoder span.cm-number { color: #6cb5d9; } /* blue */
-.cm-s-icecoder span.cm-def { color: #b9ca4a; } /* green */
-
-.cm-s-icecoder span.cm-variable { color: #6cb5d9; } /* blue */
-.cm-s-icecoder span.cm-variable-2 { color: #cc1e5c; } /* pink */
-.cm-s-icecoder span.cm-variable-3 { color: #f9602c; } /* orange */
-
-.cm-s-icecoder span.cm-property { color: #eee; } /* off-white 1 */
-.cm-s-icecoder span.cm-operator { color: #9179bb; } /* purple */
-.cm-s-icecoder span.cm-comment { color: #97a3aa; } /* grey-blue */
-
-.cm-s-icecoder span.cm-string { color: #b9ca4a; } /* green */
-.cm-s-icecoder span.cm-string-2 { color: #6cb5d9; } /* blue */
-
-.cm-s-icecoder span.cm-meta { color: #555; } /* grey */
-
-.cm-s-icecoder span.cm-qualifier { color: #555; } /* grey */
-.cm-s-icecoder span.cm-builtin { color: #214e7b; } /* bright blue */
-.cm-s-icecoder span.cm-bracket { color: #cc7; } /* grey-yellow */
-
-.cm-s-icecoder span.cm-tag { color: #e8e8e8; } /* off-white 2 */
-.cm-s-icecoder span.cm-attribute { color: #099; } /* teal */
-
-.cm-s-icecoder span.cm-header { color: #6a0d6a; } /* purple-pink */
-.cm-s-icecoder span.cm-quote { color: #186718; } /* dark green */
-.cm-s-icecoder span.cm-hr { color: #888; } /* mid-grey */
-.cm-s-icecoder span.cm-link { color: #e1c76e; } /* yellow */
-.cm-s-icecoder span.cm-error { color: #d00; } /* red */
-
-.cm-s-icecoder .CodeMirror-cursor { border-left: 1px solid white; }
-.cm-s-icecoder div.CodeMirror-selected { color: #fff; background: #037; }
-.cm-s-icecoder .CodeMirror-gutters { background: #1d1d1b; min-width: 41px; border-right: 0; }
-.cm-s-icecoder .CodeMirror-linenumber { color: #555; cursor: default; }
-.cm-s-icecoder .CodeMirror-matchingbracket { color: #fff !important; background: #555 !important; }
-.cm-s-icecoder .CodeMirror-activeline-background { background: #000; }
diff --git a/WebContent/addon/codemirror/theme/isotope.css b/WebContent/addon/codemirror/theme/isotope.css
deleted file mode 100644
index d0d6263..0000000
--- a/WebContent/addon/codemirror/theme/isotope.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-
- Name: Isotope
- Author: David Desandro / Jan T. Sott
-
- CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
- Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-isotope.CodeMirror {background: #000000; color: #e0e0e0;}
-.cm-s-isotope div.CodeMirror-selected {background: #404040 !important;}
-.cm-s-isotope .CodeMirror-gutters {background: #000000; border-right: 0px;}
-.cm-s-isotope .CodeMirror-linenumber {color: #808080;}
-.cm-s-isotope .CodeMirror-cursor {border-left: 1px solid #c0c0c0 !important;}
-
-.cm-s-isotope span.cm-comment {color: #3300ff;}
-.cm-s-isotope span.cm-atom {color: #cc00ff;}
-.cm-s-isotope span.cm-number {color: #cc00ff;}
-
-.cm-s-isotope span.cm-property, .cm-s-isotope span.cm-attribute {color: #33ff00;}
-.cm-s-isotope span.cm-keyword {color: #ff0000;}
-.cm-s-isotope span.cm-string {color: #ff0099;}
-
-.cm-s-isotope span.cm-variable {color: #33ff00;}
-.cm-s-isotope span.cm-variable-2 {color: #0066ff;}
-.cm-s-isotope span.cm-def {color: #ff9900;}
-.cm-s-isotope span.cm-error {background: #ff0000; color: #c0c0c0;}
-.cm-s-isotope span.cm-bracket {color: #e0e0e0;}
-.cm-s-isotope span.cm-tag {color: #ff0000;}
-.cm-s-isotope span.cm-link {color: #cc00ff;}
-
-.cm-s-isotope .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
-.cm-s-isotope .CodeMirror-activeline-background { background: #202020; }
diff --git a/WebContent/addon/codemirror/theme/lesser-dark.css b/WebContent/addon/codemirror/theme/lesser-dark.css
deleted file mode 100644
index 690c183..0000000
--- a/WebContent/addon/codemirror/theme/lesser-dark.css
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-http://lesscss.org/ dark theme
-Ported to CodeMirror by Peter Kroon
-*/
-.cm-s-lesser-dark {
- line-height: 1.3em;
-}
-.cm-s-lesser-dark.CodeMirror { background: #262626; color: #EBEFE7; text-shadow: 0 -1px 1px #262626; }
-.cm-s-lesser-dark div.CodeMirror-selected { background: #45443B; } /* 33322B*/
-.cm-s-lesser-dark .CodeMirror-line::selection, .cm-s-lesser-dark .CodeMirror-line > span::selection, .cm-s-lesser-dark .CodeMirror-line > span > span::selection { background: rgba(69, 68, 59, .99); }
-.cm-s-lesser-dark .CodeMirror-line::-moz-selection, .cm-s-lesser-dark .CodeMirror-line > span::-moz-selection, .cm-s-lesser-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(69, 68, 59, .99); }
-.cm-s-lesser-dark .CodeMirror-cursor { border-left: 1px solid white; }
-.cm-s-lesser-dark pre { padding: 0 8px; }/*editable code holder*/
-
-.cm-s-lesser-dark.CodeMirror span.CodeMirror-matchingbracket { color: #7EFC7E; }/*65FC65*/
-
-.cm-s-lesser-dark .CodeMirror-gutters { background: #262626; border-right:1px solid #aaa; }
-.cm-s-lesser-dark .CodeMirror-guttermarker { color: #599eff; }
-.cm-s-lesser-dark .CodeMirror-guttermarker-subtle { color: #777; }
-.cm-s-lesser-dark .CodeMirror-linenumber { color: #777; }
-
-.cm-s-lesser-dark span.cm-header { color: #a0a; }
-.cm-s-lesser-dark span.cm-quote { color: #090; }
-.cm-s-lesser-dark span.cm-keyword { color: #599eff; }
-.cm-s-lesser-dark span.cm-atom { color: #C2B470; }
-.cm-s-lesser-dark span.cm-number { color: #B35E4D; }
-.cm-s-lesser-dark span.cm-def { color: white; }
-.cm-s-lesser-dark span.cm-variable { color:#D9BF8C; }
-.cm-s-lesser-dark span.cm-variable-2 { color: #669199; }
-.cm-s-lesser-dark span.cm-variable-3 { color: white; }
-.cm-s-lesser-dark span.cm-property { color: #92A75C; }
-.cm-s-lesser-dark span.cm-operator { color: #92A75C; }
-.cm-s-lesser-dark span.cm-comment { color: #666; }
-.cm-s-lesser-dark span.cm-string { color: #BCD279; }
-.cm-s-lesser-dark span.cm-string-2 { color: #f50; }
-.cm-s-lesser-dark span.cm-meta { color: #738C73; }
-.cm-s-lesser-dark span.cm-qualifier { color: #555; }
-.cm-s-lesser-dark span.cm-builtin { color: #ff9e59; }
-.cm-s-lesser-dark span.cm-bracket { color: #EBEFE7; }
-.cm-s-lesser-dark span.cm-tag { color: #669199; }
-.cm-s-lesser-dark span.cm-attribute { color: #00c; }
-.cm-s-lesser-dark span.cm-hr { color: #999; }
-.cm-s-lesser-dark span.cm-link { color: #00c; }
-.cm-s-lesser-dark span.cm-error { color: #9d1e15; }
-
-.cm-s-lesser-dark .CodeMirror-activeline-background { background: #3C3A3A; }
-.cm-s-lesser-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/WebContent/addon/codemirror/theme/liquibyte.css b/WebContent/addon/codemirror/theme/liquibyte.css
deleted file mode 100644
index 9db8bde..0000000
--- a/WebContent/addon/codemirror/theme/liquibyte.css
+++ /dev/null
@@ -1,95 +0,0 @@
-.cm-s-liquibyte.CodeMirror {
- background-color: #000;
- color: #fff;
- line-height: 1.2em;
- font-size: 1em;
-}
-.cm-s-liquibyte .CodeMirror-focused .cm-matchhighlight {
- text-decoration: underline;
- text-decoration-color: #0f0;
- text-decoration-style: wavy;
-}
-.cm-s-liquibyte .cm-trailingspace {
- text-decoration: line-through;
- text-decoration-color: #f00;
- text-decoration-style: dotted;
-}
-.cm-s-liquibyte .cm-tab {
- text-decoration: line-through;
- text-decoration-color: #404040;
- text-decoration-style: dotted;
-}
-.cm-s-liquibyte .CodeMirror-gutters { background-color: #262626; border-right: 1px solid #505050; padding-right: 0.8em; }
-.cm-s-liquibyte .CodeMirror-gutter-elt div { font-size: 1.2em; }
-.cm-s-liquibyte .CodeMirror-guttermarker { }
-.cm-s-liquibyte .CodeMirror-guttermarker-subtle { }
-.cm-s-liquibyte .CodeMirror-linenumber { color: #606060; padding-left: 0; }
-.cm-s-liquibyte .CodeMirror-cursor { border-left: 1px solid #eee; }
-
-.cm-s-liquibyte span.cm-comment { color: #008000; }
-.cm-s-liquibyte span.cm-def { color: #ffaf40; font-weight: bold; }
-.cm-s-liquibyte span.cm-keyword { color: #c080ff; font-weight: bold; }
-.cm-s-liquibyte span.cm-builtin { color: #ffaf40; font-weight: bold; }
-.cm-s-liquibyte span.cm-variable { color: #5967ff; font-weight: bold; }
-.cm-s-liquibyte span.cm-string { color: #ff8000; }
-.cm-s-liquibyte span.cm-number { color: #0f0; font-weight: bold; }
-.cm-s-liquibyte span.cm-atom { color: #bf3030; font-weight: bold; }
-
-.cm-s-liquibyte span.cm-variable-2 { color: #007f7f; font-weight: bold; }
-.cm-s-liquibyte span.cm-variable-3 { color: #c080ff; font-weight: bold; }
-.cm-s-liquibyte span.cm-property { color: #999; font-weight: bold; }
-.cm-s-liquibyte span.cm-operator { color: #fff; }
-
-.cm-s-liquibyte span.cm-meta { color: #0f0; }
-.cm-s-liquibyte span.cm-qualifier { color: #fff700; font-weight: bold; }
-.cm-s-liquibyte span.cm-bracket { color: #cc7; }
-.cm-s-liquibyte span.cm-tag { color: #ff0; font-weight: bold; }
-.cm-s-liquibyte span.cm-attribute { color: #c080ff; font-weight: bold; }
-.cm-s-liquibyte span.cm-error { color: #f00; }
-
-.cm-s-liquibyte div.CodeMirror-selected { background-color: rgba(255, 0, 0, 0.25); }
-
-.cm-s-liquibyte span.cm-compilation { background-color: rgba(255, 255, 255, 0.12); }
-
-.cm-s-liquibyte .CodeMirror-activeline-background { background-color: rgba(0, 255, 0, 0.15); }
-
-/* Default styles for common addons */
-.cm-s-liquibyte .CodeMirror span.CodeMirror-matchingbracket { color: #0f0; font-weight: bold; }
-.cm-s-liquibyte .CodeMirror span.CodeMirror-nonmatchingbracket { color: #f00; font-weight: bold; }
-.CodeMirror-matchingtag { background-color: rgba(150, 255, 0, .3); }
-/* Scrollbars */
-/* Simple */
-.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div:hover, div.CodeMirror-simplescroll-vertical div:hover {
- background-color: rgba(80, 80, 80, .7);
-}
-.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div, div.CodeMirror-simplescroll-vertical div {
- background-color: rgba(80, 80, 80, .3);
- border: 1px solid #404040;
- border-radius: 5px;
-}
-.cm-s-liquibyte div.CodeMirror-simplescroll-vertical div {
- border-top: 1px solid #404040;
- border-bottom: 1px solid #404040;
-}
-.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div {
- border-left: 1px solid #404040;
- border-right: 1px solid #404040;
-}
-.cm-s-liquibyte div.CodeMirror-simplescroll-vertical {
- background-color: #262626;
-}
-.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal {
- background-color: #262626;
- border-top: 1px solid #404040;
-}
-/* Overlay */
-.cm-s-liquibyte div.CodeMirror-overlayscroll-horizontal div, div.CodeMirror-overlayscroll-vertical div {
- background-color: #404040;
- border-radius: 5px;
-}
-.cm-s-liquibyte div.CodeMirror-overlayscroll-vertical div {
- border: 1px solid #404040;
-}
-.cm-s-liquibyte div.CodeMirror-overlayscroll-horizontal div {
- border: 1px solid #404040;
-}
diff --git a/WebContent/addon/codemirror/theme/material.css b/WebContent/addon/codemirror/theme/material.css
deleted file mode 100644
index 91ed6ce..0000000
--- a/WebContent/addon/codemirror/theme/material.css
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-
- Name: material
- Author: Michael Kaminsky (http://github.com/mkaminsky11)
-
- Original material color scheme by Mattia Astorino (https://github.com/equinusocio/material-theme)
-
-*/
-
-.cm-s-material {
- background-color: #263238;
- color: rgba(233, 237, 237, 1);
-}
-.cm-s-material .CodeMirror-gutters {
- background: #263238;
- color: rgb(83,127,126);
- border: none;
-}
-.cm-s-material .CodeMirror-guttermarker, .cm-s-material .CodeMirror-guttermarker-subtle, .cm-s-material .CodeMirror-linenumber { color: rgb(83,127,126); }
-.cm-s-material .CodeMirror-cursor { border-left: 1px solid #f8f8f0; }
-.cm-s-material div.CodeMirror-selected { background: rgba(255, 255, 255, 0.15); }
-.cm-s-material.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
-.cm-s-material .CodeMirror-line::selection, .cm-s-material .CodeMirror-line > span::selection, .cm-s-material .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
-.cm-s-material .CodeMirror-line::-moz-selection, .cm-s-material .CodeMirror-line > span::-moz-selection, .cm-s-material .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
-
-.cm-s-material .CodeMirror-activeline-background { background: rgba(0, 0, 0, 0); }
-.cm-s-material .cm-keyword { color: rgba(199, 146, 234, 1); }
-.cm-s-material .cm-operator { color: rgba(233, 237, 237, 1); }
-.cm-s-material .cm-variable-2 { color: #80CBC4; }
-.cm-s-material .cm-variable-3 { color: #82B1FF; }
-.cm-s-material .cm-builtin { color: #DECB6B; }
-.cm-s-material .cm-atom { color: #F77669; }
-.cm-s-material .cm-number { color: #F77669; }
-.cm-s-material .cm-def { color: rgba(233, 237, 237, 1); }
-.cm-s-material .cm-string { color: #C3E88D; }
-.cm-s-material .cm-string-2 { color: #80CBC4; }
-.cm-s-material .cm-comment { color: #546E7A; }
-.cm-s-material .cm-variable { color: #82B1FF; }
-.cm-s-material .cm-tag { color: #80CBC4; }
-.cm-s-material .cm-meta { color: #80CBC4; }
-.cm-s-material .cm-attribute { color: #FFCB6B; }
-.cm-s-material .cm-property { color: #80CBAE; }
-.cm-s-material .cm-qualifier { color: #DECB6B; }
-.cm-s-material .cm-variable-3 { color: #DECB6B; }
-.cm-s-material .cm-tag { color: rgba(255, 83, 112, 1); }
-.cm-s-material .cm-error {
- color: rgba(255, 255, 255, 1.0);
- background-color: #EC5F67;
-}
-.cm-s-material .CodeMirror-matchingbracket {
- text-decoration: underline;
- color: white !important;
-}
diff --git a/WebContent/addon/codemirror/theme/mbo.css b/WebContent/addon/codemirror/theme/mbo.css
deleted file mode 100644
index e164fcf..0000000
--- a/WebContent/addon/codemirror/theme/mbo.css
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************/
-/* Based on mbonaci's Brackets mbo theme */
-/* https://github.com/mbonaci/global/blob/master/Mbo.tmTheme */
-/* Create your own: http://tmtheme-editor.herokuapp.com */
-/****************************************************************/
-
-.cm-s-mbo.CodeMirror { background: #2c2c2c; color: #ffffec; }
-.cm-s-mbo div.CodeMirror-selected { background: #716C62; }
-.cm-s-mbo .CodeMirror-line::selection, .cm-s-mbo .CodeMirror-line > span::selection, .cm-s-mbo .CodeMirror-line > span > span::selection { background: rgba(113, 108, 98, .99); }
-.cm-s-mbo .CodeMirror-line::-moz-selection, .cm-s-mbo .CodeMirror-line > span::-moz-selection, .cm-s-mbo .CodeMirror-line > span > span::-moz-selection { background: rgba(113, 108, 98, .99); }
-.cm-s-mbo .CodeMirror-gutters { background: #4e4e4e; border-right: 0px; }
-.cm-s-mbo .CodeMirror-guttermarker { color: white; }
-.cm-s-mbo .CodeMirror-guttermarker-subtle { color: grey; }
-.cm-s-mbo .CodeMirror-linenumber { color: #dadada; }
-.cm-s-mbo .CodeMirror-cursor { border-left: 1px solid #ffffec; }
-
-.cm-s-mbo span.cm-comment { color: #95958a; }
-.cm-s-mbo span.cm-atom { color: #00a8c6; }
-.cm-s-mbo span.cm-number { color: #00a8c6; }
-
-.cm-s-mbo span.cm-property, .cm-s-mbo span.cm-attribute { color: #9ddfe9; }
-.cm-s-mbo span.cm-keyword { color: #ffb928; }
-.cm-s-mbo span.cm-string { color: #ffcf6c; }
-.cm-s-mbo span.cm-string.cm-property { color: #ffffec; }
-
-.cm-s-mbo span.cm-variable { color: #ffffec; }
-.cm-s-mbo span.cm-variable-2 { color: #00a8c6; }
-.cm-s-mbo span.cm-def { color: #ffffec; }
-.cm-s-mbo span.cm-bracket { color: #fffffc; font-weight: bold; }
-.cm-s-mbo span.cm-tag { color: #9ddfe9; }
-.cm-s-mbo span.cm-link { color: #f54b07; }
-.cm-s-mbo span.cm-error { border-bottom: #636363; color: #ffffec; }
-.cm-s-mbo span.cm-qualifier { color: #ffffec; }
-
-.cm-s-mbo .CodeMirror-activeline-background { background: #494b41; }
-.cm-s-mbo .CodeMirror-matchingbracket { color: #ffb928 !important; }
-.cm-s-mbo .CodeMirror-matchingtag { background: rgba(255, 255, 255, .37); }
diff --git a/WebContent/addon/codemirror/theme/mdn-like.css b/WebContent/addon/codemirror/theme/mdn-like.css
deleted file mode 100644
index f325d45..0000000
--- a/WebContent/addon/codemirror/theme/mdn-like.css
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- MDN-LIKE Theme - Mozilla
- Ported to CodeMirror by Peter Kroon
- Report bugs/issues here: https://github.com/codemirror/CodeMirror/issues
- GitHub: @peterkroon
-
- The mdn-like theme is inspired on the displayed code examples at: https://developer.mozilla.org/en-US/docs/Web/CSS/animation
-
-*/
-.cm-s-mdn-like.CodeMirror { color: #999; background-color: #fff; }
-.cm-s-mdn-like div.CodeMirror-selected { background: #cfc; }
-.cm-s-mdn-like .CodeMirror-line::selection, .cm-s-mdn-like .CodeMirror-line > span::selection, .cm-s-mdn-like .CodeMirror-line > span > span::selection { background: #cfc; }
-.cm-s-mdn-like .CodeMirror-line::-moz-selection, .cm-s-mdn-like .CodeMirror-line > span::-moz-selection, .cm-s-mdn-like .CodeMirror-line > span > span::-moz-selection { background: #cfc; }
-
-.cm-s-mdn-like .CodeMirror-gutters { background: #f8f8f8; border-left: 6px solid rgba(0,83,159,0.65); color: #333; }
-.cm-s-mdn-like .CodeMirror-linenumber { color: #aaa; padding-left: 8px; }
-.cm-s-mdn-like .CodeMirror-cursor { border-left: 2px solid #222; }
-
-.cm-s-mdn-like .cm-keyword { color: #6262FF; }
-.cm-s-mdn-like .cm-atom { color: #F90; }
-.cm-s-mdn-like .cm-number { color: #ca7841; }
-.cm-s-mdn-like .cm-def { color: #8DA6CE; }
-.cm-s-mdn-like span.cm-variable-2, .cm-s-mdn-like span.cm-tag { color: #690; }
-.cm-s-mdn-like span.cm-variable-3, .cm-s-mdn-like span.cm-def { color: #07a; }
-
-.cm-s-mdn-like .cm-variable { color: #07a; }
-.cm-s-mdn-like .cm-property { color: #905; }
-.cm-s-mdn-like .cm-qualifier { color: #690; }
-
-.cm-s-mdn-like .cm-operator { color: #cda869; }
-.cm-s-mdn-like .cm-comment { color:#777; font-weight:normal; }
-.cm-s-mdn-like .cm-string { color:#07a; font-style:italic; }
-.cm-s-mdn-like .cm-string-2 { color:#bd6b18; } /*?*/
-.cm-s-mdn-like .cm-meta { color: #000; } /*?*/
-.cm-s-mdn-like .cm-builtin { color: #9B7536; } /*?*/
-.cm-s-mdn-like .cm-tag { color: #997643; }
-.cm-s-mdn-like .cm-attribute { color: #d6bb6d; } /*?*/
-.cm-s-mdn-like .cm-header { color: #FF6400; }
-.cm-s-mdn-like .cm-hr { color: #AEAEAE; }
-.cm-s-mdn-like .cm-link { color:#ad9361; font-style:italic; text-decoration:none; }
-.cm-s-mdn-like .cm-error { border-bottom: 1px solid red; }
-
-div.cm-s-mdn-like .CodeMirror-activeline-background { background: #efefff; }
-div.cm-s-mdn-like span.CodeMirror-matchingbracket { outline:1px solid grey; color: inherit; }
-
-.cm-s-mdn-like.CodeMirror { background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFcAAAAyCAYAAAAp8UeFAAAHvklEQVR42s2b63bcNgyEQZCSHCdt2vd/0tWF7I+Q6XgMXiTtuvU5Pl57ZQKkKHzEAOtF5KeIJBGJ8uvL599FRFREZhFx8DeXv8trn68RuGaC8TRfo3SNp9dlDDHedyLyTUTeRWStXKPZrjtpZxaRw5hPqozRs1N8/enzIiQRWcCgy4MUA0f+XWliDhyL8Lfyvx7ei/Ae3iQFHyw7U/59pQVIMEEPEz0G7XiwdRjzSfC3UTtz9vchIntxvry5iMgfIhJoEflOz2CQr3F5h/HfeFe+GTdLaKcu9L8LTeQb/R/7GgbsfKedyNdoHsN31uRPWrfZ5wsj/NzzRQHuToIdU3ahwnsKPxXCjJITuOsi7XLc7SG/v5GdALs7wf8JjTFiB5+QvTEfRyGOfX3Lrx8wxyQi3sNq46O7QahQiCsRFgqddjBouVEHOKDgXAQHD9gJCr5sMKkEdjwsarG/ww3BMHBU7OBjXnzdyY7SfCxf5/z6ATccrwlKuwC/jhznnPF4CgVzhhVf4xp2EixcBActO75iZ8/fM9zAs2OMzKdslgXWJ9XG8PQoOAMA5fGcsvORgv0doBXyHrCwfLJAOwo71QLNkb8n2Pl6EWiR7OCibtkPaz4Kc/0NNAze2gju3zOwekALDaCFPI5vjPFmgGY5AZqyGEvH1x7QfIb8YtxMnA/b+QQ0aQDAwc6JMFg8CbQZ4qoYEEHbRwNojuK3EHwd7VALSgq+MNDKzfT58T8qdpADrgW0GmgcAS1lhzztJmkAzcPNOQbsWEALBDSlMKUG0Eq4CLAQWvEVQ9WU57gZJwZtgPO3r9oBTQ9WO8TjqXINx8R0EYpiZEUWOF3FxkbJkgU9B2f41YBrIj5ZfsQa0M5kTgiAAqM3ShXLgu8XMqcrQBvJ0CL5pnTsfMB13oB8athpAq2XOQmcGmoACCLydx7nToa23ATaSIY2ichfOdPTGxlasXMLaL0MLZAOwAKIM+y8CmicobGdCcbbK9DzN+yYGVoNNI5iUKTMyYOjPse4A8SM1MmcXgU0toOq1yO/v8FOxlASyc7TgeYaAMBJHcY1CcCwGI/TK4AmDbDyKYBBtFUkRwto8gygiQEaByFgJ00BH2M8JWwQS1nafDXQCidWyOI8AcjDCSjCLk8ngObuAm3JAHAdubAmOaK06V8MNEsKPJOhobSprwQa6gD7DclRQdqcwL4zxqgBrQcabUiBLclRDKAlWp+etPkBaNMA0AKlrHwTdEByZAA4GM+SNluSY6wAzcMNewxmgig5Ks0nkrSpBvSaQHMdKTBAnLojOdYyGpQ254602ZILPdTD1hdlggdIm74jbTp8vDwF5ZYUeLWGJpWsh6XNyXgcYwVoJQTEhhTYkxzZjiU5npU2TaB979TQehlaAVq4kaGpiPwwwLkYUuBbQwocyQTv1tA0+1UFWoJF3iv1oq+qoSk8EQdJmwHkziIF7oOZk14EGitibAdjLYYK78H5vZOhtWpoI0ATGHs0Q8OMb4Ey+2bU2UYztCtA0wFAs7TplGLRVQCcqaFdGSPCeTI1QNIC52iWNzof6Uib7xjEp07mNNoUYmVosVItHrHzRlLgBn9LFyRHaQCtVUMbtTNhoXWiTOO9k/V8BdAc1Oq0ArSQs6/5SU0hckNy9NnXqQY0PGYo5dWJ7nINaN6o958FWin27aBaWRka1r5myvLOAm0j30eBJqCxHLReVclxhxOEN2JfDWjxBtAC7MIH1fVaGdoOp4qJYDgKtKPSFNID2gSnGldrCqkFZ+5UeQXQBIRrSwocbdZYQT/2LwRahBPBXoHrB8nxaGROST62DKUbQOMMzZIC9abkuELfQzQALWTnDNAm8KHWFOJgJ5+SHIvTPcmx1xQyZRhNL5Qci689aXMEaN/uNIWkEwDAvFpOZmgsBaaGnbs1NPa1Jm32gBZAIh1pCtG7TSH4aE0y1uVY4uqoFPisGlpP2rSA5qTecWn5agK6BzSpgAyD+wFaqhnYoSZ1Vwr8CmlTQbrcO3ZaX0NAEyMbYaAlyquFoLKK3SPby9CeVUPThrSJmkCAE0CrKUQadi4DrdSlWhmah0YL9z9vClH59YGbHx1J8VZTyAjQepJjmXwAKTDQI3omc3p1U4gDUf6RfcdYfrUp5ClAi2J3Ba6UOXGo+K+bQrjjssitG2SJzshaLwMtXgRagUNpYYoVkMSBLM+9GGiJZMvduG6DRZ4qc04DMPtQQxOjEtACmhO7K1AbNbQDEggZyJwscFpAGwENhoBeUwh3bWolhe8BTYVKxQEWrSUn/uhcM5KhvUu/+eQu0Lzhi+VrK0PrZZNDQKs9cpYUuFYgMVpD4/NxenJTiMCNqdUEUf1qZWjppLT5qSkkUZbCwkbZMSuVnu80hfSkzRbQeqCZSAh6huR4VtoM2gHAlLf72smuWgE+VV7XpE25Ab2WFDgyhnSuKbs4GuGzCjR+tIoUuMFg3kgcWKLTwRqanJQ2W00hAsenfaApRC42hbCvK1SlE0HtE9BGgneJO+ELamitD1YjjOYnNYVcraGhtKkW0EqVVeDx733I2NH581k1NNxNLG0i0IJ8/NjVaOZ0tYZ2Vtr0Xv7tPV3hkWp9EFkgS/J0vosngTaSoaG06WHi+xObQkaAdlbanP8B2+2l0f90LmUAAAAASUVORK5CYII=); }
diff --git a/WebContent/addon/codemirror/theme/midnight.css b/WebContent/addon/codemirror/theme/midnight.css
deleted file mode 100644
index e41f105..0000000
--- a/WebContent/addon/codemirror/theme/midnight.css
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Based on the theme at http://bonsaiden.github.com/JavaScript-Garden */
-
-/**/
-.cm-s-midnight span.CodeMirror-matchhighlight { background: #494949; }
-.cm-s-midnight.CodeMirror-focused span.CodeMirror-matchhighlight { background: #314D67 !important; }
-
-/**/
-.cm-s-midnight .CodeMirror-activeline-background { background: #253540; }
-
-.cm-s-midnight.CodeMirror {
- background: #0F192A;
- color: #D1EDFF;
-}
-
-.cm-s-midnight.CodeMirror { border-top: 1px solid black; border-bottom: 1px solid black; }
-
-.cm-s-midnight div.CodeMirror-selected { background: #314D67; }
-.cm-s-midnight .CodeMirror-line::selection, .cm-s-midnight .CodeMirror-line > span::selection, .cm-s-midnight .CodeMirror-line > span > span::selection { background: rgba(49, 77, 103, .99); }
-.cm-s-midnight .CodeMirror-line::-moz-selection, .cm-s-midnight .CodeMirror-line > span::-moz-selection, .cm-s-midnight .CodeMirror-line > span > span::-moz-selection { background: rgba(49, 77, 103, .99); }
-.cm-s-midnight .CodeMirror-gutters { background: #0F192A; border-right: 1px solid; }
-.cm-s-midnight .CodeMirror-guttermarker { color: white; }
-.cm-s-midnight .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
-.cm-s-midnight .CodeMirror-linenumber { color: #D0D0D0; }
-.cm-s-midnight .CodeMirror-cursor { border-left: 1px solid #F8F8F0; }
-
-.cm-s-midnight span.cm-comment { color: #428BDD; }
-.cm-s-midnight span.cm-atom { color: #AE81FF; }
-.cm-s-midnight span.cm-number { color: #D1EDFF; }
-
-.cm-s-midnight span.cm-property, .cm-s-midnight span.cm-attribute { color: #A6E22E; }
-.cm-s-midnight span.cm-keyword { color: #E83737; }
-.cm-s-midnight span.cm-string { color: #1DC116; }
-
-.cm-s-midnight span.cm-variable { color: #FFAA3E; }
-.cm-s-midnight span.cm-variable-2 { color: #FFAA3E; }
-.cm-s-midnight span.cm-def { color: #4DD; }
-.cm-s-midnight span.cm-bracket { color: #D1EDFF; }
-.cm-s-midnight span.cm-tag { color: #449; }
-.cm-s-midnight span.cm-link { color: #AE81FF; }
-.cm-s-midnight span.cm-error { background: #F92672; color: #F8F8F0; }
-
-.cm-s-midnight .CodeMirror-matchingbracket {
- text-decoration: underline;
- color: white !important;
-}
diff --git a/WebContent/addon/codemirror/theme/monokai.css b/WebContent/addon/codemirror/theme/monokai.css
deleted file mode 100644
index 7c8a4c5..0000000
--- a/WebContent/addon/codemirror/theme/monokai.css
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Based on Sublime Text's Monokai theme */
-
-.cm-s-monokai.CodeMirror { background: #272822; color: #f8f8f2; }
-.cm-s-monokai div.CodeMirror-selected { background: #49483E; }
-.cm-s-monokai .CodeMirror-line::selection, .cm-s-monokai .CodeMirror-line > span::selection, .cm-s-monokai .CodeMirror-line > span > span::selection { background: rgba(73, 72, 62, .99); }
-.cm-s-monokai .CodeMirror-line::-moz-selection, .cm-s-monokai .CodeMirror-line > span::-moz-selection, .cm-s-monokai .CodeMirror-line > span > span::-moz-selection { background: rgba(73, 72, 62, .99); }
-.cm-s-monokai .CodeMirror-gutters { background: #272822; border-right: 0px; }
-.cm-s-monokai .CodeMirror-guttermarker { color: white; }
-.cm-s-monokai .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
-.cm-s-monokai .CodeMirror-linenumber { color: #d0d0d0; }
-.cm-s-monokai .CodeMirror-cursor { border-left: 1px solid #f8f8f0; }
-
-.cm-s-monokai span.cm-comment { color: #75715e; }
-.cm-s-monokai span.cm-atom { color: #ae81ff; }
-.cm-s-monokai span.cm-number { color: #ae81ff; }
-
-.cm-s-monokai span.cm-property, .cm-s-monokai span.cm-attribute { color: #a6e22e; }
-.cm-s-monokai span.cm-keyword { color: #f92672; }
-.cm-s-monokai span.cm-builtin { color: #66d9ef; }
-.cm-s-monokai span.cm-string { color: #e6db74; }
-
-.cm-s-monokai span.cm-variable { color: #f8f8f2; }
-.cm-s-monokai span.cm-variable-2 { color: #9effff; }
-.cm-s-monokai span.cm-variable-3 { color: #66d9ef; }
-.cm-s-monokai span.cm-def { color: #fd971f; }
-.cm-s-monokai span.cm-bracket { color: #f8f8f2; }
-.cm-s-monokai span.cm-tag { color: #f92672; }
-.cm-s-monokai span.cm-header { color: #ae81ff; }
-.cm-s-monokai span.cm-link { color: #ae81ff; }
-.cm-s-monokai span.cm-error { background: #f92672; color: #f8f8f0; }
-
-.cm-s-monokai .CodeMirror-activeline-background { background: #373831; }
-.cm-s-monokai .CodeMirror-matchingbracket {
- text-decoration: underline;
- color: white !important;
-}
diff --git a/WebContent/addon/codemirror/theme/neat.css b/WebContent/addon/codemirror/theme/neat.css
deleted file mode 100644
index 4267b1a..0000000
--- a/WebContent/addon/codemirror/theme/neat.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.cm-s-neat span.cm-comment { color: #a86; }
-.cm-s-neat span.cm-keyword { line-height: 1em; font-weight: bold; color: blue; }
-.cm-s-neat span.cm-string { color: #a22; }
-.cm-s-neat span.cm-builtin { line-height: 1em; font-weight: bold; color: #077; }
-.cm-s-neat span.cm-special { line-height: 1em; font-weight: bold; color: #0aa; }
-.cm-s-neat span.cm-variable { color: black; }
-.cm-s-neat span.cm-number, .cm-s-neat span.cm-atom { color: #3a3; }
-.cm-s-neat span.cm-meta { color: #555; }
-.cm-s-neat span.cm-link { color: #3a3; }
-
-.cm-s-neat .CodeMirror-activeline-background { background: #e8f2ff; }
-.cm-s-neat .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/WebContent/addon/codemirror/theme/neo.css b/WebContent/addon/codemirror/theme/neo.css
deleted file mode 100644
index b28d5c6..0000000
--- a/WebContent/addon/codemirror/theme/neo.css
+++ /dev/null
@@ -1,43 +0,0 @@
-/* neo theme for codemirror */
-
-/* Color scheme */
-
-.cm-s-neo.CodeMirror {
- background-color:#ffffff;
- color:#2e383c;
- line-height:1.4375;
-}
-.cm-s-neo .cm-comment { color:#75787b; }
-.cm-s-neo .cm-keyword, .cm-s-neo .cm-property { color:#1d75b3; }
-.cm-s-neo .cm-atom,.cm-s-neo .cm-number { color:#75438a; }
-.cm-s-neo .cm-node,.cm-s-neo .cm-tag { color:#9c3328; }
-.cm-s-neo .cm-string { color:#b35e14; }
-.cm-s-neo .cm-variable,.cm-s-neo .cm-qualifier { color:#047d65; }
-
-
-/* Editor styling */
-
-.cm-s-neo pre {
- padding:0;
-}
-
-.cm-s-neo .CodeMirror-gutters {
- border:none;
- border-right:10px solid transparent;
- background-color:transparent;
-}
-
-.cm-s-neo .CodeMirror-linenumber {
- padding:0;
- color:#e0e2e5;
-}
-
-.cm-s-neo .CodeMirror-guttermarker { color: #1d75b3; }
-.cm-s-neo .CodeMirror-guttermarker-subtle { color: #e0e2e5; }
-
-.cm-s-neo .CodeMirror-cursor {
- width: auto;
- border: 0;
- background: rgba(155,157,162,0.37);
- z-index: 1;
-}
diff --git a/WebContent/addon/codemirror/theme/night.css b/WebContent/addon/codemirror/theme/night.css
deleted file mode 100644
index fd4e561..0000000
--- a/WebContent/addon/codemirror/theme/night.css
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Loosely based on the Midnight Textmate theme */
-
-.cm-s-night.CodeMirror { background: #0a001f; color: #f8f8f8; }
-.cm-s-night div.CodeMirror-selected { background: #447; }
-.cm-s-night .CodeMirror-line::selection, .cm-s-night .CodeMirror-line > span::selection, .cm-s-night .CodeMirror-line > span > span::selection { background: rgba(68, 68, 119, .99); }
-.cm-s-night .CodeMirror-line::-moz-selection, .cm-s-night .CodeMirror-line > span::-moz-selection, .cm-s-night .CodeMirror-line > span > span::-moz-selection { background: rgba(68, 68, 119, .99); }
-.cm-s-night .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
-.cm-s-night .CodeMirror-guttermarker { color: white; }
-.cm-s-night .CodeMirror-guttermarker-subtle { color: #bbb; }
-.cm-s-night .CodeMirror-linenumber { color: #f8f8f8; }
-.cm-s-night .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-night span.cm-comment { color: #8900d1; }
-.cm-s-night span.cm-atom { color: #845dc4; }
-.cm-s-night span.cm-number, .cm-s-night span.cm-attribute { color: #ffd500; }
-.cm-s-night span.cm-keyword { color: #599eff; }
-.cm-s-night span.cm-string { color: #37f14a; }
-.cm-s-night span.cm-meta { color: #7678e2; }
-.cm-s-night span.cm-variable-2, .cm-s-night span.cm-tag { color: #99b2ff; }
-.cm-s-night span.cm-variable-3, .cm-s-night span.cm-def { color: white; }
-.cm-s-night span.cm-bracket { color: #8da6ce; }
-.cm-s-night span.cm-builtin, .cm-s-night span.cm-special { color: #ff9e59; }
-.cm-s-night span.cm-link { color: #845dc4; }
-.cm-s-night span.cm-error { color: #9d1e15; }
-
-.cm-s-night .CodeMirror-activeline-background { background: #1C005A; }
-.cm-s-night .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/WebContent/addon/codemirror/theme/panda-syntax.css b/WebContent/addon/codemirror/theme/panda-syntax.css
deleted file mode 100644
index c93b2ea..0000000
--- a/WebContent/addon/codemirror/theme/panda-syntax.css
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- Name: Panda Syntax
- Author: Siamak Mokhtari (http://github.com/siamak/)
- CodeMirror template by Siamak Mokhtari (https://github.com/siamak/atom-panda-syntax)
-*/
-.cm-s-panda-syntax {
- background: #292A2B;
- color: #E6E6E6;
- line-height: 1.5;
- font-family: 'Operator Mono', 'Source Sans Pro', Menlo, Monaco, Consolas, Courier New, monospace;
-}
-.cm-s-panda-syntax .CodeMirror-cursor { border-color: #ff2c6d; }
-.cm-s-panda-syntax .CodeMirror-activeline-background {
- background: rgba(99, 123, 156, 0.1);
-}
-.cm-s-panda-syntax .CodeMirror-selected {
- background: #FFF;
-}
-.cm-s-panda-syntax .cm-comment {
- font-style: italic;
- color: #676B79;
-}
-.cm-s-panda-syntax .cm-operator {
- color: #f3f3f3;
-}
-.cm-s-panda-syntax .cm-string {
- color: #19F9D8;
-}
-.cm-s-panda-syntax .cm-string-2 {
- color: #FFB86C;
-}
-
-.cm-s-panda-syntax .cm-tag {
- color: #ff2c6d;
-}
-.cm-s-panda-syntax .cm-meta {
- color: #b084eb;
-}
-
-.cm-s-panda-syntax .cm-number {
- color: #FFB86C;
-}
-.cm-s-panda-syntax .cm-atom {
- color: #ff2c6d;
-}
-.cm-s-panda-syntax .cm-keyword {
- color: #FF75B5;
-}
-.cm-s-panda-syntax .cm-variable {
- color: #ffb86c;
-}
-.cm-s-panda-syntax .cm-variable-2 {
- color: #ff9ac1;
-}
-.cm-s-panda-syntax .cm-variable-3 {
- color: #ff9ac1;
-}
-
-.cm-s-panda-syntax .cm-def {
- color: #e6e6e6;
-}
-.cm-s-panda-syntax .cm-property {
- color: #f3f3f3;
-}
-.cm-s-panda-syntax .cm-unit {
- color: #ffb86c;
-}
-
-.cm-s-panda-syntax .cm-attribute {
- color: #ffb86c;
-}
-
-.cm-s-panda-syntax .CodeMirror-matchingbracket {
- border-bottom: 1px dotted #19F9D8;
- padding-bottom: 2px;
- color: #e6e6e6;
-}
-.cm-s-panda-syntax .CodeMirror-gutters {
- background: #292a2b;
- border-right-color: rgba(255, 255, 255, 0.1);
-}
-.cm-s-panda-syntax .CodeMirror-linenumber {
- color: #e6e6e6;
- opacity: 0.6;
-}
diff --git a/WebContent/addon/codemirror/theme/paraiso-dark.css b/WebContent/addon/codemirror/theme/paraiso-dark.css
deleted file mode 100644
index aa9d207..0000000
--- a/WebContent/addon/codemirror/theme/paraiso-dark.css
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-
- Name: Paraíso (Dark)
- Author: Jan T. Sott
-
- Color scheme by Jan T. Sott (https://github.com/idleberg/Paraiso-CodeMirror)
- Inspired by the art of Rubens LP (http://www.rubenslp.com.br)
-
-*/
-
-.cm-s-paraiso-dark.CodeMirror { background: #2f1e2e; color: #b9b6b0; }
-.cm-s-paraiso-dark div.CodeMirror-selected { background: #41323f; }
-.cm-s-paraiso-dark .CodeMirror-line::selection, .cm-s-paraiso-dark .CodeMirror-line > span::selection, .cm-s-paraiso-dark .CodeMirror-line > span > span::selection { background: rgba(65, 50, 63, .99); }
-.cm-s-paraiso-dark .CodeMirror-line::-moz-selection, .cm-s-paraiso-dark .CodeMirror-line > span::-moz-selection, .cm-s-paraiso-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(65, 50, 63, .99); }
-.cm-s-paraiso-dark .CodeMirror-gutters { background: #2f1e2e; border-right: 0px; }
-.cm-s-paraiso-dark .CodeMirror-guttermarker { color: #ef6155; }
-.cm-s-paraiso-dark .CodeMirror-guttermarker-subtle { color: #776e71; }
-.cm-s-paraiso-dark .CodeMirror-linenumber { color: #776e71; }
-.cm-s-paraiso-dark .CodeMirror-cursor { border-left: 1px solid #8d8687; }
-
-.cm-s-paraiso-dark span.cm-comment { color: #e96ba8; }
-.cm-s-paraiso-dark span.cm-atom { color: #815ba4; }
-.cm-s-paraiso-dark span.cm-number { color: #815ba4; }
-
-.cm-s-paraiso-dark span.cm-property, .cm-s-paraiso-dark span.cm-attribute { color: #48b685; }
-.cm-s-paraiso-dark span.cm-keyword { color: #ef6155; }
-.cm-s-paraiso-dark span.cm-string { color: #fec418; }
-
-.cm-s-paraiso-dark span.cm-variable { color: #48b685; }
-.cm-s-paraiso-dark span.cm-variable-2 { color: #06b6ef; }
-.cm-s-paraiso-dark span.cm-def { color: #f99b15; }
-.cm-s-paraiso-dark span.cm-bracket { color: #b9b6b0; }
-.cm-s-paraiso-dark span.cm-tag { color: #ef6155; }
-.cm-s-paraiso-dark span.cm-link { color: #815ba4; }
-.cm-s-paraiso-dark span.cm-error { background: #ef6155; color: #8d8687; }
-
-.cm-s-paraiso-dark .CodeMirror-activeline-background { background: #4D344A; }
-.cm-s-paraiso-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/WebContent/addon/codemirror/theme/paraiso-light.css b/WebContent/addon/codemirror/theme/paraiso-light.css
deleted file mode 100644
index ae0c755..0000000
--- a/WebContent/addon/codemirror/theme/paraiso-light.css
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-
- Name: Paraíso (Light)
- Author: Jan T. Sott
-
- Color scheme by Jan T. Sott (https://github.com/idleberg/Paraiso-CodeMirror)
- Inspired by the art of Rubens LP (http://www.rubenslp.com.br)
-
-*/
-
-.cm-s-paraiso-light.CodeMirror { background: #e7e9db; color: #41323f; }
-.cm-s-paraiso-light div.CodeMirror-selected { background: #b9b6b0; }
-.cm-s-paraiso-light .CodeMirror-line::selection, .cm-s-paraiso-light .CodeMirror-line > span::selection, .cm-s-paraiso-light .CodeMirror-line > span > span::selection { background: #b9b6b0; }
-.cm-s-paraiso-light .CodeMirror-line::-moz-selection, .cm-s-paraiso-light .CodeMirror-line > span::-moz-selection, .cm-s-paraiso-light .CodeMirror-line > span > span::-moz-selection { background: #b9b6b0; }
-.cm-s-paraiso-light .CodeMirror-gutters { background: #e7e9db; border-right: 0px; }
-.cm-s-paraiso-light .CodeMirror-guttermarker { color: black; }
-.cm-s-paraiso-light .CodeMirror-guttermarker-subtle { color: #8d8687; }
-.cm-s-paraiso-light .CodeMirror-linenumber { color: #8d8687; }
-.cm-s-paraiso-light .CodeMirror-cursor { border-left: 1px solid #776e71; }
-
-.cm-s-paraiso-light span.cm-comment { color: #e96ba8; }
-.cm-s-paraiso-light span.cm-atom { color: #815ba4; }
-.cm-s-paraiso-light span.cm-number { color: #815ba4; }
-
-.cm-s-paraiso-light span.cm-property, .cm-s-paraiso-light span.cm-attribute { color: #48b685; }
-.cm-s-paraiso-light span.cm-keyword { color: #ef6155; }
-.cm-s-paraiso-light span.cm-string { color: #fec418; }
-
-.cm-s-paraiso-light span.cm-variable { color: #48b685; }
-.cm-s-paraiso-light span.cm-variable-2 { color: #06b6ef; }
-.cm-s-paraiso-light span.cm-def { color: #f99b15; }
-.cm-s-paraiso-light span.cm-bracket { color: #41323f; }
-.cm-s-paraiso-light span.cm-tag { color: #ef6155; }
-.cm-s-paraiso-light span.cm-link { color: #815ba4; }
-.cm-s-paraiso-light span.cm-error { background: #ef6155; color: #776e71; }
-
-.cm-s-paraiso-light .CodeMirror-activeline-background { background: #CFD1C4; }
-.cm-s-paraiso-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/WebContent/addon/codemirror/theme/pastel-on-dark.css b/WebContent/addon/codemirror/theme/pastel-on-dark.css
deleted file mode 100644
index 2603d36..0000000
--- a/WebContent/addon/codemirror/theme/pastel-on-dark.css
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Pastel On Dark theme ported from ACE editor
- * @license MIT
- * @copyright AtomicPages LLC 2014
- * @author Dennis Thompson, AtomicPages LLC
- * @version 1.1
- * @source https://github.com/atomicpages/codemirror-pastel-on-dark-theme
- */
-
-.cm-s-pastel-on-dark.CodeMirror {
- background: #2c2827;
- color: #8F938F;
- line-height: 1.5;
-}
-.cm-s-pastel-on-dark div.CodeMirror-selected { background: rgba(221,240,255,0.2); }
-.cm-s-pastel-on-dark .CodeMirror-line::selection, .cm-s-pastel-on-dark .CodeMirror-line > span::selection, .cm-s-pastel-on-dark .CodeMirror-line > span > span::selection { background: rgba(221,240,255,0.2); }
-.cm-s-pastel-on-dark .CodeMirror-line::-moz-selection, .cm-s-pastel-on-dark .CodeMirror-line > span::-moz-selection, .cm-s-pastel-on-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(221,240,255,0.2); }
-
-.cm-s-pastel-on-dark .CodeMirror-gutters {
- background: #34302f;
- border-right: 0px;
- padding: 0 3px;
-}
-.cm-s-pastel-on-dark .CodeMirror-guttermarker { color: white; }
-.cm-s-pastel-on-dark .CodeMirror-guttermarker-subtle { color: #8F938F; }
-.cm-s-pastel-on-dark .CodeMirror-linenumber { color: #8F938F; }
-.cm-s-pastel-on-dark .CodeMirror-cursor { border-left: 1px solid #A7A7A7; }
-.cm-s-pastel-on-dark span.cm-comment { color: #A6C6FF; }
-.cm-s-pastel-on-dark span.cm-atom { color: #DE8E30; }
-.cm-s-pastel-on-dark span.cm-number { color: #CCCCCC; }
-.cm-s-pastel-on-dark span.cm-property { color: #8F938F; }
-.cm-s-pastel-on-dark span.cm-attribute { color: #a6e22e; }
-.cm-s-pastel-on-dark span.cm-keyword { color: #AEB2F8; }
-.cm-s-pastel-on-dark span.cm-string { color: #66A968; }
-.cm-s-pastel-on-dark span.cm-variable { color: #AEB2F8; }
-.cm-s-pastel-on-dark span.cm-variable-2 { color: #BEBF55; }
-.cm-s-pastel-on-dark span.cm-variable-3 { color: #DE8E30; }
-.cm-s-pastel-on-dark span.cm-def { color: #757aD8; }
-.cm-s-pastel-on-dark span.cm-bracket { color: #f8f8f2; }
-.cm-s-pastel-on-dark span.cm-tag { color: #C1C144; }
-.cm-s-pastel-on-dark span.cm-link { color: #ae81ff; }
-.cm-s-pastel-on-dark span.cm-qualifier,.cm-s-pastel-on-dark span.cm-builtin { color: #C1C144; }
-.cm-s-pastel-on-dark span.cm-error {
- background: #757aD8;
- color: #f8f8f0;
-}
-.cm-s-pastel-on-dark .CodeMirror-activeline-background { background: rgba(255, 255, 255, 0.031); }
-.cm-s-pastel-on-dark .CodeMirror-matchingbracket {
- border: 1px solid rgba(255,255,255,0.25);
- color: #8F938F !important;
- margin: -1px -1px 0 -1px;
-}
diff --git a/WebContent/addon/codemirror/theme/railscasts.css b/WebContent/addon/codemirror/theme/railscasts.css
deleted file mode 100644
index aeff044..0000000
--- a/WebContent/addon/codemirror/theme/railscasts.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-
- Name: Railscasts
- Author: Ryan Bates (http://railscasts.com)
-
- CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
- Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-railscasts.CodeMirror {background: #2b2b2b; color: #f4f1ed;}
-.cm-s-railscasts div.CodeMirror-selected {background: #272935 !important;}
-.cm-s-railscasts .CodeMirror-gutters {background: #2b2b2b; border-right: 0px;}
-.cm-s-railscasts .CodeMirror-linenumber {color: #5a647e;}
-.cm-s-railscasts .CodeMirror-cursor {border-left: 1px solid #d4cfc9 !important;}
-
-.cm-s-railscasts span.cm-comment {color: #bc9458;}
-.cm-s-railscasts span.cm-atom {color: #b6b3eb;}
-.cm-s-railscasts span.cm-number {color: #b6b3eb;}
-
-.cm-s-railscasts span.cm-property, .cm-s-railscasts span.cm-attribute {color: #a5c261;}
-.cm-s-railscasts span.cm-keyword {color: #da4939;}
-.cm-s-railscasts span.cm-string {color: #ffc66d;}
-
-.cm-s-railscasts span.cm-variable {color: #a5c261;}
-.cm-s-railscasts span.cm-variable-2 {color: #6d9cbe;}
-.cm-s-railscasts span.cm-def {color: #cc7833;}
-.cm-s-railscasts span.cm-error {background: #da4939; color: #d4cfc9;}
-.cm-s-railscasts span.cm-bracket {color: #f4f1ed;}
-.cm-s-railscasts span.cm-tag {color: #da4939;}
-.cm-s-railscasts span.cm-link {color: #b6b3eb;}
-
-.cm-s-railscasts .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
-.cm-s-railscasts .CodeMirror-activeline-background { background: #303040; }
diff --git a/WebContent/addon/codemirror/theme/rubyblue.css b/WebContent/addon/codemirror/theme/rubyblue.css
deleted file mode 100644
index 76d33e7..0000000
--- a/WebContent/addon/codemirror/theme/rubyblue.css
+++ /dev/null
@@ -1,25 +0,0 @@
-.cm-s-rubyblue.CodeMirror { background: #112435; color: white; }
-.cm-s-rubyblue div.CodeMirror-selected { background: #38566F; }
-.cm-s-rubyblue .CodeMirror-line::selection, .cm-s-rubyblue .CodeMirror-line > span::selection, .cm-s-rubyblue .CodeMirror-line > span > span::selection { background: rgba(56, 86, 111, 0.99); }
-.cm-s-rubyblue .CodeMirror-line::-moz-selection, .cm-s-rubyblue .CodeMirror-line > span::-moz-selection, .cm-s-rubyblue .CodeMirror-line > span > span::-moz-selection { background: rgba(56, 86, 111, 0.99); }
-.cm-s-rubyblue .CodeMirror-gutters { background: #1F4661; border-right: 7px solid #3E7087; }
-.cm-s-rubyblue .CodeMirror-guttermarker { color: white; }
-.cm-s-rubyblue .CodeMirror-guttermarker-subtle { color: #3E7087; }
-.cm-s-rubyblue .CodeMirror-linenumber { color: white; }
-.cm-s-rubyblue .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-rubyblue span.cm-comment { color: #999; font-style:italic; line-height: 1em; }
-.cm-s-rubyblue span.cm-atom { color: #F4C20B; }
-.cm-s-rubyblue span.cm-number, .cm-s-rubyblue span.cm-attribute { color: #82C6E0; }
-.cm-s-rubyblue span.cm-keyword { color: #F0F; }
-.cm-s-rubyblue span.cm-string { color: #F08047; }
-.cm-s-rubyblue span.cm-meta { color: #F0F; }
-.cm-s-rubyblue span.cm-variable-2, .cm-s-rubyblue span.cm-tag { color: #7BD827; }
-.cm-s-rubyblue span.cm-variable-3, .cm-s-rubyblue span.cm-def { color: white; }
-.cm-s-rubyblue span.cm-bracket { color: #F0F; }
-.cm-s-rubyblue span.cm-link { color: #F4C20B; }
-.cm-s-rubyblue span.CodeMirror-matchingbracket { color:#F0F !important; }
-.cm-s-rubyblue span.cm-builtin, .cm-s-rubyblue span.cm-special { color: #FF9D00; }
-.cm-s-rubyblue span.cm-error { color: #AF2018; }
-
-.cm-s-rubyblue .CodeMirror-activeline-background { background: #173047; }
diff --git a/WebContent/addon/codemirror/theme/seti.css b/WebContent/addon/codemirror/theme/seti.css
deleted file mode 100644
index 6632d3f..0000000
--- a/WebContent/addon/codemirror/theme/seti.css
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-
- Name: seti
- Author: Michael Kaminsky (http://github.com/mkaminsky11)
-
- Original seti color scheme by Jesse Weed (https://github.com/jesseweed/seti-syntax)
-
-*/
-
-
-.cm-s-seti.CodeMirror {
- background-color: #151718 !important;
- color: #CFD2D1 !important;
- border: none;
-}
-.cm-s-seti .CodeMirror-gutters {
- color: #404b53;
- background-color: #0E1112;
- border: none;
-}
-.cm-s-seti .CodeMirror-cursor { border-left: solid thin #f8f8f0; }
-.cm-s-seti .CodeMirror-linenumber { color: #6D8A88; }
-.cm-s-seti.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
-.cm-s-seti .CodeMirror-line::selection, .cm-s-seti .CodeMirror-line > span::selection, .cm-s-seti .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
-.cm-s-seti .CodeMirror-line::-moz-selection, .cm-s-seti .CodeMirror-line > span::-moz-selection, .cm-s-seti .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
-.cm-s-seti span.cm-comment { color: #41535b; }
-.cm-s-seti span.cm-string, .cm-s-seti span.cm-string-2 { color: #55b5db; }
-.cm-s-seti span.cm-number { color: #cd3f45; }
-.cm-s-seti span.cm-variable { color: #55b5db; }
-.cm-s-seti span.cm-variable-2 { color: #a074c4; }
-.cm-s-seti span.cm-def { color: #55b5db; }
-.cm-s-seti span.cm-keyword { color: #ff79c6; }
-.cm-s-seti span.cm-operator { color: #9fca56; }
-.cm-s-seti span.cm-keyword { color: #e6cd69; }
-.cm-s-seti span.cm-atom { color: #cd3f45; }
-.cm-s-seti span.cm-meta { color: #55b5db; }
-.cm-s-seti span.cm-tag { color: #55b5db; }
-.cm-s-seti span.cm-attribute { color: #9fca56; }
-.cm-s-seti span.cm-qualifier { color: #9fca56; }
-.cm-s-seti span.cm-property { color: #a074c4; }
-.cm-s-seti span.cm-variable-3 { color: #9fca56; }
-.cm-s-seti span.cm-builtin { color: #9fca56; }
-.cm-s-seti .CodeMirror-activeline-background { background: #101213; }
-.cm-s-seti .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/WebContent/addon/codemirror/theme/solarized.css b/WebContent/addon/codemirror/theme/solarized.css
deleted file mode 100644
index 1f39c7e..0000000
--- a/WebContent/addon/codemirror/theme/solarized.css
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
-Solarized theme for code-mirror
-http://ethanschoonover.com/solarized
-*/
-
-/*
-Solarized color palette
-http://ethanschoonover.com/solarized/img/solarized-palette.png
-*/
-
-.solarized.base03 { color: #002b36; }
-.solarized.base02 { color: #073642; }
-.solarized.base01 { color: #586e75; }
-.solarized.base00 { color: #657b83; }
-.solarized.base0 { color: #839496; }
-.solarized.base1 { color: #93a1a1; }
-.solarized.base2 { color: #eee8d5; }
-.solarized.base3 { color: #fdf6e3; }
-.solarized.solar-yellow { color: #b58900; }
-.solarized.solar-orange { color: #cb4b16; }
-.solarized.solar-red { color: #dc322f; }
-.solarized.solar-magenta { color: #d33682; }
-.solarized.solar-violet { color: #6c71c4; }
-.solarized.solar-blue { color: #268bd2; }
-.solarized.solar-cyan { color: #2aa198; }
-.solarized.solar-green { color: #859900; }
-
-/* Color scheme for code-mirror */
-
-.cm-s-solarized {
- line-height: 1.45em;
- color-profile: sRGB;
- rendering-intent: auto;
-}
-.cm-s-solarized.cm-s-dark {
- color: #839496;
- background-color: #002b36;
- text-shadow: #002b36 0 1px;
-}
-.cm-s-solarized.cm-s-light {
- background-color: #fdf6e3;
- color: #657b83;
- text-shadow: #eee8d5 0 1px;
-}
-
-.cm-s-solarized .CodeMirror-widget {
- text-shadow: none;
-}
-
-.cm-s-solarized .cm-header { color: #586e75; }
-.cm-s-solarized .cm-quote { color: #93a1a1; }
-
-.cm-s-solarized .cm-keyword { color: #cb4b16; }
-.cm-s-solarized .cm-atom { color: #d33682; }
-.cm-s-solarized .cm-number { color: #d33682; }
-.cm-s-solarized .cm-def { color: #2aa198; }
-
-.cm-s-solarized .cm-variable { color: #839496; }
-.cm-s-solarized .cm-variable-2 { color: #b58900; }
-.cm-s-solarized .cm-variable-3 { color: #6c71c4; }
-
-.cm-s-solarized .cm-property { color: #2aa198; }
-.cm-s-solarized .cm-operator { color: #6c71c4; }
-
-.cm-s-solarized .cm-comment { color: #586e75; font-style:italic; }
-
-.cm-s-solarized .cm-string { color: #859900; }
-.cm-s-solarized .cm-string-2 { color: #b58900; }
-
-.cm-s-solarized .cm-meta { color: #859900; }
-.cm-s-solarized .cm-qualifier { color: #b58900; }
-.cm-s-solarized .cm-builtin { color: #d33682; }
-.cm-s-solarized .cm-bracket { color: #cb4b16; }
-.cm-s-solarized .CodeMirror-matchingbracket { color: #859900; }
-.cm-s-solarized .CodeMirror-nonmatchingbracket { color: #dc322f; }
-.cm-s-solarized .cm-tag { color: #93a1a1; }
-.cm-s-solarized .cm-attribute { color: #2aa198; }
-.cm-s-solarized .cm-hr {
- color: transparent;
- border-top: 1px solid #586e75;
- display: block;
-}
-.cm-s-solarized .cm-link { color: #93a1a1; cursor: pointer; }
-.cm-s-solarized .cm-special { color: #6c71c4; }
-.cm-s-solarized .cm-em {
- color: #999;
- text-decoration: underline;
- text-decoration-style: dotted;
-}
-.cm-s-solarized .cm-strong { color: #eee; }
-.cm-s-solarized .cm-error,
-.cm-s-solarized .cm-invalidchar {
- color: #586e75;
- border-bottom: 1px dotted #dc322f;
-}
-
-.cm-s-solarized.cm-s-dark div.CodeMirror-selected { background: #073642; }
-.cm-s-solarized.cm-s-dark.CodeMirror ::selection { background: rgba(7, 54, 66, 0.99); }
-.cm-s-solarized.cm-s-dark .CodeMirror-line::-moz-selection, .cm-s-dark .CodeMirror-line > span::-moz-selection, .cm-s-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(7, 54, 66, 0.99); }
-
-.cm-s-solarized.cm-s-light div.CodeMirror-selected { background: #eee8d5; }
-.cm-s-solarized.cm-s-light .CodeMirror-line::selection, .cm-s-light .CodeMirror-line > span::selection, .cm-s-light .CodeMirror-line > span > span::selection { background: #eee8d5; }
-.cm-s-solarized.cm-s-light .CodeMirror-line::-moz-selection, .cm-s-ligh .CodeMirror-line > span::-moz-selection, .cm-s-ligh .CodeMirror-line > span > span::-moz-selection { background: #eee8d5; }
-
-/* Editor styling */
-
-
-
-/* Little shadow on the view-port of the buffer view */
-.cm-s-solarized.CodeMirror {
- -moz-box-shadow: inset 7px 0 12px -6px #000;
- -webkit-box-shadow: inset 7px 0 12px -6px #000;
- box-shadow: inset 7px 0 12px -6px #000;
-}
-
-/* Remove gutter border */
-.cm-s-solarized .CodeMirror-gutters {
- border-right: 0;
-}
-
-/* Gutter colors and line number styling based of color scheme (dark / light) */
-
-/* Dark */
-.cm-s-solarized.cm-s-dark .CodeMirror-gutters {
- background-color: #073642;
-}
-
-.cm-s-solarized.cm-s-dark .CodeMirror-linenumber {
- color: #586e75;
- text-shadow: #021014 0 -1px;
-}
-
-/* Light */
-.cm-s-solarized.cm-s-light .CodeMirror-gutters {
- background-color: #eee8d5;
-}
-
-.cm-s-solarized.cm-s-light .CodeMirror-linenumber {
- color: #839496;
-}
-
-/* Common */
-.cm-s-solarized .CodeMirror-linenumber {
- padding: 0 5px;
-}
-.cm-s-solarized .CodeMirror-guttermarker-subtle { color: #586e75; }
-.cm-s-solarized.cm-s-dark .CodeMirror-guttermarker { color: #ddd; }
-.cm-s-solarized.cm-s-light .CodeMirror-guttermarker { color: #cb4b16; }
-
-.cm-s-solarized .CodeMirror-gutter .CodeMirror-gutter-text {
- color: #586e75;
-}
-
-/* Cursor */
-.cm-s-solarized .CodeMirror-cursor { border-left: 1px solid #819090; }
-
-/* Fat cursor */
-.cm-s-solarized.cm-s-light.cm-fat-cursor .CodeMirror-cursor { background: #77ee77; }
-.cm-s-solarized.cm-s-light .cm-animate-fat-cursor { background-color: #77ee77; }
-.cm-s-solarized.cm-s-dark.cm-fat-cursor .CodeMirror-cursor { background: #586e75; }
-.cm-s-solarized.cm-s-dark .cm-animate-fat-cursor { background-color: #586e75; }
-
-/* Active line */
-.cm-s-solarized.cm-s-dark .CodeMirror-activeline-background {
- background: rgba(255, 255, 255, 0.06);
-}
-.cm-s-solarized.cm-s-light .CodeMirror-activeline-background {
- background: rgba(0, 0, 0, 0.06);
-}
diff --git a/WebContent/addon/codemirror/theme/the-matrix.css b/WebContent/addon/codemirror/theme/the-matrix.css
deleted file mode 100644
index 3912a8d..0000000
--- a/WebContent/addon/codemirror/theme/the-matrix.css
+++ /dev/null
@@ -1,30 +0,0 @@
-.cm-s-the-matrix.CodeMirror { background: #000000; color: #00FF00; }
-.cm-s-the-matrix div.CodeMirror-selected { background: #2D2D2D; }
-.cm-s-the-matrix .CodeMirror-line::selection, .cm-s-the-matrix .CodeMirror-line > span::selection, .cm-s-the-matrix .CodeMirror-line > span > span::selection { background: rgba(45, 45, 45, 0.99); }
-.cm-s-the-matrix .CodeMirror-line::-moz-selection, .cm-s-the-matrix .CodeMirror-line > span::-moz-selection, .cm-s-the-matrix .CodeMirror-line > span > span::-moz-selection { background: rgba(45, 45, 45, 0.99); }
-.cm-s-the-matrix .CodeMirror-gutters { background: #060; border-right: 2px solid #00FF00; }
-.cm-s-the-matrix .CodeMirror-guttermarker { color: #0f0; }
-.cm-s-the-matrix .CodeMirror-guttermarker-subtle { color: white; }
-.cm-s-the-matrix .CodeMirror-linenumber { color: #FFFFFF; }
-.cm-s-the-matrix .CodeMirror-cursor { border-left: 1px solid #00FF00; }
-
-.cm-s-the-matrix span.cm-keyword { color: #008803; font-weight: bold; }
-.cm-s-the-matrix span.cm-atom { color: #3FF; }
-.cm-s-the-matrix span.cm-number { color: #FFB94F; }
-.cm-s-the-matrix span.cm-def { color: #99C; }
-.cm-s-the-matrix span.cm-variable { color: #F6C; }
-.cm-s-the-matrix span.cm-variable-2 { color: #C6F; }
-.cm-s-the-matrix span.cm-variable-3 { color: #96F; }
-.cm-s-the-matrix span.cm-property { color: #62FFA0; }
-.cm-s-the-matrix span.cm-operator { color: #999; }
-.cm-s-the-matrix span.cm-comment { color: #CCCCCC; }
-.cm-s-the-matrix span.cm-string { color: #39C; }
-.cm-s-the-matrix span.cm-meta { color: #C9F; }
-.cm-s-the-matrix span.cm-qualifier { color: #FFF700; }
-.cm-s-the-matrix span.cm-builtin { color: #30a; }
-.cm-s-the-matrix span.cm-bracket { color: #cc7; }
-.cm-s-the-matrix span.cm-tag { color: #FFBD40; }
-.cm-s-the-matrix span.cm-attribute { color: #FFF700; }
-.cm-s-the-matrix span.cm-error { color: #FF0000; }
-
-.cm-s-the-matrix .CodeMirror-activeline-background { background: #040; }
diff --git a/WebContent/addon/codemirror/theme/tomorrow-night-bright.css b/WebContent/addon/codemirror/theme/tomorrow-night-bright.css
deleted file mode 100644
index b6dd4a9..0000000
--- a/WebContent/addon/codemirror/theme/tomorrow-night-bright.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
- Name: Tomorrow Night - Bright
- Author: Chris Kempson
-
- Port done by Gerard Braad
-
-*/
-
-.cm-s-tomorrow-night-bright.CodeMirror { background: #000000; color: #eaeaea; }
-.cm-s-tomorrow-night-bright div.CodeMirror-selected { background: #424242; }
-.cm-s-tomorrow-night-bright .CodeMirror-gutters { background: #000000; border-right: 0px; }
-.cm-s-tomorrow-night-bright .CodeMirror-guttermarker { color: #e78c45; }
-.cm-s-tomorrow-night-bright .CodeMirror-guttermarker-subtle { color: #777; }
-.cm-s-tomorrow-night-bright .CodeMirror-linenumber { color: #424242; }
-.cm-s-tomorrow-night-bright .CodeMirror-cursor { border-left: 1px solid #6A6A6A; }
-
-.cm-s-tomorrow-night-bright span.cm-comment { color: #d27b53; }
-.cm-s-tomorrow-night-bright span.cm-atom { color: #a16a94; }
-.cm-s-tomorrow-night-bright span.cm-number { color: #a16a94; }
-
-.cm-s-tomorrow-night-bright span.cm-property, .cm-s-tomorrow-night-bright span.cm-attribute { color: #99cc99; }
-.cm-s-tomorrow-night-bright span.cm-keyword { color: #d54e53; }
-.cm-s-tomorrow-night-bright span.cm-string { color: #e7c547; }
-
-.cm-s-tomorrow-night-bright span.cm-variable { color: #b9ca4a; }
-.cm-s-tomorrow-night-bright span.cm-variable-2 { color: #7aa6da; }
-.cm-s-tomorrow-night-bright span.cm-def { color: #e78c45; }
-.cm-s-tomorrow-night-bright span.cm-bracket { color: #eaeaea; }
-.cm-s-tomorrow-night-bright span.cm-tag { color: #d54e53; }
-.cm-s-tomorrow-night-bright span.cm-link { color: #a16a94; }
-.cm-s-tomorrow-night-bright span.cm-error { background: #d54e53; color: #6A6A6A; }
-
-.cm-s-tomorrow-night-bright .CodeMirror-activeline-background { background: #2a2a2a; }
-.cm-s-tomorrow-night-bright .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/WebContent/addon/codemirror/theme/tomorrow-night-eighties.css b/WebContent/addon/codemirror/theme/tomorrow-night-eighties.css
deleted file mode 100644
index 2a9debc..0000000
--- a/WebContent/addon/codemirror/theme/tomorrow-night-eighties.css
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-
- Name: Tomorrow Night - Eighties
- Author: Chris Kempson
-
- CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
- Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-tomorrow-night-eighties.CodeMirror { background: #000000; color: #CCCCCC; }
-.cm-s-tomorrow-night-eighties div.CodeMirror-selected { background: #2D2D2D; }
-.cm-s-tomorrow-night-eighties .CodeMirror-line::selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span::selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span > span::selection { background: rgba(45, 45, 45, 0.99); }
-.cm-s-tomorrow-night-eighties .CodeMirror-line::-moz-selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span::-moz-selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span > span::-moz-selection { background: rgba(45, 45, 45, 0.99); }
-.cm-s-tomorrow-night-eighties .CodeMirror-gutters { background: #000000; border-right: 0px; }
-.cm-s-tomorrow-night-eighties .CodeMirror-guttermarker { color: #f2777a; }
-.cm-s-tomorrow-night-eighties .CodeMirror-guttermarker-subtle { color: #777; }
-.cm-s-tomorrow-night-eighties .CodeMirror-linenumber { color: #515151; }
-.cm-s-tomorrow-night-eighties .CodeMirror-cursor { border-left: 1px solid #6A6A6A; }
-
-.cm-s-tomorrow-night-eighties span.cm-comment { color: #d27b53; }
-.cm-s-tomorrow-night-eighties span.cm-atom { color: #a16a94; }
-.cm-s-tomorrow-night-eighties span.cm-number { color: #a16a94; }
-
-.cm-s-tomorrow-night-eighties span.cm-property, .cm-s-tomorrow-night-eighties span.cm-attribute { color: #99cc99; }
-.cm-s-tomorrow-night-eighties span.cm-keyword { color: #f2777a; }
-.cm-s-tomorrow-night-eighties span.cm-string { color: #ffcc66; }
-
-.cm-s-tomorrow-night-eighties span.cm-variable { color: #99cc99; }
-.cm-s-tomorrow-night-eighties span.cm-variable-2 { color: #6699cc; }
-.cm-s-tomorrow-night-eighties span.cm-def { color: #f99157; }
-.cm-s-tomorrow-night-eighties span.cm-bracket { color: #CCCCCC; }
-.cm-s-tomorrow-night-eighties span.cm-tag { color: #f2777a; }
-.cm-s-tomorrow-night-eighties span.cm-link { color: #a16a94; }
-.cm-s-tomorrow-night-eighties span.cm-error { background: #f2777a; color: #6A6A6A; }
-
-.cm-s-tomorrow-night-eighties .CodeMirror-activeline-background { background: #343600; }
-.cm-s-tomorrow-night-eighties .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/WebContent/addon/codemirror/theme/ttcn.css b/WebContent/addon/codemirror/theme/ttcn.css
deleted file mode 100644
index b3d4656..0000000
--- a/WebContent/addon/codemirror/theme/ttcn.css
+++ /dev/null
@@ -1,64 +0,0 @@
-.cm-s-ttcn .cm-quote { color: #090; }
-.cm-s-ttcn .cm-negative { color: #d44; }
-.cm-s-ttcn .cm-positive { color: #292; }
-.cm-s-ttcn .cm-header, .cm-strong { font-weight: bold; }
-.cm-s-ttcn .cm-em { font-style: italic; }
-.cm-s-ttcn .cm-link { text-decoration: underline; }
-.cm-s-ttcn .cm-strikethrough { text-decoration: line-through; }
-.cm-s-ttcn .cm-header { color: #00f; font-weight: bold; }
-
-.cm-s-ttcn .cm-atom { color: #219; }
-.cm-s-ttcn .cm-attribute { color: #00c; }
-.cm-s-ttcn .cm-bracket { color: #997; }
-.cm-s-ttcn .cm-comment { color: #333333; }
-.cm-s-ttcn .cm-def { color: #00f; }
-.cm-s-ttcn .cm-em { font-style: italic; }
-.cm-s-ttcn .cm-error { color: #f00; }
-.cm-s-ttcn .cm-hr { color: #999; }
-.cm-s-ttcn .cm-invalidchar { color: #f00; }
-.cm-s-ttcn .cm-keyword { font-weight:bold; }
-.cm-s-ttcn .cm-link { color: #00c; text-decoration: underline; }
-.cm-s-ttcn .cm-meta { color: #555; }
-.cm-s-ttcn .cm-negative { color: #d44; }
-.cm-s-ttcn .cm-positive { color: #292; }
-.cm-s-ttcn .cm-qualifier { color: #555; }
-.cm-s-ttcn .cm-strikethrough { text-decoration: line-through; }
-.cm-s-ttcn .cm-string { color: #006400; }
-.cm-s-ttcn .cm-string-2 { color: #f50; }
-.cm-s-ttcn .cm-strong { font-weight: bold; }
-.cm-s-ttcn .cm-tag { color: #170; }
-.cm-s-ttcn .cm-variable { color: #8B2252; }
-.cm-s-ttcn .cm-variable-2 { color: #05a; }
-.cm-s-ttcn .cm-variable-3 { color: #085; }
-
-.cm-s-ttcn .cm-invalidchar { color: #f00; }
-
-/* ASN */
-.cm-s-ttcn .cm-accessTypes,
-.cm-s-ttcn .cm-compareTypes { color: #27408B; }
-.cm-s-ttcn .cm-cmipVerbs { color: #8B2252; }
-.cm-s-ttcn .cm-modifier { color:#D2691E; }
-.cm-s-ttcn .cm-status { color:#8B4545; }
-.cm-s-ttcn .cm-storage { color:#A020F0; }
-.cm-s-ttcn .cm-tags { color:#006400; }
-
-/* CFG */
-.cm-s-ttcn .cm-externalCommands { color: #8B4545; font-weight:bold; }
-.cm-s-ttcn .cm-fileNCtrlMaskOptions,
-.cm-s-ttcn .cm-sectionTitle { color: #2E8B57; font-weight:bold; }
-
-/* TTCN */
-.cm-s-ttcn .cm-booleanConsts,
-.cm-s-ttcn .cm-otherConsts,
-.cm-s-ttcn .cm-verdictConsts { color: #006400; }
-.cm-s-ttcn .cm-configOps,
-.cm-s-ttcn .cm-functionOps,
-.cm-s-ttcn .cm-portOps,
-.cm-s-ttcn .cm-sutOps,
-.cm-s-ttcn .cm-timerOps,
-.cm-s-ttcn .cm-verdictOps { color: #0000FF; }
-.cm-s-ttcn .cm-preprocessor,
-.cm-s-ttcn .cm-templateMatch,
-.cm-s-ttcn .cm-ttcn3Macros { color: #27408B; }
-.cm-s-ttcn .cm-types { color: #A52A2A; font-weight:bold; }
-.cm-s-ttcn .cm-visibilityModifiers { font-weight:bold; }
diff --git a/WebContent/addon/codemirror/theme/twilight.css b/WebContent/addon/codemirror/theme/twilight.css
deleted file mode 100644
index d342b89..0000000
--- a/WebContent/addon/codemirror/theme/twilight.css
+++ /dev/null
@@ -1,32 +0,0 @@
-.cm-s-twilight.CodeMirror { background: #141414; color: #f7f7f7; } /**/
-.cm-s-twilight div.CodeMirror-selected { background: #323232; } /**/
-.cm-s-twilight .CodeMirror-line::selection, .cm-s-twilight .CodeMirror-line > span::selection, .cm-s-twilight .CodeMirror-line > span > span::selection { background: rgba(50, 50, 50, 0.99); }
-.cm-s-twilight .CodeMirror-line::-moz-selection, .cm-s-twilight .CodeMirror-line > span::-moz-selection, .cm-s-twilight .CodeMirror-line > span > span::-moz-selection { background: rgba(50, 50, 50, 0.99); }
-
-.cm-s-twilight .CodeMirror-gutters { background: #222; border-right: 1px solid #aaa; }
-.cm-s-twilight .CodeMirror-guttermarker { color: white; }
-.cm-s-twilight .CodeMirror-guttermarker-subtle { color: #aaa; }
-.cm-s-twilight .CodeMirror-linenumber { color: #aaa; }
-.cm-s-twilight .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-twilight .cm-keyword { color: #f9ee98; } /**/
-.cm-s-twilight .cm-atom { color: #FC0; }
-.cm-s-twilight .cm-number { color: #ca7841; } /**/
-.cm-s-twilight .cm-def { color: #8DA6CE; }
-.cm-s-twilight span.cm-variable-2, .cm-s-twilight span.cm-tag { color: #607392; } /**/
-.cm-s-twilight span.cm-variable-3, .cm-s-twilight span.cm-def { color: #607392; } /**/
-.cm-s-twilight .cm-operator { color: #cda869; } /**/
-.cm-s-twilight .cm-comment { color:#777; font-style:italic; font-weight:normal; } /**/
-.cm-s-twilight .cm-string { color:#8f9d6a; font-style:italic; } /**/
-.cm-s-twilight .cm-string-2 { color:#bd6b18; } /*?*/
-.cm-s-twilight .cm-meta { background-color:#141414; color:#f7f7f7; } /*?*/
-.cm-s-twilight .cm-builtin { color: #cda869; } /*?*/
-.cm-s-twilight .cm-tag { color: #997643; } /**/
-.cm-s-twilight .cm-attribute { color: #d6bb6d; } /*?*/
-.cm-s-twilight .cm-header { color: #FF6400; }
-.cm-s-twilight .cm-hr { color: #AEAEAE; }
-.cm-s-twilight .cm-link { color:#ad9361; font-style:italic; text-decoration:none; } /**/
-.cm-s-twilight .cm-error { border-bottom: 1px solid red; }
-
-.cm-s-twilight .CodeMirror-activeline-background { background: #27282E; }
-.cm-s-twilight .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/WebContent/addon/codemirror/theme/vibrant-ink.css b/WebContent/addon/codemirror/theme/vibrant-ink.css
deleted file mode 100644
index ac4ec6d..0000000
--- a/WebContent/addon/codemirror/theme/vibrant-ink.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Taken from the popular Visual Studio Vibrant Ink Schema */
-
-.cm-s-vibrant-ink.CodeMirror { background: black; color: white; }
-.cm-s-vibrant-ink div.CodeMirror-selected { background: #35493c; }
-.cm-s-vibrant-ink .CodeMirror-line::selection, .cm-s-vibrant-ink .CodeMirror-line > span::selection, .cm-s-vibrant-ink .CodeMirror-line > span > span::selection { background: rgba(53, 73, 60, 0.99); }
-.cm-s-vibrant-ink .CodeMirror-line::-moz-selection, .cm-s-vibrant-ink .CodeMirror-line > span::-moz-selection, .cm-s-vibrant-ink .CodeMirror-line > span > span::-moz-selection { background: rgba(53, 73, 60, 0.99); }
-
-.cm-s-vibrant-ink .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
-.cm-s-vibrant-ink .CodeMirror-guttermarker { color: white; }
-.cm-s-vibrant-ink .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
-.cm-s-vibrant-ink .CodeMirror-linenumber { color: #d0d0d0; }
-.cm-s-vibrant-ink .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-vibrant-ink .cm-keyword { color: #CC7832; }
-.cm-s-vibrant-ink .cm-atom { color: #FC0; }
-.cm-s-vibrant-ink .cm-number { color: #FFEE98; }
-.cm-s-vibrant-ink .cm-def { color: #8DA6CE; }
-.cm-s-vibrant-ink span.cm-variable-2, .cm-s-vibrant span.cm-tag { color: #FFC66D; }
-.cm-s-vibrant-ink span.cm-variable-3, .cm-s-vibrant span.cm-def { color: #FFC66D; }
-.cm-s-vibrant-ink .cm-operator { color: #888; }
-.cm-s-vibrant-ink .cm-comment { color: gray; font-weight: bold; }
-.cm-s-vibrant-ink .cm-string { color: #A5C25C; }
-.cm-s-vibrant-ink .cm-string-2 { color: red; }
-.cm-s-vibrant-ink .cm-meta { color: #D8FA3C; }
-.cm-s-vibrant-ink .cm-builtin { color: #8DA6CE; }
-.cm-s-vibrant-ink .cm-tag { color: #8DA6CE; }
-.cm-s-vibrant-ink .cm-attribute { color: #8DA6CE; }
-.cm-s-vibrant-ink .cm-header { color: #FF6400; }
-.cm-s-vibrant-ink .cm-hr { color: #AEAEAE; }
-.cm-s-vibrant-ink .cm-link { color: blue; }
-.cm-s-vibrant-ink .cm-error { border-bottom: 1px solid red; }
-
-.cm-s-vibrant-ink .CodeMirror-activeline-background { background: #27282E; }
-.cm-s-vibrant-ink .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/WebContent/addon/codemirror/theme/xq-dark.css b/WebContent/addon/codemirror/theme/xq-dark.css
deleted file mode 100644
index e3bd960..0000000
--- a/WebContent/addon/codemirror/theme/xq-dark.css
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-Copyright (C) 2011 by MarkLogic Corporation
-Author: Mike Brevoort
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-.cm-s-xq-dark.CodeMirror { background: #0a001f; color: #f8f8f8; }
-.cm-s-xq-dark div.CodeMirror-selected { background: #27007A; }
-.cm-s-xq-dark .CodeMirror-line::selection, .cm-s-xq-dark .CodeMirror-line > span::selection, .cm-s-xq-dark .CodeMirror-line > span > span::selection { background: rgba(39, 0, 122, 0.99); }
-.cm-s-xq-dark .CodeMirror-line::-moz-selection, .cm-s-xq-dark .CodeMirror-line > span::-moz-selection, .cm-s-xq-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(39, 0, 122, 0.99); }
-.cm-s-xq-dark .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
-.cm-s-xq-dark .CodeMirror-guttermarker { color: #FFBD40; }
-.cm-s-xq-dark .CodeMirror-guttermarker-subtle { color: #f8f8f8; }
-.cm-s-xq-dark .CodeMirror-linenumber { color: #f8f8f8; }
-.cm-s-xq-dark .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-xq-dark span.cm-keyword { color: #FFBD40; }
-.cm-s-xq-dark span.cm-atom { color: #6C8CD5; }
-.cm-s-xq-dark span.cm-number { color: #164; }
-.cm-s-xq-dark span.cm-def { color: #FFF; text-decoration:underline; }
-.cm-s-xq-dark span.cm-variable { color: #FFF; }
-.cm-s-xq-dark span.cm-variable-2 { color: #EEE; }
-.cm-s-xq-dark span.cm-variable-3 { color: #DDD; }
-.cm-s-xq-dark span.cm-property {}
-.cm-s-xq-dark span.cm-operator {}
-.cm-s-xq-dark span.cm-comment { color: gray; }
-.cm-s-xq-dark span.cm-string { color: #9FEE00; }
-.cm-s-xq-dark span.cm-meta { color: yellow; }
-.cm-s-xq-dark span.cm-qualifier { color: #FFF700; }
-.cm-s-xq-dark span.cm-builtin { color: #30a; }
-.cm-s-xq-dark span.cm-bracket { color: #cc7; }
-.cm-s-xq-dark span.cm-tag { color: #FFBD40; }
-.cm-s-xq-dark span.cm-attribute { color: #FFF700; }
-.cm-s-xq-dark span.cm-error { color: #f00; }
-
-.cm-s-xq-dark .CodeMirror-activeline-background { background: #27282E; }
-.cm-s-xq-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/WebContent/addon/codemirror/theme/xq-light.css b/WebContent/addon/codemirror/theme/xq-light.css
deleted file mode 100644
index 8d2fcb6..0000000
--- a/WebContent/addon/codemirror/theme/xq-light.css
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-Copyright (C) 2011 by MarkLogic Corporation
-Author: Mike Brevoort
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-.cm-s-xq-light span.cm-keyword { line-height: 1em; font-weight: bold; color: #5A5CAD; }
-.cm-s-xq-light span.cm-atom { color: #6C8CD5; }
-.cm-s-xq-light span.cm-number { color: #164; }
-.cm-s-xq-light span.cm-def { text-decoration:underline; }
-.cm-s-xq-light span.cm-variable { color: black; }
-.cm-s-xq-light span.cm-variable-2 { color:black; }
-.cm-s-xq-light span.cm-variable-3 { color: black; }
-.cm-s-xq-light span.cm-property {}
-.cm-s-xq-light span.cm-operator {}
-.cm-s-xq-light span.cm-comment { color: #0080FF; font-style: italic; }
-.cm-s-xq-light span.cm-string { color: red; }
-.cm-s-xq-light span.cm-meta { color: yellow; }
-.cm-s-xq-light span.cm-qualifier { color: grey; }
-.cm-s-xq-light span.cm-builtin { color: #7EA656; }
-.cm-s-xq-light span.cm-bracket { color: #cc7; }
-.cm-s-xq-light span.cm-tag { color: #3F7F7F; }
-.cm-s-xq-light span.cm-attribute { color: #7F007F; }
-.cm-s-xq-light span.cm-error { color: #f00; }
-
-.cm-s-xq-light .CodeMirror-activeline-background { background: #e8f2ff; }
-.cm-s-xq-light .CodeMirror-matchingbracket { outline:1px solid grey;color:black !important;background:yellow; }
diff --git a/WebContent/addon/codemirror/theme/yeti.css b/WebContent/addon/codemirror/theme/yeti.css
deleted file mode 100644
index c70d4d2..0000000
--- a/WebContent/addon/codemirror/theme/yeti.css
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-
- Name: yeti
- Author: Michael Kaminsky (http://github.com/mkaminsky11)
-
- Original yeti color scheme by Jesse Weed (https://github.com/jesseweed/yeti-syntax)
-
-*/
-
-
-.cm-s-yeti.CodeMirror {
- background-color: #ECEAE8 !important;
- color: #d1c9c0 !important;
- border: none;
-}
-
-.cm-s-yeti .CodeMirror-gutters {
- color: #adaba6;
- background-color: #E5E1DB;
- border: none;
-}
-.cm-s-yeti .CodeMirror-cursor { border-left: solid thin #d1c9c0; }
-.cm-s-yeti .CodeMirror-linenumber { color: #adaba6; }
-.cm-s-yeti.CodeMirror-focused div.CodeMirror-selected { background: #DCD8D2; }
-.cm-s-yeti .CodeMirror-line::selection, .cm-s-yeti .CodeMirror-line > span::selection, .cm-s-yeti .CodeMirror-line > span > span::selection { background: #DCD8D2; }
-.cm-s-yeti .CodeMirror-line::-moz-selection, .cm-s-yeti .CodeMirror-line > span::-moz-selection, .cm-s-yeti .CodeMirror-line > span > span::-moz-selection { background: #DCD8D2; }
-.cm-s-yeti span.cm-comment { color: #d4c8be; }
-.cm-s-yeti span.cm-string, .cm-s-yeti span.cm-string-2 { color: #96c0d8; }
-.cm-s-yeti span.cm-number { color: #a074c4; }
-.cm-s-yeti span.cm-variable { color: #55b5db; }
-.cm-s-yeti span.cm-variable-2 { color: #a074c4; }
-.cm-s-yeti span.cm-def { color: #55b5db; }
-.cm-s-yeti span.cm-operator { color: #9fb96e; }
-.cm-s-yeti span.cm-keyword { color: #9fb96e; }
-.cm-s-yeti span.cm-atom { color: #a074c4; }
-.cm-s-yeti span.cm-meta { color: #96c0d8; }
-.cm-s-yeti span.cm-tag { color: #96c0d8; }
-.cm-s-yeti span.cm-attribute { color: #9fb96e; }
-.cm-s-yeti span.cm-qualifier { color: #96c0d8; }
-.cm-s-yeti span.cm-property { color: #a074c4; }
-.cm-s-yeti span.cm-builtin { color: #a074c4; }
-.cm-s-yeti span.cm-variable-3 { color: #96c0d8; }
-.cm-s-yeti .CodeMirror-activeline-background { background: #E7E4E0; }
-.cm-s-yeti .CodeMirror-matchingbracket { text-decoration: underline; }
diff --git a/WebContent/addon/codemirror/theme/zenburn.css b/WebContent/addon/codemirror/theme/zenburn.css
deleted file mode 100644
index 781c40a..0000000
--- a/WebContent/addon/codemirror/theme/zenburn.css
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * "
- * Using Zenburn color palette from the Emacs Zenburn Theme
- * https://github.com/bbatsov/zenburn-emacs/blob/master/zenburn-theme.el
- *
- * Also using parts of https://github.com/xavi/coderay-lighttable-theme
- * "
- * From: https://github.com/wisenomad/zenburn-lighttable-theme/blob/master/zenburn.css
- */
-
-.cm-s-zenburn .CodeMirror-gutters { background: #3f3f3f !important; }
-.cm-s-zenburn .CodeMirror-foldgutter-open, .CodeMirror-foldgutter-folded { color: #999; }
-.cm-s-zenburn .CodeMirror-cursor { border-left: 1px solid white; }
-.cm-s-zenburn { background-color: #3f3f3f; color: #dcdccc; }
-.cm-s-zenburn span.cm-builtin { color: #dcdccc; font-weight: bold; }
-.cm-s-zenburn span.cm-comment { color: #7f9f7f; }
-.cm-s-zenburn span.cm-keyword { color: #f0dfaf; font-weight: bold; }
-.cm-s-zenburn span.cm-atom { color: #bfebbf; }
-.cm-s-zenburn span.cm-def { color: #dcdccc; }
-.cm-s-zenburn span.cm-variable { color: #dfaf8f; }
-.cm-s-zenburn span.cm-variable-2 { color: #dcdccc; }
-.cm-s-zenburn span.cm-string { color: #cc9393; }
-.cm-s-zenburn span.cm-string-2 { color: #cc9393; }
-.cm-s-zenburn span.cm-number { color: #dcdccc; }
-.cm-s-zenburn span.cm-tag { color: #93e0e3; }
-.cm-s-zenburn span.cm-property { color: #dfaf8f; }
-.cm-s-zenburn span.cm-attribute { color: #dfaf8f; }
-.cm-s-zenburn span.cm-qualifier { color: #7cb8bb; }
-.cm-s-zenburn span.cm-meta { color: #f0dfaf; }
-.cm-s-zenburn span.cm-header { color: #f0efd0; }
-.cm-s-zenburn span.cm-operator { color: #f0efd0; }
-.cm-s-zenburn span.CodeMirror-matchingbracket { box-sizing: border-box; background: transparent; border-bottom: 1px solid; }
-.cm-s-zenburn span.CodeMirror-nonmatchingbracket { border-bottom: 1px solid; background: none; }
-.cm-s-zenburn .CodeMirror-activeline { background: #000000; }
-.cm-s-zenburn .CodeMirror-activeline-background { background: #000000; }
-.cm-s-zenburn div.CodeMirror-selected { background: #545454; }
-.cm-s-zenburn .CodeMirror-focused div.CodeMirror-selected { background: #4f4f4f; }
diff --git a/WebContent/addon/jquery-1.12.1.min.js b/WebContent/addon/jquery-1.12.1.min.js
deleted file mode 100644
index a5195a3..0000000
--- a/WebContent/addon/jquery-1.12.1.min.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*! jQuery v1.12.1 | (c) jQuery Foundation | jquery.org/license */
-!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=a.document,e=c.slice,f=c.concat,g=c.push,h=c.indexOf,i={},j=i.toString,k=i.hasOwnProperty,l={},m="1.12.1",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return e.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:e.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a){return n.each(this,a)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(e.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:g,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(n.isPlainObject(c)||(b=n.isArray(c)))?(b?(b=!1,f=a&&n.isArray(a)?a:[]):f=a&&n.isPlainObject(a)?a:{},g[d]=n.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray||function(a){return"array"===n.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){var b=a&&a.toString();return!n.isArray(a)&&b-parseFloat(b)+1>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;try{if(a.constructor&&!k.call(a,"constructor")&&!k.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(!l.ownFirst)for(b in a)return k.call(a,b);for(b in a);return void 0===b||k.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?i[j.call(a)]||"object":typeof a},globalEval:function(b){b&&n.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b){var c,d=0;if(s(a)){for(c=a.length;c>d;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):g.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(h)return h.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,g=0,h=[];if(s(a))for(d=a.length;d>g;g++)e=b(a[g],g,c),null!=e&&h.push(e);else for(g in a)e=b(a[g],g,c),null!=e&&h.push(e);return f.apply([],h)},guid:1,proxy:function(a,b){var c,d,f;return"string"==typeof b&&(f=a[b],b=a,a=f),n.isFunction(a)?(c=e.call(arguments,2),d=function(){return a.apply(b||this,c.concat(e.call(arguments)))},d.guid=a.guid=a.guid||n.guid++,d):void 0},now:function(){return+new Date},support:l}),"function"==typeof Symbol&&(n.fn[Symbol.iterator]=c[Symbol.iterator]),n.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){i["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=!!a&&"length"in a&&a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ga(),z=ga(),A=ga(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+M+"))|)"+L+"*\\]",O=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+N+")*)|.*)\\)|)",P=new RegExp(L+"+","g"),Q=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),R=new RegExp("^"+L+"*,"+L+"*"),S=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),T=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),U=new RegExp(O),V=new RegExp("^"+M+"$"),W={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M+"|[*])"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},X=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Z=/^[^{]+\{\s*\[native \w/,$=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,_=/[+~]/,aa=/'|\\/g,ba=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),ca=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},da=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(ea){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fa(a,b,d,e){var f,h,j,k,l,o,r,s,w=b&&b.ownerDocument,x=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==x&&9!==x&&11!==x)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==x&&(o=$.exec(a)))if(f=o[1]){if(9===x){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(w&&(j=w.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(o[2])return H.apply(d,b.getElementsByTagName(a)),d;if((f=o[3])&&c.getElementsByClassName&&b.getElementsByClassName)return H.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==x)w=b,s=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(aa,"\\$&"):b.setAttribute("id",k=u),r=g(a),h=r.length,l=V.test(k)?"#"+k:"[id='"+k+"']";while(h--)r[h]=l+" "+qa(r[h]);s=r.join(","),w=_.test(a)&&oa(b.parentNode)||b}if(s)try{return H.apply(d,w.querySelectorAll(s)),d}catch(y){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(Q,"$1"),b,d,e)}function ga(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ha(a){return a[u]=!0,a}function ia(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ja(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function ka(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function la(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function na(a){return ha(function(b){return b=+b,ha(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function oa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=fa.support={},f=fa.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fa.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ia(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ia(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Z.test(n.getElementsByClassName),c.getById=ia(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return"undefined"!=typeof b.getElementsByClassName&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=Z.test(n.querySelectorAll))&&(ia(function(a){o.appendChild(a).innerHTML="b;b++)d+=a[b].value;return d}function ra(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j,k=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(j=b[u]||(b[u]={}),i=j[b.uniqueID]||(j[b.uniqueID]={}),(h=i[d])&&h[0]===w&&h[1]===f)return k[2]=h[2];if(i[d]=k,k[2]=a(b,c,g))return!0}}}function sa(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ta(a,b,c){for(var d=0,e=b.length;e>d;d++)fa(a,b[d],c);return c}function ua(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function va(a,b,c,d,e,f){return d&&!d[u]&&(d=va(d)),e&&!e[u]&&(e=va(e,f)),ha(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ta(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ua(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ua(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ua(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function wa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ra(function(a){return a===b},h,!0),l=ra(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[ra(sa(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return va(i>1&&sa(m),i>1&&qa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(Q,"$1"),c,e>i&&wa(a.slice(i,e)),f>e&&wa(a=a.slice(e)),f>e&&qa(a))}m.push(c)}return sa(m)}function xa(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=F.call(i));u=ua(u)}H.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&fa.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ha(f):f}return h=fa.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xa(e,d)),f.selector=a}return f},i=fa.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ba,ca),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=W.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ba,ca),_.test(j[0].type)&&oa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qa(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,!b||_.test(a)&&oa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ia(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ia(function(a){return a.innerHTML="-1)f.splice(c,1),h>=c&&h--}),this},has:function(a){return a?n.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=!0,c||j.disable(),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().progress(c.notify).done(c.resolve).fail(c.reject):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=e.call(arguments),d=c.length,f=1!==d||a&&n.isFunction(a.promise)?d:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?e.call(arguments):d,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(d>1)for(i=new Array(d),j=new Array(d),k=new Array(d);d>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().progress(h(b,j,i)).done(h(b,k,c)).fail(g.reject):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(d,[n]),n.fn.triggerHandler&&(n(d).triggerHandler("ready"),n(d).off("ready"))))}});function J(){d.addEventListener?(d.removeEventListener("DOMContentLoaded",K),a.removeEventListener("load",K)):(d.detachEvent("onreadystatechange",K),a.detachEvent("onload",K))}function K(){(d.addEventListener||"load"===a.event.type||"complete"===d.readyState)&&(J(),n.ready())}n.ready.promise=function(b){if(!I)if(I=n.Deferred(),"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll)a.setTimeout(n.ready);else if(d.addEventListener)d.addEventListener("DOMContentLoaded",K),a.addEventListener("load",K);else{d.attachEvent("onreadystatechange",K),a.attachEvent("onload",K);var c=!1;try{c=null==a.frameElement&&d.documentElement}catch(e){}c&&c.doScroll&&!function f(){if(!n.isReady){try{c.doScroll("left")}catch(b){return a.setTimeout(f,50)}J(),n.ready()}}()}return I.promise(b)},n.ready.promise();var L;for(L in n(l))break;l.ownFirst="0"===L,l.inlineBlockNeedsLayout=!1,n(function(){var a,b,c,e;c=d.getElementsByTagName("body")[0],c&&c.style&&(b=d.createElement("div"),e=d.createElement("div"),e.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(e).appendChild(b),"undefined"!=typeof b.style.zoom&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",l.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(e))}),function(){var a=d.createElement("div");l.deleteExpando=!0;try{delete a.test}catch(b){l.deleteExpando=!1}a=null}();var M=function(a){var b=n.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b},N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(O,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}n.data(a,b,c)}else c=void 0;
-}return c}function Q(a){var b;for(b in a)if(("data"!==b||!n.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function R(a,b,d,e){if(M(a)){var f,g,h=n.expando,i=a.nodeType,j=i?n.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||n.guid++:h),j[k]||(j[k]=i?{}:{toJSON:n.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=n.extend(j[k],b):j[k].data=n.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[n.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[n.camelCase(b)])):f=g,f}}function S(a,b,c){if(M(a)){var d,e,f=a.nodeType,g=f?n.cache:a,h=f?a[n.expando]:n.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){n.isArray(b)?b=b.concat(n.map(b,n.camelCase)):b in d?b=[b]:(b=n.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!Q(d):!n.isEmptyObject(d))return}(c||(delete g[h].data,Q(g[h])))&&(f?n.cleanData([a],!0):l.deleteExpando||g!=g.window?delete g[h]:g[h]=void 0)}}}n.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?n.cache[a[n.expando]]:a[n.expando],!!a&&!Q(a)},data:function(a,b,c){return R(a,b,c)},removeData:function(a,b){return S(a,b)},_data:function(a,b,c){return R(a,b,c,!0)},_removeData:function(a,b){return S(a,b,!0)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=n.data(f),1===f.nodeType&&!n._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));n._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){n.data(this,a)}):arguments.length>1?this.each(function(){n.data(this,a,b)}):f?P(f,a,n.data(f,a)):void 0},removeData:function(a){return this.each(function(){n.removeData(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=n._data(a,b),c&&(!d||n.isArray(c)?d=n._data(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return n._data(a,c)||n._data(a,c,{empty:n.Callbacks("once memory").add(function(){n._removeData(a,b+"queue"),n._removeData(a,c)})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthh;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},Z=/^(?:checkbox|radio)$/i,$=/<([\w:-]+)/,_=/^$|\/(?:java|ecma)script/i,aa=/^\s+/,ba="abbr|article|aside|audio|bdi|canvas|data|datalist|details|dialog|figcaption|figure|footer|header|hgroup|main|mark|meter|nav|output|picture|progress|section|summary|template|time|video";function ca(a){var b=ba.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}!function(){var a=d.createElement("div"),b=d.createDocumentFragment(),c=d.createElement("input");a.innerHTML=" a "," "],legend:[1,""," "],area:[1,""," "],param:[1,""," "],thead:[1,""],tr:[2,""],col:[2,""],td:[3,""],_default:l.htmlSerialize?[0,"",""]:[1,"X","
"]};da.optgroup=da.option,da.tbody=da.tfoot=da.colgroup=da.caption=da.thead,da.th=da.td;function ea(a,b){var c,d,e=0,f="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||n.nodeName(d,b)?f.push(d):n.merge(f,ea(d,b));return void 0===b||b&&n.nodeName(a,b)?n.merge([a],f):f}function fa(a,b){for(var c,d=0;null!=(c=a[d]);d++)n._data(c,"globalEval",!b||n._data(b[d],"globalEval"))}var ga=/<|&#?\w+;/,ha=/r;r++)if(g=a[r],g||0===g)if("object"===n.type(g))n.merge(q,g.nodeType?[g]:g);else if(ga.test(g)){i=i||p.appendChild(b.createElement("div")),j=($.exec(g)||["",""])[1].toLowerCase(),m=da[j]||da._default,i.innerHTML=m[1]+n.htmlPrefilter(g)+m[2],f=m[0];while(f--)i=i.lastChild;if(!l.leadingWhitespace&&aa.test(g)&&q.push(b.createTextNode(aa.exec(g)[0])),!l.tbody){g="table"!==j||ha.test(g)?""!==m[1]||ha.test(g)?0:i:i.firstChild,f=g&&g.childNodes.length;while(f--)n.nodeName(k=g.childNodes[f],"tbody")&&!k.childNodes.length&&g.removeChild(k)}n.merge(q,i.childNodes),i.textContent="";while(i.firstChild)i.removeChild(i.firstChild);i=p.lastChild}else q.push(b.createTextNode(g));i&&p.removeChild(i),l.appendChecked||n.grep(ea(q,"input"),ia),r=0;while(g=q[r++])if(d&&n.inArray(g,d)>-1)e&&e.push(g);else if(h=n.contains(g.ownerDocument,g),i=ea(p.appendChild(g),"script"),h&&fa(i),c){f=0;while(g=i[f++])_.test(g.type||"")&&c.push(g)}return i=null,p}!function(){var b,c,e=d.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(l[b]=c in a)||(e.setAttribute(c,"t"),l[b]=e.attributes[c].expando===!1);e=null}();var ka=/^(?:input|select|textarea)$/i,la=/^key/,ma=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,na=/^(?:focusinfocus|focusoutblur)$/,oa=/^([^.]*)(?:\.(.+)|)/;function pa(){return!0}function qa(){return!1}function ra(){try{return d.activeElement}catch(a){}}function sa(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)sa(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=qa;else if(!e)return a;return 1===f&&(g=e,e=function(a){return n().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=n.guid++)),a.each(function(){n.event.add(this,b,e,d,c)})}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=n.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return"undefined"==typeof n||a&&n.event.triggered===a.type?void 0:n.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(G)||[""],h=b.length;while(h--)f=oa.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=n.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=n.event.special[o]||{},l=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},i),(m=g[o])||(m=g[o]=[],m.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,l):m.push(l),n.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n.hasData(a)&&n._data(a);if(r&&(k=r.events)){b=(b||"").match(G)||[""],j=b.length;while(j--)if(h=oa.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=m.length;while(f--)g=m[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(m.splice(f,1),g.selector&&m.delegateCount--,l.remove&&l.remove.call(a,g));i&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(k)&&(delete r.handle,n._removeData(a,"events"))}},trigger:function(b,c,e,f){var g,h,i,j,l,m,o,p=[e||d],q=k.call(b,"type")?b.type:b,r=k.call(b,"namespace")?b.namespace.split("."):[];if(i=m=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!na.test(q+n.event.triggered)&&(q.indexOf(".")>-1&&(r=q.split("."),q=r.shift(),r.sort()),h=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=r.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:n.makeArray(c,[b]),l=n.event.special[q]||{},f||!l.trigger||l.trigger.apply(e,c)!==!1)){if(!f&&!l.noBubble&&!n.isWindow(e)){for(j=l.delegateType||q,na.test(j+q)||(i=i.parentNode);i;i=i.parentNode)p.push(i),m=i;m===(e.ownerDocument||d)&&p.push(m.defaultView||m.parentWindow||a)}o=0;while((i=p[o++])&&!b.isPropagationStopped())b.type=o>1?j:l.bindType||q,g=(n._data(i,"events")||{})[b.type]&&n._data(i,"handle"),g&&g.apply(i,c),g=h&&i[h],g&&g.apply&&M(i)&&(b.result=g.apply(i,c),b.result===!1&&b.preventDefault());if(b.type=q,!f&&!b.isDefaultPrevented()&&(!l._default||l._default.apply(p.pop(),c)===!1)&&M(e)&&h&&e[q]&&!n.isWindow(e)){m=e[h],m&&(e[h]=null),n.event.triggered=q;try{e[q]()}catch(s){}n.event.triggered=void 0,m&&(e[h]=m)}return b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,d,f,g,h=[],i=e.call(arguments),j=(n._data(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())(!a.rnamespace||a.rnamespace.test(g.namespace))&&(a.handleObj=g,a.data=g.data,d=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==d&&(a.result=d)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&("click"!==a.type||isNaN(a.button)||a.button<1))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>-1:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h\s*$/g,Aa=ca(d),Ba=Aa.appendChild(d.createElement("div"));function Ca(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function Da(a){return a.type=(null!==n.find.attr(a,"type"))+"/"+a.type,a}function Ea(a){var b=ya.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Fa(a,b){if(1===b.nodeType&&n.hasData(a)){var c,d,e,f=n._data(a),g=n._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)n.event.add(b,c,h[c][d])}g.data&&(g.data=n.extend({},g.data))}}function Ga(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!l.noCloneEvent&&b[n.expando]){e=n._data(b);for(d in e.events)n.removeEvent(b,d,e.handle);b.removeAttribute(n.expando)}"script"===c&&b.text!==a.text?(Da(b).text=a.text,Ea(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),l.html5Clone&&a.innerHTML&&!n.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&Z.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}function Ha(a,b,c,d){b=f.apply([],b);var e,g,h,i,j,k,m=0,o=a.length,p=o-1,q=b[0],r=n.isFunction(q);if(r||o>1&&"string"==typeof q&&!l.checkClone&&xa.test(q))return a.each(function(e){var f=a.eq(e);r&&(b[0]=q.call(this,e,f.html())),Ha(f,b,c,d)});if(o&&(k=ja(b,a[0].ownerDocument,!1,a,d),e=k.firstChild,1===k.childNodes.length&&(k=e),e||d)){for(i=n.map(ea(k,"script"),Da),h=i.length;o>m;m++)g=k,m!==p&&(g=n.clone(g,!0,!0),h&&n.merge(i,ea(g,"script"))),c.call(a[m],g,m);if(h)for(j=i[i.length-1].ownerDocument,n.map(i,Ea),m=0;h>m;m++)g=i[m],_.test(g.type||"")&&!n._data(g,"globalEval")&&n.contains(j,g)&&(g.src?n._evalUrl&&n._evalUrl(g.src):n.globalEval((g.text||g.textContent||g.innerHTML||"").replace(za,"")));k=e=null}return a}function Ia(a,b,c){for(var d,e=b?n.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||n.cleanData(ea(d)),d.parentNode&&(c&&n.contains(d.ownerDocument,d)&&fa(ea(d,"script")),d.parentNode.removeChild(d));return a}n.extend({htmlPrefilter:function(a){return a.replace(va,"<$1>")},clone:function(a,b,c){var d,e,f,g,h,i=n.contains(a.ownerDocument,a);if(l.html5Clone||n.isXMLDoc(a)||!ua.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(Ba.innerHTML=a.outerHTML,Ba.removeChild(f=Ba.firstChild)),!(l.noCloneEvent&&l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(d=ea(f),h=ea(a),g=0;null!=(e=h[g]);++g)d[g]&&Ga(e,d[g]);if(b)if(c)for(h=h||ea(a),d=d||ea(f),g=0;null!=(e=h[g]);g++)Fa(e,d[g]);else Fa(a,f);return d=ea(f,"script"),d.length>0&&fa(d,!i&&ea(a,"script")),d=h=e=null,f},cleanData:function(a,b){for(var d,e,f,g,h=0,i=n.expando,j=n.cache,k=l.attributes,m=n.event.special;null!=(d=a[h]);h++)if((b||M(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)m[e]?n.event.remove(d,e):n.removeEvent(d,e,g.handle);j[f]&&(delete j[f],k||"undefined"==typeof d.removeAttribute?d[i]=void 0:d.removeAttribute(i),c.push(f))}}}),n.fn.extend({domManip:Ha,detach:function(a){return Ia(this,a,!0)},remove:function(a){return Ia(this,a)},text:function(a){return Y(this,function(a){return void 0===a?n.text(this):this.empty().append((this[0]&&this[0].ownerDocument||d).createTextNode(a))},null,a,arguments.length)},append:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.appendChild(a)}})},prepend:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&n.cleanData(ea(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&n.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return Y(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(ta,""):void 0;if("string"==typeof a&&!wa.test(a)&&(l.htmlSerialize||!ua.test(a))&&(l.leadingWhitespace||!aa.test(a))&&!da[($.exec(a)||["",""])[1].toLowerCase()]){a=n.htmlPrefilter(a);try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ea(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return Ha(this,arguments,function(b){var c=this.parentNode;n.inArray(this,a)<0&&(n.cleanData(ea(this)),c&&c.replaceChild(b,this))},a)}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=0,e=[],f=n(a),h=f.length-1;h>=d;d++)c=d===h?this:this.clone(!0),n(f[d])[b](c),g.apply(e,c.get());return this.pushStack(e)}});var Ja,Ka={HTML:"block",BODY:"block"};function La(a,b){var c=n(b.createElement(a)).appendTo(b.body),d=n.css(c[0],"display");return c.detach(),d}function Ma(a){var b=d,c=Ka[a];return c||(c=La(a,b),"none"!==c&&c||(Ja=(Ja||n("")).appendTo(b.documentElement),b=(Ja[0].contentWindow||Ja[0].contentDocument).document,b.write(),b.close(),c=La(a,b),Ja.detach()),Ka[a]=c),c}var Na=/^margin/,Oa=new RegExp("^("+T+")(?!px)[a-z%]+$","i"),Pa=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e},Qa=d.documentElement;!function(){var b,c,e,f,g,h,i=d.createElement("div"),j=d.createElement("div");if(j.style){j.style.cssText="float:left;opacity:.5",l.opacity="0.5"===j.style.opacity,l.cssFloat=!!j.style.cssFloat,j.style.backgroundClip="content-box",j.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===j.style.backgroundClip,i=d.createElement("div"),i.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",j.innerHTML="",i.appendChild(j),l.boxSizing=""===j.style.boxSizing||""===j.style.MozBoxSizing||""===j.style.WebkitBoxSizing,n.extend(l,{reliableHiddenOffsets:function(){return null==b&&k(),f},boxSizingReliable:function(){return null==b&&k(),e},pixelMarginRight:function(){return null==b&&k(),c},pixelPosition:function(){return null==b&&k(),b},reliableMarginRight:function(){return null==b&&k(),g},reliableMarginLeft:function(){return null==b&&k(),h}});function k(){var k,l,m=d.documentElement;m.appendChild(i),j.style.cssText="-webkit-box-sizing:border-box;box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",b=e=h=!1,c=g=!0,a.getComputedStyle&&(l=a.getComputedStyle(j),b="1%"!==(l||{}).top,h="2px"===(l||{}).marginLeft,e="4px"===(l||{width:"4px"}).width,j.style.marginRight="50%",c="4px"===(l||{marginRight:"4px"}).marginRight,k=j.appendChild(d.createElement("div")),k.style.cssText=j.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",k.style.marginRight=k.style.width="0",j.style.width="1px",g=!parseFloat((a.getComputedStyle(k)||{}).marginRight),j.removeChild(k)),j.style.display="none",f=0===j.getClientRects().length,f&&(j.style.display="",j.innerHTML="",k=j.getElementsByTagName("td"),k[0].style.cssText="margin:0;border:0;padding:0;display:none",f=0===k[0].offsetHeight,f&&(k[0].style.display="",k[1].style.display="none",f=0===k[0].offsetHeight)),m.removeChild(i)}}}();var Ra,Sa,Ta=/^(top|right|bottom|left)$/;a.getComputedStyle?(Ra=function(b){var c=b.ownerDocument.defaultView;return c&&c.opener||(c=a),c.getComputedStyle(b)},Sa=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ra(a),g=c?c.getPropertyValue(b)||c[b]:void 0,""!==g&&void 0!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),c&&!l.pixelMarginRight()&&Oa.test(g)&&Na.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f),void 0===g?g:g+""}):Qa.currentStyle&&(Ra=function(a){return a.currentStyle},Sa=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ra(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Oa.test(g)&&!Ta.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function Ua(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}var Va=/alpha\([^)]*\)/i,Wa=/opacity\s*=\s*([^)]*)/i,Xa=/^(none|table(?!-c[ea]).+)/,Ya=new RegExp("^("+T+")(.*)$","i"),Za={position:"absolute",visibility:"hidden",display:"block"},$a={letterSpacing:"0",fontWeight:"400"},_a=["Webkit","O","Moz","ms"],ab=d.createElement("div").style;function bb(a){if(a in ab)return a;var b=a.charAt(0).toUpperCase()+a.slice(1),c=_a.length;while(c--)if(a=_a[c]+b,a in ab)return a}function cb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=n._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&W(d)&&(f[g]=n._data(d,"olddisplay",Ma(d.nodeName)))):(e=W(d),(c&&"none"!==c||!e)&&n._data(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function db(a,b,c){var d=Ya.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function eb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+V[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+V[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+V[f]+"Width",!0,e))):(g+=n.css(a,"padding"+V[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+V[f]+"Width",!0,e)));return g}function fb(b,c,e){var f=!0,g="width"===c?b.offsetWidth:b.offsetHeight,h=Ra(b),i=l.boxSizing&&"border-box"===n.css(b,"boxSizing",!1,h);if(d.msFullscreenElement&&a.top!==a&&b.getClientRects().length&&(g=Math.round(100*b.getBoundingClientRect()[c])),0>=g||null==g){if(g=Sa(b,c,h),(0>g||null==g)&&(g=b.style[c]),Oa.test(g))return g;f=i&&(l.boxSizingReliable()||g===b.style[c]),g=parseFloat(g)||0}return g+eb(b,c,e||(i?"border":"content"),f,h)+"px"}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Sa(a,"opacity");return""===c?"1":c}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":l.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;if(b=n.cssProps[h]||(n.cssProps[h]=bb(h)||h),g=n.cssHooks[b]||n.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=U.exec(c))&&e[1]&&(c=X(a,b,e),f="number"),null!=c&&c===c&&("number"===f&&(c+=e&&e[3]||(n.cssNumber[h]?"":"px")),l.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=bb(h)||h),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Sa(a,b,d)),"normal"===f&&b in $a&&(f=$a[b]),""===c||c?(e=parseFloat(f),c===!0||isFinite(e)?e||0:f):f}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?Xa.test(n.css(a,"display"))&&0===a.offsetWidth?Pa(a,Za,function(){return fb(a,b,d)}):fb(a,b,d):void 0},set:function(a,c,d){var e=d&&Ra(a);return db(a,c,d?eb(a,b,d,l.boxSizing&&"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),l.opacity||(n.cssHooks.opacity={get:function(a,b){return Wa.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=n.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===n.trim(f.replace(Va,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=Va.test(f)?f.replace(Va,e):f+" "+e)}}),n.cssHooks.marginRight=Ua(l.reliableMarginRight,function(a,b){return b?Pa(a,{display:"inline-block"},Sa,[a,"marginRight"]):void 0}),n.cssHooks.marginLeft=Ua(l.reliableMarginLeft,function(a,b){
-return b?(parseFloat(Sa(a,"marginLeft"))||(n.contains(a.ownerDocument,a)?a.getBoundingClientRect().left-Pa(a,{marginLeft:0},function(){return a.getBoundingClientRect().left}):0))+"px":void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+V[d]+b]=f[d]||f[d-2]||f[0];return e}},Na.test(a)||(n.cssHooks[a+b].set=db)}),n.fn.extend({css:function(a,b){return Y(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=Ra(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)},a,b,arguments.length>1)},show:function(){return cb(this,!0)},hide:function(){return cb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){W(this)?n(this).show():n(this).hide()})}});function gb(a,b,c,d,e){return new gb.prototype.init(a,b,c,d,e)}n.Tween=gb,gb.prototype={constructor:gb,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||n.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=gb.propHooks[this.prop];return a&&a.get?a.get(this):gb.propHooks._default.get(this)},run:function(a){var b,c=gb.propHooks[this.prop];return this.options.duration?this.pos=b=n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):gb.propHooks._default.set(this),this}},gb.prototype.init.prototype=gb.prototype,gb.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[n.cssProps[a.prop]]&&!n.cssHooks[a.prop]?a.elem[a.prop]=a.now:n.style(a.elem,a.prop,a.now+a.unit)}}},gb.propHooks.scrollTop=gb.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2},_default:"swing"},n.fx=gb.prototype.init,n.fx.step={};var hb,ib,jb=/^(?:toggle|show|hide)$/,kb=/queueHooks$/;function lb(){return a.setTimeout(function(){hb=void 0}),hb=n.now()}function mb(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=V[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function nb(a,b,c){for(var d,e=(qb.tweeners[b]||[]).concat(qb.tweeners["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function ob(a,b,c){var d,e,f,g,h,i,j,k,m=this,o={},p=a.style,q=a.nodeType&&W(a),r=n._data(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,m.always(function(){m.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=n.css(a,"display"),k="none"===j?n._data(a,"olddisplay")||Ma(a.nodeName):j,"inline"===k&&"none"===n.css(a,"float")&&(l.inlineBlockNeedsLayout&&"inline"!==Ma(a.nodeName)?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",l.shrinkWrapBlocks()||m.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],jb.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||n.style(a,d)}else j=void 0;if(n.isEmptyObject(o))"inline"===("none"===j?Ma(a.nodeName):j)&&(p.display=j);else{r?"hidden"in r&&(q=r.hidden):r=n._data(a,"fxshow",{}),f&&(r.hidden=!q),q?n(a).show():m.done(function(){n(a).hide()}),m.done(function(){var b;n._removeData(a,"fxshow");for(b in o)n.style(a,b,o[b])});for(d in o)g=nb(q?r[d]:0,d,m),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function pb(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function qb(a,b,c){var d,e,f=0,g=qb.prefilters.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=hb||lb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{},easing:n.easing._default},c),originalProperties:b,originalOptions:c,startTime:hb||lb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?(h.notifyWith(a,[j,1,0]),h.resolveWith(a,[j,b])):h.rejectWith(a,[j,b]),this}}),k=j.props;for(pb(k,j.opts.specialEasing);g>f;f++)if(d=qb.prefilters[f].call(j,a,k,j.opts))return n.isFunction(d.stop)&&(n._queueHooks(j.elem,j.opts.queue).stop=n.proxy(d.stop,d)),d;return n.map(k,nb,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(qb,{tweeners:{"*":[function(a,b){var c=this.createTween(a,b);return X(c.elem,a,U.exec(b),c),c}]},tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.match(G);for(var c,d=0,e=a.length;e>d;d++)c=a[d],qb.tweeners[c]=qb.tweeners[c]||[],qb.tweeners[c].unshift(b)},prefilters:[ob],prefilter:function(a,b){b?qb.prefilters.unshift(a):qb.prefilters.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(W).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=qb(this,n.extend({},a),f);(e||n._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=n._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&kb.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=n._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(mb(b,!0),a,d,e)}}),n.each({slideDown:mb("show"),slideUp:mb("hide"),slideToggle:mb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=n.timers,c=0;for(hb=n.now();ca ").append(n.parseHTML(a)).find(d):a)}).always(c&&function(a,b){g.each(function(){c.apply(g,f||[a.responseText,b,a])})}),this},n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};function lc(a){return n.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&n.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,n.extend({},h))),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,n.contains(b,e)?("undefined"!=typeof e.getBoundingClientRect&&(d=e.getBoundingClientRect()),c=lc(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===n.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(c=a.offset()),c.top+=n.css(a[0],"borderTopWidth",!0),c.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-n.css(d,"marginTop",!0),left:b.left-c.left-n.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Qa})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);n.fn[a]=function(d){return Y(this,function(a,d,e){var f=lc(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?n(f).scrollLeft():e,c?e:n(f).scrollTop()):a[d]=e);
-},a,d,arguments.length,null)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=Ua(l.pixelPosition,function(a,c){return c?(c=Sa(a,b),Oa.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return Y(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.extend({bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var mc=a.jQuery,nc=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=nc),b&&a.jQuery===n&&(a.jQuery=mc),n},b||(a.jQuery=a.$=n),n});
diff --git a/WebContent/agent/host/adapter_socket2_agent1.jsp b/WebContent/agent/host/adapter_socket2_agent1.jsp
new file mode 100644
index 0000000..6eac161
--- /dev/null
+++ b/WebContent/agent/host/adapter_socket2_agent1.jsp
@@ -0,0 +1,114 @@
+
+<%@ page contentType="text/xml; charset=utf-8"%>
+<%@ page import="com.eactive.eai.adapter.socket2.config.MonitoringUtil"%>
+<%@ page import="java.util.*,com.eactive.eai.common.util.Logger" %>
+
+
+
+
+<%!
+ static Logger logger = Logger.getLogger(Logger.LOGGER_DEFAULT);
+%>
+
+<%
+ //
+ // Socket2 status info
+
+
+ String eaiSvrInstNm = request.getParameter("eaiSvrInstNm");
+ String adapterGroupName = request.getParameter("adapterGroupName");
+
+ if (eaiSvrInstNm == null)
+ eaiSvrInstNm = "";
+
+ if (adapterGroupName == null)
+ adapterGroupName = "";
+
+ String stateColor = "";
+ String stateText = "";
+
+ String startColor = "";
+ String startText = "";
+ String startStop = "";
+
+
+ String[][] arrList = null ;
+ try {
+ if(adapterGroupName.length() > 0) {
+ arrList = MonitoringUtil.adapterStatus(adapterGroupName);
+ }
+ else {
+ arrList = MonitoringUtil.adapterList1();
+ }
+ } catch ( Exception e ) {
+ if (logger.isError()){
+ logger.error(e.toString());
+ }
+ }
+
+ // ϵ arrList null ƴϸ鼭 迭̰ 0 Exception
+ // ʵ ϱ . (2008-06-30)
+ if( arrList == null || arrList.length == 0 ) {
+%>
+
+ <%=eaiSvrInstNm%>
+
+<%
+
+ } else {
+ int col = arrList[0].length ;
+ int row = arrList.length ;
+
+ for( int i = 0 ; i < row ; i++ ) {
+ out.println("");
+ out.println("" + eaiSvrInstNm + " ");
+ for( int j = 0 ; j < col ; j++ ) {
+ if(j == 2) {
+ out.println("" + arrList[i][j] + " ");
+ }
+ }
+
+ //
+ if(arrList[i] != null && arrList[i].length > 4 ) {
+ if( "STARTED".equals(arrList[i][7]) || "STARTING".equals(arrList[i][7])) {
+ startStop = "03" ; // stop
+ } else {
+ startStop = "01" ; // start
+ }
+ }
+
+ out.println(""+ startStop +" ");
+ out.println("
");
+ }
+ }
+%>
+
+
diff --git a/WebContent/agent/host/adapter_socket2_agent2.jsp b/WebContent/agent/host/adapter_socket2_agent2.jsp
new file mode 100644
index 0000000..6daf110
--- /dev/null
+++ b/WebContent/agent/host/adapter_socket2_agent2.jsp
@@ -0,0 +1,81 @@
+
+<%@ page contentType="text/xml; charset=utf-8"%>
+<%@ page import="com.eactive.eai.adapter.socket2.config.MonitoringUtil"%>
+<%@ page import="java.util.*,com.eactive.eai.common.util.Logger" %>
+
+
+
+
+<%!
+ static Logger logger = Logger.getLogger(Logger.LOGGER_DEFAULT);
+%>
+<%
+ //
+ // Socket2 connection info
+
+ String eaiSvrInstNm = request.getParameter("eaiSvrInstNm");
+
+ if (eaiSvrInstNm == null)
+ eaiSvrInstNm = "";
+
+ String stateColor = "";
+ String stateText = "";
+
+ String startColor = "";
+ String startText = "";
+ String startStop = "";
+
+ String[][] arrList = null ;
+ try {
+ arrList = MonitoringUtil.adapterList2();
+ } catch ( Exception e ) {
+ if (logger.isError()){
+ logger.error(e.toString());
+ }
+ }
+
+ // ϵ arrList null ƴϸ鼭 迭̰ 0 Exception
+ // ʵ ϱ . (2008-06-30)
+ if( arrList == null || arrList.length == 0 ) {
+%>
+
+ <%=eaiSvrInstNm%>
+
+<%
+
+ } else {
+ int col = arrList[0].length ;
+ int row = arrList.length ;
+ for( int i = 0 ; i < row ; i++ ) {
+ out.println("");
+ out.println("" + eaiSvrInstNm + " ");
+
+ for( int j = 0 ; j < col ; j++ ) {
+ out.println("" + arrList[i][j] + " ");
+ }
+ out.println("
");
+ }
+ }
+%>
+
+
\ No newline at end of file
diff --git a/WebContent/agent/host/adapter_socket2_startstop.jsp b/WebContent/agent/host/adapter_socket2_startstop.jsp
new file mode 100644
index 0000000..6d7b74e
--- /dev/null
+++ b/WebContent/agent/host/adapter_socket2_startstop.jsp
@@ -0,0 +1,54 @@
+<%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
+<%@ page import="com.eactive.eai.adapter.socket2.config.MonitoringUtil"%>
+<%@ page import="com.eactive.eai.common.util.CharsetDecoderUtil" %>
+<%@ page import="java.util.*,com.eactive.eai.common.util.Logger" %>
+<%!
+ static Logger logger = Logger.getLogger(Logger.LOGGER_DEFAULT);
+%>
+<%
+ //
+ // Socket2 adapter start/stop command
+
+ String adapterGroupName = request.getParameter("adapterGroupName");
+ String adapterName = request.getParameter("adapterName");
+ String cmd = request.getParameter("cmd");
+
+ if( adapterGroupName == null ) {
+ adapterGroupName = "" ;
+ }
+
+ if( adapterName == null ) {
+ adapterName = "" ;
+ }
+
+ if( cmd == null ) {
+ cmd = "" ;
+ }
+
+
+ String retMsg = null ;
+ try {
+ if( cmd.equals("start") ) {
+ MonitoringUtil.adapterStart(adapterGroupName, adapterName);
+ retMsg = "true" ;
+ } else if( cmd.equals("stop") ) {
+ MonitoringUtil.adapterStop(adapterGroupName, adapterName);
+ retMsg = "true" ;
+ } else {
+ retMsg = "Unknown command error :" + cmd ;
+ }
+ } catch ( Exception e ) {
+ if (logger.isError()){
+ logger.error("MonitoringUtil.adapterStart|adapterStop(" + adapterGroupName + ", " + adapterName + ")" );
+ }
+ //e.printStackTrace(new java.io.PrintWriter(out));
+ retMsg = "false" ;
+ }
+
+ if( retMsg == null )
+ retMsg = "" ;
+
+
+
+ out.println( CharsetDecoderUtil.toKor(retMsg) );
+%>
diff --git a/WebContent/error.jsp b/WebContent/error.jsp
index 20cdde1..07a2c53 100644
--- a/WebContent/error.jsp
+++ b/WebContent/error.jsp
@@ -1,5 +1,33 @@
+<%@page import="org.apache.commons.lang3.StringUtils"%>
+<%@page import="com.eactive.eai.common.util.MessageUtil"%>
<%@ page import="java.io.*, java.util.*"%>
<%@ page language="java" contentType="text/html;charset=utf-8" isErrorPage="true"%>
+<%
+Integer statusCode = (Integer) request.getAttribute("_authServerStatusCode");
+if (statusCode != null) {
+ response.setStatus(statusCode);
+}
+
+String code;
+if (statusCode != null && statusCode == 401) {
+ code = MessageUtil.ERROR_CODE_AUTH_FAIL;
+} else if (statusCode != null && statusCode == 404) {
+ code = MessageUtil.ERROR_CODE_SERVICE_NOT_FOUND;
+} else {
+ code = MessageUtil.ERROR_CODE_AP_ERROR;
+}
+
+String message = (String)request.getAttribute("errorMessage");
+
+
+if ( message == null ) {
+ message = "Unknown Error, If the problem persists, please contact the administrator..";
+}
+
+String jsonErrorMessage = MessageUtil.makeJsonErrorMessage(code, message);
+out.println(jsonErrorMessage);
+%>
+<%--
Error
@@ -16,3 +44,4 @@
<% response.setStatus(200); %>
+ --%>
\ No newline at end of file
diff --git a/WebContent/healthCheck.jsp b/WebContent/healthCheck.jsp
new file mode 100644
index 0000000..dbb8dd0
--- /dev/null
+++ b/WebContent/healthCheck.jsp
@@ -0,0 +1,84 @@
+<%@ page language="java" contentType="text/html; charset=EUC-KR"%>
+<%@ page import="java.io.*, java.util.*"%>
+<%!private boolean fileCheck(String path, String fileName) throws Exception {
+
+ String name = System.getProperty("inst.Name");
+
+ File file = new File(path + File.separator + name + File.separator + fileName);
+ if (file.exists()) {
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+ private String replaceServiceType(String data) {
+ String name = System.getProperty("inst.Name");
+
+ String serverType = name.substring(0, 3);
+
+ return data.replaceAll("\\$\\{serverType\\}", serverType);
+ }
+
+ private Properties getLoad(String path) {
+ Properties prop = new Properties();
+ InputStream input = null;
+ try {
+ input = new FileInputStream(path);
+ prop.load(input);
+ return prop;
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ if (input != null) {
+ try {
+ input.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ return prop;
+ }%>
+
+<%
+response.setHeader("Pragma", "No-cache");
+response.setHeader("Cache-Control", "no-cache");
+response.setHeader("Expires", "0");
+
+ClassLoader clsLoader = Thread.currentThread().getContextClassLoader();
+InputStream input = clsLoader.getResourceAsStream("env.common.properties");
+
+Properties props = new Properties();
+props.load(input);
+
+String path = props.getProperty("CHECK_PATH");
+String fileName = props.getProperty("CHECK_FILE");
+
+String path2 = replaceServiceType(path);
+%>
+
+
+
+
+ prop:CHECK_PATH=<%=path%>
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/JMSPurgeMan.jsp b/WebContent/mgr/JMSPurgeMan.jsp
new file mode 100644
index 0000000..e0ccc83
--- /dev/null
+++ b/WebContent/mgr/JMSPurgeMan.jsp
@@ -0,0 +1,407 @@
+<%@ page import="java.util.*"%>
+<%@ page import="com.eactive.eai.common.message.*,java.text.SimpleDateFormat"%>
+<%@ page import="javax.jms.*,com.eactive.eai.flowcontrol.jms.*,javax.naming.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%!
+public final static String JMS_FACTORY = "com.eactive.eai.common.FlowRouterConnectionFactory";
+
+public ArrayList displayQueue(String queueName, String mSelector, int maxCount) throws Exception {
+
+ ArrayList al = new ArrayList();
+
+ InitialContext ctx = ctx = new InitialContext();
+
+ QueueConnectionFactory qconFactory = null;
+ QueueConnection qcon = null;
+ QueueSession qsession = null;
+ QueueBrowser qbrowser = null;
+ javax.jms.Queue queue = null;
+
+ int count = 0;
+ try {
+ java.text.DateFormat DATE_FORMAT = DATE_FORMAT = java.text.DateFormat.getDateTimeInstance(
+ java.text.DateFormat.SHORT, java.text.DateFormat.SHORT);
+ if (DATE_FORMAT instanceof java.text.SimpleDateFormat)
+ ((java.text.SimpleDateFormat) DATE_FORMAT)
+ .applyPattern("yy/MM/dd kk:mm:ss");
+
+ qconFactory = (QueueConnectionFactory) ctx.lookup(JMS_FACTORY);
+ qcon = qconFactory.createQueueConnection();
+
+ qsession = qcon.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
+ queue = (javax.jms.Queue) ctx.lookup(queueName);
+
+ if(mSelector != null && mSelector.length() > 0) {
+ qbrowser = qsession.createBrowser(queue, mSelector);
+ }
+ else {
+ qbrowser = qsession.createBrowser(queue);
+ }
+ qcon.start();
+
+ Enumeration e = qbrowser.getEnumeration();
+ Message m = null;
+
+ if (! e.hasMoreElements()) {
+ System.out.println("There are no messages on this queue. - " + queueName);
+ }
+ else {
+ System.out.println(queueName + " - Queued JMS Messages: "+DATE_FORMAT.format(new java.util.Date(System
+ .currentTimeMillis())));
+
+ while (e.hasMoreElements()) {
+ m = (Message) e.nextElement();
+ count++;
+ System.out.println("get Message " + count );
+
+ /*
+ System.out.println("Message ID " + m.getJMSMessageID() +
+ " delivered " + new Date(m.getJMSTimestamp()) +
+ " to " + m.getJMSDestination());
+ System.out.print("\tExpires ");
+
+ if (m.getJMSExpiration() > 0) {
+ System.out.println( new Date( m.getJMSExpiration()));
+ }
+ else {
+ System.out.println("never");
+ }
+
+ System.out.println("\tPriority " + m.getJMSPriority());
+ System.out.println("\tMode " + (
+ m.getJMSDeliveryMode() == DeliveryMode.PERSISTENT ?
+ "PERSISTENT" : "NON_PERSISTENT"));
+ System.out.println("\tCorrelation ID " + m.getJMSCorrelationID());
+ System.out.println("\tReply to " + m.getJMSReplyTo());
+ System.out.println("\tMessage type " + m.getJMSType());
+ System.out.println("\tMessage BizCode " + m.getStringProperty("BizCode"));
+
+ if (m instanceof TextMessage) {
+ System.out.println("\tTextMessage \"" +
+ ((TextMessage)m).getText() + "\"");
+ }
+ */
+
+ if(count > maxCount) {
+ break;
+ }
+ else {
+ if(m instanceof ObjectMessage) {
+ al.add(m);
+ }
+ }
+ }
+ }
+ }
+ catch( Exception e ) {
+ //e.printStackTrace();
+ }
+ finally {
+ try {
+ if(qbrowser != null) qbrowser.close();
+ if(qsession != null) qsession.close();
+ if(qcon != null) qcon.close();
+ }
+ catch(Exception ex) {}
+ }
+ return al;
+}
+
+public ArrayList purgeQueue(String queueName, String mSelector, int purgeSize, boolean isLogging) throws Exception {
+
+ ArrayList al = new ArrayList();
+
+ InitialContext ctx = new InitialContext();
+
+ QueueConnectionFactory qconFactory = null;
+ QueueConnection qcon = null;
+ QueueSession qsession = null;
+ QueueReceiver qreceiver = null;
+ javax.jms.Queue queue = null;
+
+ long sTime = System.currentTimeMillis();
+
+ long cTime = 0;
+
+ int purgeCount = 0;
+
+ try {
+ java.text.DateFormat DATE_FORMAT = DATE_FORMAT = java.text.DateFormat.getDateTimeInstance(
+ java.text.DateFormat.SHORT, java.text.DateFormat.SHORT);
+ if (DATE_FORMAT instanceof java.text.SimpleDateFormat)
+ ((java.text.SimpleDateFormat) DATE_FORMAT)
+ .applyPattern("yy/MM/dd kk:mm:ss");
+
+ qconFactory = (QueueConnectionFactory) ctx.lookup(JMS_FACTORY);
+ qcon = qconFactory.createQueueConnection();
+
+ qsession = qcon.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
+ queue = (javax.jms.Queue) ctx.lookup(queueName);
+
+ if(mSelector != null && mSelector.length() > 0) {
+ qreceiver = qsession.createReceiver(queue, mSelector);
+ }
+ else {
+ qreceiver = qsession.createReceiver(queue);
+ }
+ qcon.start();
+
+ Message m = null;
+
+ System.out.println(">> "+queueName + " - Queued JMS Messages: "+DATE_FORMAT.format(new java.util.Date(System
+ .currentTimeMillis())));
+ cTime = System.currentTimeMillis() - sTime;
+ sTime = System.currentTimeMillis();
+
+ for(int i=0; i
> No more Message in Queue - " + queueName);
+ System.out.println(">> Stop Purge.");
+ break;
+ }
+
+ purgeCount++;
+
+ System.out.println("\n>> purge "+(i+1));
+
+ if(isLogging) {
+ /*
+ System.out.println("Message ID " + m.getJMSMessageID() +
+ " delivered " + new Date(m.getJMSTimestamp()) +
+ " to " + m.getJMSDestination());
+ System.out.print("\tExpires ");
+
+ if (m.getJMSExpiration() > 0) {
+ System.out.println( new Date( m.getJMSExpiration()));
+ }
+ else {
+ System.out.println("never");
+ }
+
+ System.out.println("\tPriority " + m.getJMSPriority());
+ System.out.println("\tMode " + (
+ m.getJMSDeliveryMode() == DeliveryMode.PERSISTENT ?
+ "PERSISTENT" : "NON_PERSISTENT"));
+ System.out.println("\tCorrelation ID " + m.getJMSCorrelationID());
+ System.out.println("\tReply to " + m.getJMSReplyTo());
+ System.out.println("\tMessage type " + m.getJMSType());
+ System.out.println("\tMessage BizCode " + m.getStringProperty("BizCode"));
+
+ if (m instanceof TextMessage) {
+ System.out.println("\tTextMessage \"" +
+ ((TextMessage)m).getText() + "\"");
+ }
+ */
+ if(m instanceof ObjectMessage) {
+ al.add(m);
+ }
+ }
+ }
+ System.out.println("----------------------------------------------------------------");
+ System.out.println(">> Purge "+purgeCount+" messages completed : connect time("+cTime+") ms, purge time ("
+ + (System.currentTimeMillis() - sTime) +") ms");
+
+ System.out.println("----------------------------------------------------------------");
+
+ return al;
+ }
+
+ catch( Exception e ) {
+ throw e;
+ }
+ finally {
+ try {
+ if(qreceiver != null) qreceiver.close();
+ if(qsession != null) qsession.close();
+ if(qcon != null) qcon.close();
+ }
+ catch(Exception ex) {}
+ }
+}%>
+<%
+ ArrayList al = null;
+ String queueName = request.getParameter("queueName");
+ String maxCount = request.getParameter("maxCount");
+ String fromTime = request.getParameter("fromTime");
+ String toTime = request.getParameter("toTime");
+
+
+ String selector = request.getParameter("selector");
+
+ String actionType = request.getParameter("actionType");
+
+ String[][] monitorDataTotal = null;
+ String[][] monitorData = null;
+
+ String timeSelector = "";
+ String mSelector = "";
+ if( (fromTime != null && fromTime.length() == 14) && (toTime != null && toTime.length() == 14)) {
+ SimpleDateFormat SDF_YYYYMMDDHHMMSS_NO_MARK = new SimpleDateFormat( "yyyyMMddHHmmss");
+ Date fDate= SDF_YYYYMMDDHHMMSS_NO_MARK.parse(fromTime);
+ Date tDate= SDF_YYYYMMDDHHMMSS_NO_MARK.parse(toTime);
+ Calendar calendar = new GregorianCalendar(TimeZone.getTimeZone("GMT+09:00"),Locale.KOREA);
+ calendar.setTime (fDate);
+ Long ftimeMili = calendar.getTimeInMillis();
+
+ calendar.setTime (tDate);
+ Long ttimeMili = calendar.getTimeInMillis();
+
+ timeSelector = "JMSTimestamp BETWEEN " + ftimeMili + " AND " + ttimeMili ;
+
+ if(selector != null && selector.trim().length() > 0) {
+ mSelector = selector + " AND " + timeSelector;
+ }
+ else {
+ mSelector = timeSelector;
+ }
+ }
+
+ FCQueueReceiverManager man = FCQueueReceiverManager.getInstance();
+ System.out.println("actionType = " + actionType);
+ System.out.println("queueName = " + queueName);
+ System.out.println("maxCount = " + maxCount);
+ System.out.println("selector = " + selector);
+ System.out.println("fromTime = " + fromTime);
+ System.out.println("toTime = " + toTime);
+ System.out.println("mSelector = " + mSelector);
+
+ String errorMsg = null;
+
+ try {
+ if("DISPLAY".equals(actionType)) {
+ System.out.println("DISPLAY : queueName = " + queueName);
+ int mCount = Integer.parseInt(maxCount);
+ al = displayQueue(queueName, mSelector, mCount);
+ }
+ else if("PURGE".equals(actionType)) {
+ System.out.println("PURGE : queueName = " + queueName);
+ int mCount = Integer.parseInt(maxCount);
+ al = purgeQueue(queueName, mSelector, mCount, true);
+ }
+ else {
+ System.out.println("Unhandled Action " + actionType);
+ }
+
+
+ } catch(Exception e) {
+ errorMsg = e.getMessage();
+ }
+
+%>
+
+
+
+ FC Queue Purger
+
+
+
+
+
+ FC Queue Receiver Manager
+
+
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/JMSReceiverMan.jsp b/WebContent/mgr/JMSReceiverMan.jsp
new file mode 100644
index 0000000..10b435b
--- /dev/null
+++ b/WebContent/mgr/JMSReceiverMan.jsp
@@ -0,0 +1,245 @@
+<%@ page import="javax.jms.*,com.eactive.eai.flowcontrol.jms.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%
+ String receiverName = request.getParameter("receiverName");
+ String queueName = request.getParameter("queueName");
+ String errorQueueName = request.getParameter("errorQueueName");
+ String receiverCount = request.getParameter("receiverCount");
+ String delayMs = request.getParameter("delayMs");
+ String retryCnt = request.getParameter("retryCnt");
+ String selector = request.getParameter("selector");
+ String descr = request.getParameter("descr");
+
+ String sreceiverName = request.getParameter("s_receiverName");
+ String actionType = request.getParameter("actionType");
+
+ String[][] monitorDataTotal = null;
+ String[][] monitorData = null;
+
+ FCQueueReceiverManager man = FCQueueReceiverManager.getInstance();
+ System.out.println("actionType = " + actionType);
+
+
+ System.out.println("sreceiverName = " + sreceiverName);
+
+ String errorMsg = null;
+
+ String[] receiverNames = null;
+
+ try {
+ if("START".equals(actionType)) {
+ System.out.println("START : receiverName = " + receiverName);
+ int ireceiverCount = Integer.parseInt(receiverCount);
+ int idelayMs = Integer.parseInt(delayMs);
+ int iretryCnt = Integer.parseInt(retryCnt);
+ FCQueueReceiverVO vo = new FCQueueReceiverVO();
+ vo.setReceiverName(receiverName);
+ vo.setQueueName(queueName);
+ vo.setErrorQueueName(errorQueueName);
+ vo.setReceiverCount(ireceiverCount);
+ vo.setErrorDelayTimeMs(idelayMs);
+ vo.setRetryCount(iretryCnt);
+ vo.setMessageSelector(selector);
+ vo.setDescription(descr);
+
+ man.setFCQueueReceiver(vo);
+ }
+ else if("STOP".equals(actionType)) {
+ System.out.println("STOP : receiverName = " + sreceiverName);
+ man.removeFCQueueReceiver(sreceiverName);
+ }
+ else if("STATUS".equals(actionType)) {
+ System.out.println("STATUS : receiverName = " + sreceiverName);
+ monitorDataTotal = man.getMonitorData();
+ monitorData = man.getMonitorData(sreceiverName);
+ FCQueueReceiverVO vo = man.getFCQueueReceiver(sreceiverName);
+ receiverName = vo.getReceiverName();
+ queueName = vo.getQueueName();
+ errorQueueName = vo.getErrorQueueName();
+ receiverCount = "" + vo.getReceiverCount();
+ delayMs = "" + vo.getErrorDelayTimeMs();
+ retryCnt = "" + vo.getRetryCount();
+ selector = vo.getMessageSelector();
+ descr = vo.getDescription();
+ }
+ else if("RESET".equals(actionType)) {
+ System.out.println("RESET : receiverName = " + sreceiverName);
+ man.resetCount(sreceiverName);
+
+ }
+ else {
+ System.out.println("Unhandled Action " + actionType);
+ }
+
+ System.out.println("receiverName = " + receiverName);
+ System.out.println("queueName = " + queueName);
+ System.out.println("errorQueueName= " + errorQueueName);
+ System.out.println("receiverCount = " + receiverCount);
+ System.out.println("delayMs = " + delayMs);
+ System.out.println("retryCnt = " + retryCnt);
+ System.out.println("selector = " + selector);
+ System.out.println("descr = " + descr);
+
+ } catch(Exception e) {
+ errorMsg = e.getMessage();
+ //e.printStackTrace();
+ }
+
+ try {
+ receiverNames = man.getAllReceiverNames();
+ } catch(Exception e) {
+ errorMsg = e.getMessage();
+ //e.printStackTrace();
+ }
+%>
+
+
+
+ FC Queue Receiver Manager
+
+
+
+
+
+ FC Queue Receiver Manager
+
+
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/_condperrtginfo.jsp b/WebContent/mgr/_condperrtginfo.jsp
new file mode 100644
index 0000000..541ff4d
--- /dev/null
+++ b/WebContent/mgr/_condperrtginfo.jsp
@@ -0,0 +1,14 @@
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+
+
+
+ EAI 조건부 라우팅 정보 테이블
+
+
+
+
+ EAI 조건부 라우팅 정보 테이블 페이지 입니다.
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/_refmsgid.jsp b/WebContent/mgr/_refmsgid.jsp
new file mode 100644
index 0000000..98f8f28
--- /dev/null
+++ b/WebContent/mgr/_refmsgid.jsp
@@ -0,0 +1,14 @@
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+
+
+
+ EAI 참고 메시지 ID
+
+
+
+
+ EAI 참고 메시지 ID 페이지 입니다.
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/adapter.jsp b/WebContent/mgr/adapter.jsp
new file mode 100644
index 0000000..c854495
--- /dev/null
+++ b/WebContent/mgr/adapter.jsp
@@ -0,0 +1,126 @@
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.adapter.AdapterGroupVO"%>
+<%@ page import="com.eactive.eai.adapter.AdapterManager"%>
+<%@ page import="com.eactive.eai.adapter.AdapterVO"%>
+
+<%
+ String flag = "";
+
+ AdapterManager manager = AdapterManager.getInstance();
+ List grpList = manager.getAllAdapterGroupNames();
+
+ String selectedName = request.getParameter("groupName");
+ String selectedadp = request.getParameter("adpName");
+ if (selectedName == null && grpList.size() > 0)
+ selectedName = (String)grpList.get(0);
+
+ AdapterGroupVO grpVO = manager.getAdapterGroupVO(selectedName);
+ String[] adpNames = grpVO.getAdapterNames();
+
+ if (selectedadp == null && adpNames.length > 0)
+ selectedadp = adpNames[0];
+
+ AdapterVO aVO = manager.getAdapterVO(selectedName,selectedadp );
+
+
+ if ("S".equals(request.getParameter("flag"))) {
+ grpVO = manager.getAdapterGroupVO(selectedName);
+ adpNames = grpVO.getAdapterNames();
+ selectedadp = adpNames[0];
+ aVO = grpVO.getAdapterVO(selectedadp);
+ }
+
+ if (selectedName != null && selectedadp != null) {
+ aVO = manager.getAdapterVO(selectedName, selectedadp);
+ }
+
+%>
+
+
+
+
+ Adpater Informations
+
+
+
+
+
+ 어댑터 정보
+
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/adaptergrp.jsp b/WebContent/mgr/adaptergrp.jsp
new file mode 100644
index 0000000..c504a6e
--- /dev/null
+++ b/WebContent/mgr/adaptergrp.jsp
@@ -0,0 +1,184 @@
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.adapter.AdapterGroupVO"%>
+<%@ page import="com.eactive.eai.adapter.AdapterManager"%>
+<%@ page import="com.eactive.eai.adapter.AdapterVO"%>
+
+<%
+ AdapterManager manager = AdapterManager.getInstance();
+ List alls = manager.getAllAdapterGroupNames();
+ String action = request.getParameter("actionType");
+
+ String selectedKey = request.getParameter("selectedKey");
+ if (selectedKey == null && alls.size() > 1) {
+ selectedKey = (String)alls.get(0);
+ }
+
+ AdapterGroupVO vo = null;
+
+ if (selectedKey != null) {
+ vo = manager.getAdapterGroupVO(selectedKey);
+ }
+
+%>
+
+
+
+
+ Adpater Informations
+
+
+
+
+
+ 어댑터 그룹정보
+
+
+<%
+ if (vo != null) {
+%>
+
+ * 문자열을 받아서 널이면 제로스트링을, 아니면 트림된 문자열을 리턴.
+ *
+ * @param String 변환 대상
+ * @return 'String'
+ */
+ public static String checkNull( String str ) {
+
+ String sResult = new String();
+ if ( str == null ) {
+ sResult = "";
+ }
+ else {
+ sResult = str.trim();
+ }
+ return sResult;
+ }
+%>
+<%
+
+ B2BAdapterMapManager manager = B2BAdapterMapManager.getInstance();
+ String action = request.getParameter("actionType");
+ String[] alls = manager.getAllKeyNames();
+
+ String selectedKey = request.getParameter("selectedKey");
+
+ if(selectedKey == null && alls.length>=1) {
+ selectedKey = alls[0];
+ }
+ if ("reload".equals(action)){
+ //manager.reload(selectedKey);
+ }else if ("reloadAll".equals(action)){
+ manager.reload();
+ }else {
+ ;
+ }
+ B2BAdapterMapVO vo = null;
+
+ if(selectedKey!=null) {
+ vo = manager.getB2BAdapterMap(selectedKey);
+ }
+
+%>
+
+
+
+
+
+
+ B2BAdapterMapManager
+
+
+
+
+
+ 라우팅 특정포트 매핑 관리
+
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/b2bextract.jsp b/WebContent/mgr/b2bextract.jsp
new file mode 100644
index 0000000..3294142
--- /dev/null
+++ b/WebContent/mgr/b2bextract.jsp
@@ -0,0 +1,153 @@
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.common.b2bextractor.B2BExtractManager"%>
+<%@ page import="com.eactive.eai.common.b2bextractor.B2BExtractVO"%>
+<%@ page import="java.util.HashMap"%>
+
+<%!
+ /**
+ *
+ * 문자열을 받아서 널이면 제로스트링을, 아니면 트림된 문자열을 리턴.
+ *
+ * @param String 변환 대상
+ * @return 'String'
+ */
+ public static String checkNull( String str ) {
+
+ String sResult = new String();
+ if ( str == null ) {
+ sResult = "";
+ }
+ else {
+ sResult = str.trim();
+ }
+ return sResult;
+ }
+%>
+<%
+ B2BExtractManager manager = B2BExtractManager.getInstance();
+ String[] alls = manager.getAllKeyNames();
+ String action = request.getParameter("actionType");
+
+ String selectedKey = request.getParameter("selectedKey");
+ int seq = 1;
+ if(selectedKey == null && alls.length>=1) {
+ selectedKey = alls[0];
+ }
+ if ("reload".equals(action)){
+ // 마지막 제거
+ manager.reload(selectedKey.substring(0,selectedKey.length()-1));
+ }else if ("reloadAll".equals(action)){
+ manager.reload();
+ }else {
+ ;
+ }
+ B2BExtractVO vo = null;
+ if(selectedKey!=null) {
+ vo = manager.getB2BExtract(selectedKey);
+ }
+
+%>
+
+
+
+
+
+
+ B2BExtractManager
+
+
+
+
+
+ 라우팅 필드추출 정보 관리
+
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/b2bservice.jsp b/WebContent/mgr/b2bservice.jsp
new file mode 100644
index 0000000..8a40543
--- /dev/null
+++ b/WebContent/mgr/b2bservice.jsp
@@ -0,0 +1,250 @@
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.common.b2bservice.B2BServiceManager"%>
+<%@ page import="com.eactive.eai.common.b2bservice.B2BServiceVO"%>
+<%@ page import="java.util.HashMap"%>
+
+<%!
+ /**
+ *
+ * 문자열을 받아서 널이면 제로스트링을, 아니면 트림된 문자열을 리턴.
+ *
+ * @param String 변환 대상
+ * @return 'String'
+ */
+ public static String checkNull( String str ) {
+
+ String sResult = new String();
+ if ( str == null ) {
+ sResult = "";
+ }
+ else {
+ sResult = str.trim();
+ }
+ return sResult;
+ }
+%>
+<%
+
+ B2BServiceManager manager = B2BServiceManager.getInstance();
+ String action = request.getParameter("actionType");
+ String [] alls = manager.getAllKeys();
+
+ String selectedKey = request.getParameter("selectedKey");
+ if(selectedKey == null && alls.length>=1) {
+ selectedKey = alls[0];
+ }
+ if ("reload".equals(action)){
+ // 마지막 제거
+ manager.reload(selectedKey.substring(0,selectedKey.length()-1));
+ }else if ("reloadAll".equals(action)){
+ manager.reload();
+ }else {
+ ;
+ }
+ B2BServiceVO vo = null;
+ if(selectedKey!=null) {
+ vo = manager.getB2BServiceVO(selectedKey);
+ }
+
+%>
+
+
+
+
+
+
+ B2BServiceManager
+
+
+
+
+
+ 라우팅 B2B기관 정보 관리
+
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/bizkey.jsp b/WebContent/mgr/bizkey.jsp
new file mode 100644
index 0000000..36184e0
--- /dev/null
+++ b/WebContent/mgr/bizkey.jsp
@@ -0,0 +1,151 @@
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.common.EAITable"%>
+<%@ page import="com.eactive.eai.common.bizkey.BizKeyFldVO"%>
+<%@ page import="com.eactive.eai.common.bizkey.BizKeyManager"%>
+<%@ page import="com.eactive.eai.common.bizkey.BizKeyVO"%>
+
+<%
+ BizKeyManager manager = BizKeyManager.getInstance();
+ String[] alls = manager.getAllKeyNames();
+ String action = request.getParameter("actionType");
+
+
+ String selectedKey = request.getParameter("selectedKey");
+
+ if(selectedKey == null && alls.length > 1) {
+ selectedKey = alls[0];
+ }
+ if ("reload".equals(action)){
+ //마지막 TR 을 빼고 처리 해야됨
+ manager.reload(selectedKey.substring(0, selectedKey.length()-2), selectedKey.substring(selectedKey.length()-2));
+ }else if ("reloadAll".equals(action)){
+ manager.reload();
+ }else {
+ ;
+ }
+
+ BizKeyVO vo = null;
+ if(selectedKey != null) {
+ vo = manager.getBizKey(selectedKey);
+ }
+%>
+
+
+
+ BizKey Manager
+
+
+
+
+
+ 로그조회키 관리
+
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/businessday.jsp b/WebContent/mgr/businessday.jsp
new file mode 100644
index 0000000..2793a14
--- /dev/null
+++ b/WebContent/mgr/businessday.jsp
@@ -0,0 +1,41 @@
+<%@ page import="java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.kbstar.eai.common.businessday.*"%>
+
+<%
+ BusinessDayManager manager = BusinessDayManager.getInstance();
+ Map messages = manager.getAllBusinessDays();
+%>
+
+
+ 일자전환 변경대상 정보
+
+
+
+
+ 일자전환 변경대상 정보
+
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/c2rservice.jsp b/WebContent/mgr/c2rservice.jsp
new file mode 100644
index 0000000..42bba32
--- /dev/null
+++ b/WebContent/mgr/c2rservice.jsp
@@ -0,0 +1,222 @@
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.common.c2rservice.C2RServiceManager"%>
+<%@ page import="com.eactive.eai.common.c2rservice.C2RServiceVO"%>
+<%@ page import="java.util.HashMap"%>
+
+<%!
+ /**
+ *
+ * 문자열을 받아서 널이면 제로스트링을, 아니면 트림된 문자열을 리턴.
+ *
+ * @param String 변환 대상
+ * @return 'String'
+ */
+ public static String checkNull( String str ) {
+
+ String sResult = new String();
+ if ( str == null ) {
+ sResult = "";
+ }
+ else {
+ sResult = str.trim();
+ }
+ return sResult;
+ }
+%>
+<%
+
+ String action = request.getParameter("actionType");
+
+ C2RServiceManager manager = C2RServiceManager.getInstance();
+ String key[] = manager.getAllKeys();
+
+ String selectedKey = request.getParameter("selectKeys");
+ int seq = 1;
+ if(selectedKey == null && key.length>0) {
+ selectedKey = key[0];
+ }
+
+ C2RServiceVO sm = null;
+
+ if(selectedKey!=null) {
+ sm = manager.getC2RServiceVO(selectedKey);
+ }
+
+%>
+
+
+
+
+
+
+ C2RServiceManager
+
+
+
+
+
+ C2RService Configuration
+
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/currentTx.jsp b/WebContent/mgr/currentTx.jsp
new file mode 100644
index 0000000..450c568
--- /dev/null
+++ b/WebContent/mgr/currentTx.jsp
@@ -0,0 +1,76 @@
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.adapter.AdapterGroupVO"%>
+<%@ page import="com.eactive.eai.adapter.AdapterManager"%>
+<%@ page import="com.eactive.eai.adapter.Keys"%>
+
+
+<%@ page import="com.eactive.eai.inbound.processor.RequestProcessor"%>
+
+<%
+ AdapterManager manager = AdapterManager.getInstance();
+ List all = manager.getAllAdapterGroupNames();
+
+ String flag = request.getParameter("flag");
+ if(flag!=null && flag.equals("reset")) {
+ RequestProcessor.resetCount();
+ }
+
+
+%>
+
+
+
+ 어댑터 별 진행 서비스 수
+
+
+
+
+
+ RequestProcessor 처리 현황
+
+
+
+ 어댑터 별 진행 서비스 수
+
+
+
+ 이름
+ 상태
+ 진행건수
+
+ <%
+ for(int i=0;i
+
+ <%=g.getName()%>
+ <%=g.isStarted()%>
+ <%=g.currentTx()%>
+
+ <% }%>
+
+
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/currentWeb.jsp b/WebContent/mgr/currentWeb.jsp
new file mode 100644
index 0000000..2aed23f
--- /dev/null
+++ b/WebContent/mgr/currentWeb.jsp
@@ -0,0 +1,17 @@
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ page import="com.eactive.eai.common.web.FrontFilter"%>
+
+
+
+ Currrnet Tx in Web Application
+
+
+
+
+ Currrnet Tx in Web Application
+
+
+ Current Count: <%=FrontFilter.count()%>
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/eaimessage.jsp b/WebContent/mgr/eaimessage.jsp
new file mode 100644
index 0000000..5454675
--- /dev/null
+++ b/WebContent/mgr/eaimessage.jsp
@@ -0,0 +1,366 @@
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.common.EAITable"%>
+<%@ page import="com.eactive.eai.common.message.EAIMessage"%>
+<%@ page import="com.eactive.eai.common.message.ServiceMessage"%>
+<%@ page import="com.eactive.eai.common.message.EAIMessageManager"%>
+
+<%
+ EAIMessageManager manager = EAIMessageManager.getInstance();
+ String[] alls = manager.getAllEAISvcCd();
+ String action = request.getParameter("actionType");
+
+ String selectedKey = request.getParameter("selectedKey");
+
+ if(selectedKey == null && alls.length>=1) {
+ selectedKey = alls[0];
+ }
+ if ("reload".equals(action)){
+ manager.reload(selectedKey);
+ }else if ("reloadAll".equals(action)){
+ manager.reload();
+ }else {
+ ;
+ }
+
+ EAIMessage vo = null;
+
+ if(selectedKey!=null) {
+ vo = manager.getEAIMessage(selectedKey);
+ }
+
+
+%>
+
+
+
+
+ EAIMessage Manager
+
+
+
+
+
+ EAI 서비스 코드관리
+
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/eaiserver.jsp b/WebContent/mgr/eaiserver.jsp
new file mode 100644
index 0000000..6ff096e
--- /dev/null
+++ b/WebContent/mgr/eaiserver.jsp
@@ -0,0 +1,106 @@
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.common.server.EAIServerManager"%>
+<%@ page import="com.eactive.eai.common.server.EAIServerVO"%>
+
+<%
+ EAIServerManager manager = EAIServerManager.getInstance();
+ String[] alls = manager.getAllEaiSvrInstNm();
+ String action = request.getParameter("actionType");
+
+ String selectedKey = request.getParameter("selectedKey");
+ if(selectedKey == null && alls.length>=1) {
+ selectedKey = alls[0];
+ }
+
+ EAIServerVO vo = null;
+
+ if(selectedKey!=null) {
+ vo = manager.getEAIServer(selectedKey);
+ }
+%>
+
+
+
+
+ EAIServer Manager
+
+
+
+
+
+ 서버 관리
+
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/errorcode.jsp b/WebContent/mgr/errorcode.jsp
new file mode 100644
index 0000000..c5a8e60
--- /dev/null
+++ b/WebContent/mgr/errorcode.jsp
@@ -0,0 +1,111 @@
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.common.errorcode.ErrorCodeManager"%>
+<%@ page import="com.eactive.eai.common.errorcode.ErrorCodeVO"%>
+
+<%
+ ErrorCodeManager manager = ErrorCodeManager.getInstance();
+ String[] alls = manager.getAllCodes();
+ String action = request.getParameter("actionType");
+
+ String selectedKey = request.getParameter("selectedKey");
+ if(selectedKey == null && alls.length>1) {
+ selectedKey = alls[0];
+ }
+ if ("reload".equals(action)){
+ manager.reload(selectedKey);
+ }else if ("reloadAll".equals(action)){
+ manager.reload();
+ }else {
+ ;
+ }
+ ErrorCodeVO vo = null;
+
+ if(selectedKey != null){
+ vo = manager.getMessageVO(selectedKey);
+ }
+
+
+%>
+
+
+
+ Error Code Message Manager
+
+
+
+
+
+ 오류메시지 관리
+
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/firstAccountInfo.jsp b/WebContent/mgr/firstAccountInfo.jsp
new file mode 100644
index 0000000..cff9a77
--- /dev/null
+++ b/WebContent/mgr/firstAccountInfo.jsp
@@ -0,0 +1,48 @@
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page import="com.eactive.eai.agent.firstaccount.ShareMemory" %>
+<%
+ ShareMemory sm = ShareMemory.getInstance();
+ String accNum = sm.getAccoutName();
+ String [] accNumArr = accNum.split(",");
+%>
+
+
+
+ FirstAccount Info
+
+
+
+
+
+ FirstAccount Info
+
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/inflowAdapter.jsp b/WebContent/mgr/inflowAdapter.jsp
new file mode 100644
index 0000000..26a9029
--- /dev/null
+++ b/WebContent/mgr/inflowAdapter.jsp
@@ -0,0 +1,81 @@
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.common.inflow.InflowControlManager"%>
+<%@ page import="com.eactive.eai.common.inflow.InflowTargetVO"%>
+
+<%
+ InflowControlManager manager = InflowControlManager.getInstance();
+ String[] names = manager.getAdapterAllKeys();
+ String selectedName = request.getParameter("name");
+ if(selectedName == null && names.length>0) selectedName = names[0];
+ InflowTargetVO vo = manager.getAdapterInflow(selectedName);
+%>
+
+
+
+ Inflow Adapter Manager
+
+
+
+
+
+ Infow Adapter Configuration
+
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/inflowInterface.jsp b/WebContent/mgr/inflowInterface.jsp
new file mode 100644
index 0000000..42fae72
--- /dev/null
+++ b/WebContent/mgr/inflowInterface.jsp
@@ -0,0 +1,81 @@
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.common.inflow.InflowControlManager"%>
+<%@ page import="com.eactive.eai.common.inflow.InflowTargetVO"%>
+
+<%
+ InflowControlManager manager = InflowControlManager.getInstance();
+ String[] names = manager.getInterfaceAllKeys();
+ String selectedName = request.getParameter("name");
+ if(selectedName == null && names.length>0) selectedName = names[0];
+ InflowTargetVO vo = manager.getInterfaceInflow(selectedName);
+%>
+
+
+
+ Inflow Interface Manager
+
+
+
+
+
+ Infow Interface Configuration
+
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/kbmessage.jsp b/WebContent/mgr/kbmessage.jsp
new file mode 100644
index 0000000..8643068
--- /dev/null
+++ b/WebContent/mgr/kbmessage.jsp
@@ -0,0 +1,228 @@
+<%-- <%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.agent.AgentUtil"%>
+<%@ page import="com.eactive.eai.agent.command.Command"%>
+<%@ page import="com.eactive.eai.common.EAITable"%>
+<%@ page import="com.kbstar.eai.common.kbmessage.*"%>
+<%@ page import="java.util.HashMap"%>
+
+<%!
+ /**
+ *
+ * 문자열을 받아서 널이면 제로스트링을, 아니면 트림된 문자열을 리턴.
+ *
+ * @param String 변환 대상
+ * @return 'String'
+ */
+ public static String checkNull( String str ) {
+
+ String sResult = new String();
+ if ( str == null ) {
+ sResult = "";
+ }
+ else {
+ sResult = str.trim();
+ }
+ return sResult;
+ }
+%>
+<%
+ KBMessageManager manager = KBMessageManager.getInstance();
+ String[] alls = manager.getAllKBMessageKeys();
+ String action = request.getParameter("actionType");
+
+ String selectedKey = request.getParameter("selectedKey");
+ if(selectedKey == null && alls.length>=1) {
+ selectedKey = alls[0];
+ }
+ if ("reload".equals(action)){
+ manager.reload(selectedKey);
+ }else if ("reloadAll".equals(action)){
+ manager.reload();
+ }else {
+ ;
+ }
+ KBMessage vo = null;
+
+ if(selectedKey != null){
+ vo = manager.getKBMessage(selectedKey);
+ }
+
+
+%>
+
+
+
+
+ EAI KBMessage Manager
+
+
+
+
+
+ EAI KB내부표준 메시지 관리
+
+
+ KBMessage Util
+
+
+
+
+
+ Message Parser
+
+ --%>
\ No newline at end of file
diff --git a/WebContent/mgr/lifecycle.jsp b/WebContent/mgr/lifecycle.jsp
new file mode 100644
index 0000000..d85f169
--- /dev/null
+++ b/WebContent/mgr/lifecycle.jsp
@@ -0,0 +1,138 @@
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.common.EAITable"%>
+<%@ page import="com.eactive.eai.common.lifecycle.Lifecycle"%>
+<%@ page import="com.eactive.eai.common.lifecycle.LifecycleManager"%>
+<%@ page import="com.eactive.eai.common.lifecycle.LifecycleVO"%>
+<%@ page import="java.util.HashMap"%>
+<%@ page import="com.eactive.eai.common.util.* "%>
+<%!
+ /**
+ *
+ * 문자열을 받아서 널이면 제로스트링을, 아니면 트림된 문자열을 리턴.
+ *
+ * @param String 변환 대상
+ * @return 'String'
+ */
+ public static String checkNull( String str ) {
+
+ String sResult = new String();
+ if ( str == null ) {
+ sResult = "";
+ }
+ else {
+ sResult = str.trim();
+ }
+ return sResult;
+ }
+%>
+<%
+
+ LifecycleManager manager = ApplicationContextProvider.getContext().getBean(LifecycleManager.class);
+ String action = request.getParameter("actionType");
+
+ List lists = manager.getLifecycleVOList();
+
+ String[] alls = new String[lists.size()];
+
+ for(int i=0; i< alls.length; i++){
+ alls[i] = ((LifecycleVO)lists.get(i)).getLifecycleClass();
+ }
+
+ String selectedKey = request.getParameter("selectedKey");
+
+ if(selectedKey == null && alls.length>=1) {
+ selectedKey = alls[0];
+ }
+
+ LifecycleVO vo = null;
+
+ if(selectedKey!=null) {
+ for(int i=0; i < alls.length; i++){
+ String lifeC = ((LifecycleVO)lists.get(i)).getLifecycleClass();
+ if(selectedKey.equals(lifeC)){
+ vo = (LifecycleVO)lists.get(i);
+ }
+ }
+ }
+
+%>
+
+
+
+
+
+ LifeCycle Manager
+
+
+
+
+
+ 라이프사이클 관리
+
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/messagekey.jsp b/WebContent/mgr/messagekey.jsp
new file mode 100644
index 0000000..e5960d9
--- /dev/null
+++ b/WebContent/mgr/messagekey.jsp
@@ -0,0 +1,185 @@
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.common.EAITable"%>
+<%@ page import="com.eactive.eai.common.messagekey.*"%>
+
+<%
+ MessageKeyManager manager = MessageKeyManager.getInstance();
+ String[] alls = manager.getAllKeyNames();
+ String action = request.getParameter("actionType");
+
+ String selectedKey = request.getParameter("selectedKey");
+ if(selectedKey == null && alls.length>1) {
+ selectedKey = alls[0];
+ }
+ if ("reload".equals(action)){
+ //I를 "," 로 분리 해야됨
+ manager.reload(selectedKey.substring(0,selectedKey.length()-1),selectedKey.substring(selectedKey.length()-1) );
+ }else if ("reloadAll".equals(action)){
+ manager.reload();
+ }else {
+ ;
+ }
+
+ MessageKeyVO vo = null;
+ if(selectedKey != null){
+ vo = manager.getMessageKey(selectedKey);
+ }
+ String voName = (String)vo.getName();
+ String adptName = voName.substring(0, voName.length()-1);
+ String exrTp = voName.substring(voName.length()-1);
+
+%>
+
+
+
+ MessageKey Manager
+
+
+
+
+
+ 메세지키 관리
+
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/newsvcmonitor.jsp b/WebContent/mgr/newsvcmonitor.jsp
new file mode 100644
index 0000000..2093e5c
--- /dev/null
+++ b/WebContent/mgr/newsvcmonitor.jsp
@@ -0,0 +1,304 @@
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.common.EAITable"%>
+<%@ page import="com.eactive.eai.common.message.EAIMessage"%>
+<%@ page import="com.eactive.eai.common.message.ServiceMessage"%>
+<%@ page import="com.eactive.eai.common.message.EAIMessageManager"%>
+<%@ page import="com.eactive.eai.common.monitor.EAIServiceMonitor"%>
+<%@ page import="com.eactive.eai.common.monitor.MonitorVO"%>
+<%@ page import="java.util.HashMap"%>
+
+<%
+
+ EAIServiceMonitor monitor = EAIServiceMonitor.getInstance();
+ String[] voKey = monitor.getAllMonitorVOKey();
+ String action = request.getParameter("actionType");
+ MonitorVO vo = null;
+ String[] pssCntKey = null;
+ String[] pssErrCntKey = null;
+ HashMap pssCnt = null;
+ HashMap pssCntInPeriod = null;
+ HashMap errPssCnt = null;
+ HashMap errPssCntInPeriod = null;
+
+ String selectedSvcCds = request.getParameter("svcCds");
+ if(selectedSvcCds == null && voKey.length>=1){
+ selectedSvcCds = voKey[0];
+ }
+
+ if(selectedSvcCds!=null) {
+ vo = monitor.getMonitorVO(selectedSvcCds);
+ if("RESET".equals(action)) {
+ vo.reset();
+ }
+ pssCntKey = vo.getAllPssCntKey();
+ pssCnt = vo.getPssCnt();
+ pssCntInPeriod = vo.getPssCntInPeriod();
+ errPssCnt = vo.getErrPssCnt();
+ errPssCntInPeriod = vo.getErrPssCntInPeriod();
+
+ pssErrCntKey = vo.getAllErrPssCntKey();
+
+ }
+
+ if("ALLRESET".equalsIgnoreCase(action)){
+ monitor.resetAll();
+ }
+%>
+
+
+
+
+ Service ID/Log Sequence 별 통계 Monitor
+
+
+
+
+
+ Service ID/Log Sequence 별 통계 데이터
+
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/property.jsp b/WebContent/mgr/property.jsp
new file mode 100644
index 0000000..6416820
--- /dev/null
+++ b/WebContent/mgr/property.jsp
@@ -0,0 +1,109 @@
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.common.property.PropGroupVO"%>
+<%@ page import="com.eactive.eai.common.property.PropManager"%>
+
+<%
+ PropManager manager = PropManager.getInstance();
+ String[] alls = manager.getAllPropGroupNames();
+ String action = request.getParameter("actionType");
+
+ String selectedKey = request.getParameter("selectedKey");
+ if(selectedKey == null && alls.length>1) {
+ selectedKey = alls[0];
+ }
+ if ("reload".equals(action)){
+ manager.reload(selectedKey);
+ }else if ("reloadAll".equals(action)){
+ manager.reload();
+ }else {
+ ;
+ }
+
+ PropGroupVO vo = null;
+
+ String[] keys = null;
+ if(selectedKey!=null) {
+ vo = manager.getPropGroupVO(selectedKey);
+ keys = vo.keys();
+ }
+%>
+
+
+
+ Property Manager
+
+
+
+
+
+ 프라퍼티 관리
+
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/refmsgid.jsp b/WebContent/mgr/refmsgid.jsp
new file mode 100644
index 0000000..cdf2062
--- /dev/null
+++ b/WebContent/mgr/refmsgid.jsp
@@ -0,0 +1,144 @@
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.common.EAITable"%>
+<%@ page import="com.eactive.eai.common.message.EAIMessage"%>
+<%@ page import="com.eactive.eai.common.message.ServiceMessage"%>
+<%@ page import="com.eactive.eai.common.message.EAIMessageManager"%>
+<%@ page import="java.util.HashMap"%>
+
+<%!
+ /**
+ *
+ * 문자열을 받아서 널이면 제로스트링을, 아니면 트림된 문자열을 리턴.
+ *
+ * @param String 변환 대상
+ * @return 'String'
+ */
+ public static String checkNull( String str ) {
+
+ String sResult = new String();
+ if ( str == null ) {
+ sResult = "";
+ }
+ else {
+ sResult = str.trim();
+ }
+ return sResult;
+ }
+%>
+<%
+
+ String action = request.getParameter("actionType");
+ String seq = request.getParameter("actionSeq");
+ String eAISvcCd = checkNull(request.getParameter("id"));
+
+ EAIMessageManager manager = EAIMessageManager.getInstance();
+ String[] eaiSvcCds = manager.getAllEAISvcCd();
+
+ String selectedSvcCds = request.getParameter("svcCds");
+ if(selectedSvcCds == null && eaiSvcCds.length>=1) {
+ selectedSvcCds = eaiSvcCds[0];
+ }
+ if(eAISvcCd.length() > 0)
+ selectedSvcCds = eAISvcCd;
+
+ EAIMessage eAIMsg = new EAIMessage();
+ List svcMsg = new ArrayList();
+
+
+ if(selectedSvcCds!=null) {
+ System.out.println("selectedSvcCds : "+ selectedSvcCds);
+ eAIMsg = manager.getEAIMessage(selectedSvcCds);
+ svcMsg = eAIMsg.getSvcMsgs();
+ }
+
+%>
+
+
+
+
+
+ EAI RefMessageIds Manager
+
+
+
+
+
+ EAI RefMessageIDs Configuration
+
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/restrictInfo.jsp b/WebContent/mgr/restrictInfo.jsp
new file mode 100644
index 0000000..d3978e4
--- /dev/null
+++ b/WebContent/mgr/restrictInfo.jsp
@@ -0,0 +1,89 @@
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.common.restrict.*"%>
+
+<%
+ RestrictInfoManager manager = RestrictInfoManager.getInstance();
+
+ String action = request.getParameter("actionType");
+ if("RELOAD".equals(action)) {
+ System.out.println("restrictInfo.jap - RELOAD called");
+ manager.reload();
+ }
+
+ String[] names = manager.getAllCodes();
+ Map messages = manager.getAllRestrictInfos();
+ String selectedName = request.getParameter("code");
+ if(selectedName == null && names.length>1) selectedName = names[0];
+
+%>
+
+
+
+ RestrictInfoManager
+
+
+
+
+
+ RestrictInfo
+
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/routing.jsp b/WebContent/mgr/routing.jsp
new file mode 100644
index 0000000..8527f2c
--- /dev/null
+++ b/WebContent/mgr/routing.jsp
@@ -0,0 +1,120 @@
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.common.routing.RoutingManager"%>
+<%@ page import="com.eactive.eai.common.routing.RoutingVO"%>
+
+<%
+ RoutingManager manager = RoutingManager.getInstance();
+ String[] alls = manager.getAllRoutingNames();
+ String action = request.getParameter("actionType");
+
+ String selectedKey = request.getParameter("selectedKey");
+ if(selectedKey == null && alls.length>=1) {
+ selectedKey = alls[0];
+ }
+ if ("reload".equals(action)){
+ manager.reload(selectedKey);
+ }else if ("reloadAll".equals(action)){
+ manager.reload();
+ }else {
+ ;
+ }
+ RoutingVO vo = null;
+
+ if(selectedKey != null){
+ vo = manager.getRoutingVO(selectedKey);
+ }
+%>
+
+
+
+
+ Routing Manager
+
+
+
+
+
+ 라우팅 관리
+
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/stdmessage.jsp b/WebContent/mgr/stdmessage.jsp
new file mode 100644
index 0000000..3ff9e38
--- /dev/null
+++ b/WebContent/mgr/stdmessage.jsp
@@ -0,0 +1,129 @@
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.agent.AgentUtil"%>
+<%@ page import="com.eactive.eai.agent.command.Command"%>
+<%@ page import="com.eactive.eai.common.EAITable"%>
+<%@ page import="com.eactive.eai.common.stdmessage.*"%>
+<%@ page import="com.eactive.eai.common.server.EAIServerManager"%>
+<%@ page import="java.util.HashMap"%>
+<%@ page import="com.eactive.eai.message.StandardMessage"%>
+<%!
+ /**
+ *
+ * 문자열을 받아서 널이면 제로스트링을, 아니면 트림된 문자열을 리턴.
+ *
+ * @param String 변환 대상
+ * @return 'String'
+ */
+ public static String checkNull( String str ) {
+
+ String sResult = new String();
+ if ( str == null ) {
+ sResult = "";
+ }
+ else {
+ sResult = str.trim();
+ }
+ return sResult;
+ }
+%>
+<%
+ STDMessageManager manager = STDMessageManager.getInstance();
+ String[] alls = manager.getAllSTDMessageKeys();
+ String action = request.getParameter("actionType");
+
+ String selectedKey = request.getParameter("selectedKey");
+ if(selectedKey == null && alls.length>=1) {
+ selectedKey = alls[0];
+ }
+ if ("reload".equals(action)){
+ manager.reload(selectedKey);
+ }else if ("reloadAll".equals(action)){
+ manager.reload();
+ }else {
+ ;
+ }
+ StandardMessage vo = null;
+
+ if(selectedKey != null) {
+ vo = manager.getSTDMessage(selectedKey);
+ }
+%>
+
+
+
+
+ EAI STDMessage Manager
+
+
+
+
+
+ EAI 내부표준 메시지 관리
+
+
+
+ Property Key
+ Property Value
+
+<%
+ if(vo != null) {
+%>
+
+
+ XML :
+ <%=vo.toPrettyJson(false)%>
+
+<%
+ }
+%>
+
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/svcmessages.jsp b/WebContent/mgr/svcmessages.jsp
new file mode 100644
index 0000000..ad273d0
--- /dev/null
+++ b/WebContent/mgr/svcmessages.jsp
@@ -0,0 +1,354 @@
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.common.EAITable"%>
+<%@ page import="com.eactive.eai.common.message.EAIMessage"%>
+<%@ page import="com.eactive.eai.common.message.ServiceMessage"%>
+<%@ page import="com.eactive.eai.common.message.EAIMessageManager"%>
+<%@ page import="java.util.HashMap"%>
+
+<%!
+ /**
+ *
+ * 문자열을 받아서 널이면 제로스트링을, 아니면 트림된 문자열을 리턴.
+ *
+ * @param String 변환 대상
+ * @return 'String'
+ */
+ public static String checkNull( String str ) {
+
+ String sResult = new String();
+ if ( str == null ) {
+ sResult = "";
+ }
+ else {
+ sResult = str.trim();
+ }
+ return sResult;
+ }
+%>
+<%
+
+ EAIMessageManager manager = EAIMessageManager.getInstance();
+ String[] alls = manager.getAllEAISvcCd();
+ String action = request.getParameter("actionType");
+ String eaiSvcCd = checkNull(request.getParameter("id"));
+
+
+ String selectedKey = request.getParameter("selectedKey");
+ if(selectedKey == null && alls.length>=1) {
+ selectedKey = alls[0];
+ }
+
+ if(eaiSvcCd.length() > 0){
+ selectedKey = eaiSvcCd;
+ }
+
+ List listVo = null;
+
+ if(selectedKey!=null) {
+ listVo = manager.getEAIMessage(selectedKey).getSvcMsgs();
+ }
+%>
+
+
+
+
+
+ EAI ServiceMessage Manager
+
+
+
+
+
+ EAI ServiceMessage Configuration
+
Service ID/Log Sequence 별 통계 Monitor
+
+
+
+Service ID/Log Sequence 별 통계 데이터
+
+
+
diff --git a/WebContent/mgr/svcmonitorbwk.jsp b/WebContent/mgr/svcmonitorbwk.jsp
new file mode 100644
index 0000000..149c1ff
--- /dev/null
+++ b/WebContent/mgr/svcmonitorbwk.jsp
@@ -0,0 +1,407 @@
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.common.EAITable"%>
+<%@ page import="com.eactive.eai.common.message.EAIMessage"%>
+<%@ page import="com.eactive.eai.common.message.ServiceMessage"%>
+<%@ page import="com.eactive.eai.common.message.EAIMessageManager"%>
+<%@ page import="com.eactive.eai.common.monitor.EAIServiceMonitor"%>
+<%@ page import="com.eactive.eai.common.monitor.MonitorVO"%>
+<%@ page import="java.util.HashMap"%>
+
+<%
+
+ EAIServiceMonitor monitor = EAIServiceMonitor.getInstance();
+ String[] voKey = monitor.getAllBwkClsKey();
+ String action = request.getParameter("actionType");
+
+ String[] pssCntKey = null;
+ String[] pssErrCntKey = null;
+ HashMap pssCnt = null;
+ HashMap pssCntInPeriod = null;
+ HashMap errPssCnt = null;
+ HashMap errPssCntInPeriod = null;
+ HashMap voByBwk = null;
+
+ long[] verTotalByBwk = null;;
+ long[] verTotalInPeriodByBwk = null;
+ double sumOfprocessTimeByBwk = 0;
+ double psvSumOfProcessTimeByBwk = 0;
+ double sumOfprocessTimeInPeriodByBwk = 0;
+ double psvSumOfProcessTimeInPeriodByBwk = 0;
+ double avgOfprocessTimeByBwk = 0;
+ double psvAvgOfProcessTimeByBwk = 0;
+ double avgOfprocessTimeInPeriodByBwk = 0;
+ double psvAvgOfProcessTimeInPeriodByBwk = 0;
+
+ int countEaiSvcCd = 0;
+ int countEaiSvcCdInPeriod = 0;
+
+ String selectedBwkCls = request.getParameter("bwkCls");
+ if(selectedBwkCls == null && voKey.length>=1){
+ selectedBwkCls = voKey[0];
+ }
+
+ if(selectedBwkCls!=null) {
+ voByBwk = monitor.getBwkCls(selectedBwkCls);
+ }
+
+%>
+
+
+
+
+ 업무구분 코드/Log Sequence 별 통계 Monitor
+
+
+
+
+
+ 업무구분 코드/Log Sequence 별 통계 데이터
+
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/testcall.jsp b/WebContent/mgr/testcall.jsp
new file mode 100644
index 0000000..a86e12d
--- /dev/null
+++ b/WebContent/mgr/testcall.jsp
@@ -0,0 +1,158 @@
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.adapter.AdapterVO"%>
+<%@ page import="com.eactive.eai.agent.command.Command"%>
+<%@ page import="com.eactive.eai.agent.testcall.TestCallCommand"%>
+<%@ page import="com.eactive.eai.agent.AgentUtil"%>
+<%@ page import="com.eactive.eai.common.property.PropManager"%>
+<%@ page import="com.eactive.eai.common.testcall.TestCall"%>
+<%@ page import="com.eactive.eai.common.testcall.TestCallManager"%>
+
+<%
+ TestCallManager manager = TestCallManager.getInstance();
+ ArrayList names = new ArrayList();
+ String action = request.getParameter("actionType");
+ String period = request.getParameter("period");
+ Properties prop = new Properties();
+
+ Iterator it = manager.getAllAdapterNames();
+ while(it.hasNext()) {
+ names.add(it.next());
+ }
+ Collections.sort(names);
+
+ if(period == null|| period.length()<=0){
+
+ PropManager pmanager = PropManager.getInstance();
+ long temp = 1000*60*10;
+ try {
+ temp = Long.parseLong(pmanager.getProperty(manager.PROP_GROUP, manager.PROP_PERIOD));
+
+ } catch(Exception e) {}
+
+ period = ""+temp;
+ }
+ String run = "";
+
+ if("UPDATE".equals(action)) {
+ prop.setProperty("PERIOD", period);
+ Command command = new TestCallCommand();
+ command.setArgs(prop);
+ AgentUtil.broadcast(command);
+ }
+ if("START".equals(action)){
+ run = "START";
+
+ prop.setProperty("RUN",run);
+ Command command = new TestCallCommand();
+ command.setArgs(prop);
+ AgentUtil.broadcast(command);
+ }
+ if("STOP".equals(action)){
+ run = "STOP";
+
+ prop.setProperty("RUN",run);
+ Command command = new TestCallCommand();
+ command.setArgs(prop);
+ AgentUtil.broadcast(command);
+ }
+
+ String status = "";
+
+ if(manager.isStarted())
+ status = "시작됨";
+ else
+ status = "종료됨";
+%>
+
+
+
+
+ TestCall Manager
+
+
+
+
+
+ TestCall Configuration
+
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/transRuleReload.jsp b/WebContent/mgr/transRuleReload.jsp
new file mode 100644
index 0000000..ab02334
--- /dev/null
+++ b/WebContent/mgr/transRuleReload.jsp
@@ -0,0 +1,103 @@
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.transformer.engine.TransformEngine"%>
+
+<%
+
+ String action = request.getParameter("actionType");
+ TransformEngine engine = TransformEngine.getInstance();
+
+ String status = "";
+
+ if("START".equals(action)){
+ engine.start();
+
+ }
+ if("STOP".equals(action)){
+ engine.stop();
+ }
+
+ if(engine.isStarted())
+ status = "시작됨";
+ else
+ status = "종료됨";
+%>
+
+
+
+
+ TransRuleReload Manager
+
+
+
+
+
+ TransRuleReload Configuration
+
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/transformer/Transform.jsp b/WebContent/mgr/transformer/Transform.jsp
new file mode 100644
index 0000000..2c27a5e
--- /dev/null
+++ b/WebContent/mgr/transformer/Transform.jsp
@@ -0,0 +1,214 @@
+<%--
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.transformer.layout.Layout"%>
+<%@ page import="com.eactive.eai.transformer.transform.Transform"%>
+<%@ page import="com.eactive.eai.transformer.transform.TransformItem"%>
+<%@ page import="com.eactive.eai.transformer.transform.TransformManager"%>
+<%@ page import="com.eactive.eai.transformer.util.TransformKeys"%>
+<%@ page import="java.util.HashMap"%>
+
+<%!
+ /**
+ *
+ * 문자열을 받아서 널이면 제로스트링을, 아니면 트림된 문자열을 리턴.
+ *
+ * @param String 변환 대상
+ * @return 'String'
+ */
+ public static String checkNull( String str ) {
+
+ String sResult = new String();
+ if ( str == null ) {
+ sResult = "";
+ }
+ else {
+ sResult = str.trim();
+ }
+ return sResult;
+ }
+
+%>
+
+<%
+ TransformManager manager = TransformManager.getManager();
+ String key[] = manager.getAllTransformName();
+
+ String selected = request.getParameter("transformName");
+ if(selected == null && key.length>=1) {
+ selected = key[0];
+ }
+
+ Transform transform = null;
+ ArrayList itemList = new ArrayList();
+ Layout target = null;
+ Iterator it = null;
+
+ if(selected!=null) {
+ transform = manager.getTransform(selected);
+ target = transform.getTargetLayout();
+ itemList = (ArrayList) transform.getTransformItemList();
+ it = transform.getSourceLayoutNames();
+ }
+ int sourceCount = transform.getSourceLayoutCount();
+ String sourceName = "";
+ for (int i=0; i < sourceCount; i++) {
+ if ("".equals(sourceName))
+ sourceName = (String)it.next();
+ else
+ sourceName = sourceName+" , " + (String)it.next();
+ }
+
+%>
+
+
+
+ Transform 변환규칙 Manager
+
+
+
+
+
+ Transform 변환규칙 Configuration
+
+
+
+--%>
\ No newline at end of file
diff --git a/WebContent/mgr/transformer/TransformFunc.jsp b/WebContent/mgr/transformer/TransformFunc.jsp
new file mode 100644
index 0000000..7c64062
--- /dev/null
+++ b/WebContent/mgr/transformer/TransformFunc.jsp
@@ -0,0 +1,186 @@
+
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.transformer.function.FunctionDefinition"%>
+<%@ page import="com.eactive.eai.transformer.function.FunctionManager"%>
+<%@ page import="com.eactive.eai.transformer.function.ParameterDefinition"%>
+<%@ page import="com.eactive.eai.transformer.util.TransformKeys"%>
+<%@ page import="java.util.HashMap"%>
+
+<%!
+ /**
+ *
+ * 문자열을 받아서 널이면 제로스트링을, 아니면 트림된 문자열을 리턴.
+ *
+ * @param String 변환 대상
+ * @return 'String'
+ */
+ public static String checkNull( String str ) {
+
+ String sResult = new String();
+ if ( str == null ) {
+ sResult = "";
+ }
+ else {
+ sResult = str.trim();
+ }
+ return sResult;
+ }
+
+%>
+
+<%
+ FunctionManager manager = FunctionManager.getInstance();
+ String[] alls = manager.getAllFunctionNames();
+
+ String selectedKey = request.getParameter("selectedKey");
+ if(selectedKey == null && alls.length>=1) {
+ selectedKey = alls[0];
+ }
+
+ FunctionDefinition vo = null;
+ ArrayList paramList = new ArrayList();
+
+ if(selectedKey!=null) {
+ vo = manager.getFunctionDefinition(selectedKey);
+ paramList = (ArrayList) vo.getParameterList();
+ }
+
+%>
+
+
+
+
+
+ Transform 변환함수 Manager
+
+
+
+
+
+ 변환함수 관리
+
+
+
diff --git a/WebContent/mgr/transformer/layout.jsp b/WebContent/mgr/transformer/layout.jsp
new file mode 100644
index 0000000..7173606
--- /dev/null
+++ b/WebContent/mgr/transformer/layout.jsp
@@ -0,0 +1,218 @@
+<%--
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.transformer.layout.Layout"%>
+<%@ page import="com.eactive.eai.transformer.layout.LayoutItem"%>
+<%@ page import="com.eactive.eai.transformer.layout.LayoutManager"%>
+<%@ page import="com.eactive.eai.transformer.util.TransformKeys"%>
+<%@ page import="java.util.HashMap"%>
+<%@ taglib uri="netui-tags-databinding.tld" prefix="netui-compat-data"%>
+<%@ taglib uri="netui-tags-html.tld" prefix="netui-compat"%>
+<%@ taglib uri="netui-tags-template.tld" prefix="netui-compat-template"%>
+
+<%!
+ /**
+ *
+ * 문자열을 받아서 널이면 제로스트링을, 아니면 트림된 문자열을 리턴.
+ *
+ * @param String 변환 대상
+ * @return 'String'
+ */
+ public static String checkNull( String str ) {
+
+ String sResult = new String();
+ if ( str == null ) {
+ sResult = "";
+ }
+ else {
+ sResult = str.trim();
+ }
+ return sResult;
+ }
+
+ StringBuffer html = new StringBuffer();
+
+ private void makeItem(LayoutItem item)
+ {
+ makeHTML(item);
+ try{
+ if (!item.isField() && (item.getChildCount() != 0)) {
+ for (int i = 0; i < item.getChildCount(); i++) {
+ if (item.getChild(i).getIndex() == -1) {
+ makeItem(item.getChild(i));
+ }
+ }
+ }
+ }catch (Exception e) {
+ e.printStackTrace();
+ System.out.println("LayoutEdit.jsp error");
+ }
+ }
+
+ private void makeHTML(LayoutItem item) {
+
+ if(item.isMessage())
+ html.append("");
+ else if (item.isGroup())
+ html.append(" ");
+ else
+ html.append(" ");
+
+ html.append(" "+item.getSeqNo()+" ");
+ html.append(" "+checkNull(item.getName())+" ");
+ html.append(" "+TransformKeys.getLoutItemNodePtrnID(item.getNodeTypeId())+" ");
+ html.append(" "+TransformKeys.getType(item.getItemTypeId())+" ");
+ html.append(" "+checkNull(item.getRefInfo())+" ");
+ html.append(" "+checkNull(item.getOccType())+" ");
+ html.append(" "+item.getOccMax()+" ");
+ html.append(" "+item.getOccMin()+" ");
+ html.append(" ");
+
+ }
+%>
+
+<%
+
+
+ LayoutManager manager = LayoutManager.getManager();
+ String key[] = manager.getAllLayoutName();
+
+ String selected = request.getParameter("layoutNames");
+ if(selected == null && key.length>=1) {
+ selected = key[0];
+ }
+
+ Layout layout = null;
+
+ if(selected!=null) {
+ layout = manager.getLayoutByName(selected);
+ }
+
+ LayoutItem root = null;
+ if (layout != null)
+ root = layout.getRootItem();
+
+ String str = "";
+ if (root != null ){
+ makeItem(root);
+ str = html.toString();
+ html = new StringBuffer();
+ }
+
+%>
+
+
+
+
+
+ Transform Layout Manager
+
+
+
+
+
+ Transform Layout Configuration
+
+
+
+--%>
\ No newline at end of file
diff --git a/WebContent/mgr/transformer/layoutItem.jsp b/WebContent/mgr/transformer/layoutItem.jsp
new file mode 100644
index 0000000..522e404
--- /dev/null
+++ b/WebContent/mgr/transformer/layoutItem.jsp
@@ -0,0 +1,211 @@
+<%--
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.transformer.layout.Layout"%>
+<%@ page import="com.eactive.eai.transformer.layout.LayoutItem"%>
+<%@ page import="com.eactive.eai.transformer.layout.LayoutManager"%>
+<%@ page import="com.eactive.eai.transformer.util.TransformKeys"%>
+<%@ page import="java.util.HashMap"%>
+<%@ taglib uri="netui-tags-databinding.tld" prefix="netui-compat-data"%>
+<%@ taglib uri="netui-tags-html.tld" prefix="netui-compat"%>
+<%@ taglib uri="netui-tags-template.tld" prefix="netui-compat-template"%>
+
+<%!
+ /**
+ *
+ * 문자열을 받아서 널이면 제로스트링을, 아니면 트림된 문자열을 리턴.
+ *
+ * @param String 변환 대상
+ * @return 'String'
+ */
+ public static String checkNull( String str ) {
+
+ String sResult = new String();
+ if ( str == null ) {
+ sResult = "";
+ }
+ else {
+ sResult = str.trim();
+ }
+ return sResult;
+ }
+
+%>
+
+<%
+ String layoutName = (String)request.getParameter("layoutName");
+ String itemName = (String)request.getParameter("itemName");
+
+ LayoutManager manager = LayoutManager.getManager();
+ Layout layout = manager.getLayoutByName(layoutName);
+ LayoutItem item = null;
+
+ if(layout != null ) {
+ layout.updateItemNameMap();
+ item = layout.getItemByPath(itemName);
+ } else {
+ System.out.println("layoutItem.jsp ] layout is null - " +layoutName);
+ }
+ if(item == null ) {
+ System.out.println("layoutItem.jsp ] layoutItem is null - " +itemName);
+ }
+
+%>
+
+
+
+
+
+ Transform LayoutItem Manager
+
+
+
+
+
+ Transform LayoutItem Configuration
+
+
+
+--%>
\ No newline at end of file
diff --git a/WebContent/mgr/transformer/layoutType.jsp b/WebContent/mgr/transformer/layoutType.jsp
new file mode 100644
index 0000000..3f2ff4a
--- /dev/null
+++ b/WebContent/mgr/transformer/layoutType.jsp
@@ -0,0 +1,149 @@
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.transformer.layout.LayoutType"%>
+<%@ page import="com.eactive.eai.transformer.layout.LayoutTypeManager"%>
+<%@ page import="com.eactive.eai.transformer.util.TransformKeys"%>
+<%@ page import="java.util.HashMap"%>
+
+<%!
+ /**
+ *
+ * 문자열을 받아서 널이면 제로스트링을, 아니면 트림된 문자열을 리턴.
+ *
+ * @param String 변환 대상
+ * @return 'String'
+ */
+ public static String checkNull( String str ) {
+
+ String sResult = new String();
+ if ( str == null ) {
+ sResult = "";
+ }
+ else {
+ sResult = str.trim();
+ }
+ return sResult;
+ }
+
+%>
+
+<%
+ LayoutTypeManager manager = LayoutTypeManager.getInstance();
+ String [] alls = manager.getAllLayoutTypeName();
+ String action = request.getParameter("actionType");
+
+ String selectedKey = request.getParameter("selectedKey");
+ if(selectedKey == null && alls.length>=1) {
+ selectedKey = alls[0];
+ }
+ if ("reload".equals(action)){
+ manager.reload(selectedKey);
+ }else if ("reloadAll".equals(action)){
+ manager.reload();
+ }else {
+ ;
+ }
+ LayoutType vo = null;
+
+ if(selectedKey!=null) {
+ vo = manager.getLayoutType(selectedKey);
+ }
+
+%>
+
+
+
+
+
+ Transform LayoutType Manager
+
+
+
+
+
+ 레이아웃 유형 관리
+
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/useDateControl.jsp b/WebContent/mgr/useDateControl.jsp
new file mode 100644
index 0000000..ad077a0
--- /dev/null
+++ b/WebContent/mgr/useDateControl.jsp
@@ -0,0 +1,77 @@
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+<%@ page import="com.eactive.eai.common.useDate.UseDateControlManager"%>
+<%@ page import="com.eactive.eai.common.useDate.UseDateControlVO"%>
+
+<%
+ UseDateControlManager manager = UseDateControlManager.getInstance();
+ String[] names = manager.getAllKeys();
+ String selectedName = request.getParameter("name");
+ if(selectedName == null && names.length>0) selectedName = names[0];
+ UseDateControlVO vo = manager.get(selectedName);
+%>
+
+
+
+ Use Date Control Manager
+
+
+
+
+
+ Use Date Control Configuration
+
+
+
\ No newline at end of file
diff --git a/WebContent/mgr/viewThreadList.jsp b/WebContent/mgr/viewThreadList.jsp
new file mode 100644
index 0000000..02acfac
--- /dev/null
+++ b/WebContent/mgr/viewThreadList.jsp
@@ -0,0 +1,115 @@
+<%@ page import="java.io.*, java.util.*"%>
+<%@ page language="java" contentType="text/html;charset=utf-8"%>
+
+<%!
+ private ThreadGroup getRootThreadGroup() {
+ ThreadGroup group = Thread.currentThread().getThreadGroup();
+ ThreadGroup parent = null;
+ while(true) {
+ parent = group.getParent();
+ if(parent==null) return group;
+
+ group = parent;
+ }
+ }
+
+ private ThreadGroup findThreadGroup(ThreadGroup parent, String path) {
+ if(path.startsWith("/")) {
+ path = path.substring(1);
+ }
+
+ return null;
+ }
+
+
+%>
+
+<%
+ String threadGroupName = request.getParameter("ThreadGroupName");
+
+ ThreadGroup root = getRootThreadGroup();
+ if(threadGroupName==null) threadGroupName=root.getName();
+
+ ThreadGroup[] children = new ThreadGroup[root.activeGroupCount()];
+ root.enumerate(children, true);
+
+ ThreadGroup current = null;
+ for(int i=0;i
+
+
+
+ CurrentThread List
+
+
+
+
+ 쓰레드 전체 리스트 보기
+
+
+
+
+ Thread Group List (총: <%=children.length%>개)
+
+
+
+
+
+
+
+ No Thread Name
+ isAlive
+ isDaemon
+ isInterrupted
+ activeCount
+
+<%
+ for(int i=0;i
+
+ <%=(i+1)%>
+ <%=threads[i].getName()%>
+ <%=threads[i].isAlive()%>
+ <%=threads[i].isDaemon()%>
+ <%=threads[i].isInterrupted()%>
+ <%=threads[i].activeCount()%>
+
+<%
+ }
+%>
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 85134b3..0f815bb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,14 +20,16 @@ def queryDslVersion = "5.0.0"
def hibernateVersion = "5.6.15.Final"
def generatedJavaDir = "$buildDir/generated/java"
-//def nexusUrl = "https://nexus.eactive.synology.me:8090"
-//
-//repositories {
-// maven {
-// url "${nexusUrl}/repository/maven-public/"
-// allowInsecureProtocol = true
-// }
-//}
+def nexusUrl = "https://nexus.eactive.synology.me:8090"
+
+allprojects {
+ repositories {
+ maven {
+ url "${nexusUrl}/repository/maven-public/"
+ allowInsecureProtocol = true
+ }
+ }
+}
java {
toolchain {
@@ -51,6 +53,7 @@ war {
if (profile == "weblogic") {
webXml = file("WebContent/WEB-INF/weblogic-web.xml")
+ exclude 'WEB-INF/web.xml'
}
archiveFileName = "eapim-online.war"
duplicatesStrategy = DuplicatesStrategy.WARN
diff --git a/docs/API_TRANSACTION_FLOW.md b/docs/API_TRANSACTION_FLOW.md
new file mode 100644
index 0000000..6605510
--- /dev/null
+++ b/docs/API_TRANSACTION_FLOW.md
@@ -0,0 +1,500 @@
+# API 거래 플로우 정리
+
+## 전체 플로우 다이어그램
+
+```
+[Client Request]
+ ↓
+┌─────────────────────────────────────────────────────────────────┐
+│ 1. ApiAdapterController (/api/**, /mapi/**) │
+│ - HTTP 요청 수신, 어댑터 정보 조회 │
+└─────────────────────────────────────────────────────────────────┘
+ ↓
+┌─────────────────────────────────────────────────────────────────┐
+│ 2. ApiAdapterService │
+│ - 요청 파싱 (GET/POST/PUT/DELETE) │
+│ - 암/복호화 처리 (AES128, AES256 등) │
+└─────────────────────────────────────────────────────────────────┘
+ ↓
+┌─────────────────────────────────────────────────────────────────┐
+│ 3. HttpAdapterServiceSupport.service() │
+│ - Pre/Post Filter 실행 │
+│ - RequestDispatcher 호출 │
+└─────────────────────────────────────────────────────────────────┘
+ ↓
+┌─────────────────────────────────────────────────────────────────┐
+│ 4. RequestDispatcher.handle() │
+│ - Processor 인스턴스 생성/획득 │
+│ - Adapter 상태 관리 │
+└─────────────────────────────────────────────────────────────────┘
+ ↓
+┌─────────────────────────────────────────────────────────────────┐
+│ 5. RequestProcessor.hookup() │
+│ - EAIMessage 생성 (StandardMessage → EAIMessage) │
+│ - 유량제어, 라우팅 판단 │
+│ - FlowRouter.process() 호출 │
+└─────────────────────────────────────────────────────────────────┘
+ ↓
+┌─────────────────────────────────────────────────────────────────┐
+│ 6. IFRouter.process() │
+│ - Outbound 라우팅 │
+│ - FailOver 처리 │
+│ - ElinkESBProcessProxy 호출 │
+└─────────────────────────────────────────────────────────────────┘
+ ↓
+┌─────────────────────────────────────────────────────────────────┐
+│ 7. RESTProcess (extends DefaultProcess) │
+│ - flow() 메소드 실행 │
+│ - 송신 변환, 로그, 응답 처리 │
+└─────────────────────────────────────────────────────────────────┘
+ ↓
+┌─────────────────────────────────────────────────────────────────┐
+│ 8. HttpSender.callService() │
+│ - ElinkAdapter 획득 │
+│ - Adapter 호출 │
+└─────────────────────────────────────────────────────────────────┘
+ ↓
+┌─────────────────────────────────────────────────────────────────┐
+│ 9. HttpClient5AdapterServiceRest.execute() │
+│ - 실제 HTTP 통신 (Apache HttpClient 5) │
+│ - OAuth 토큰 관리 │
+│ - 암/복호화 처리 │
+└─────────────────────────────────────────────────────────────────┘
+ ↓
+[Target System]
+```
+
+---
+
+## 각 클래스 설명
+
+### 1. ApiAdapterController
+
+| 항목 | 내용 |
+|------|------|
+| 위치 | `eapim-online/src/main/java/com/eactive/eai/adapter/controller/` |
+| 역할 | REST API 진입점 (Spring Controller) |
+| 주요 기능 | - `/api/**`, `/mapi/**` 엔드포인트 매핑> THREAD_LOCAL = new ThreadLocal<>();
+
+ // 컨텍스트 정리 (필수)
+ public static void clear();
+
+ // 비동기 전달용
+ public static Map getAll(); // 복사본 반환
+ public static void restore(Map ctx); // 복원
+
+ // 명시적 접근자 (Lazy init - 최초 put 시 Map 생성)
+ public static void setSeedSalt(String seedSalt);
+ public static String getSeedSalt();
+ public static void setEncryptionKey(String encryptionKey);
+ public static String getEncryptionKey();
+}
+```
+
+- **위치**: `elink-online-core`
+- **역할**: ThreadLocal 기반 트랜잭션 변수 저장소
+- **특징**:
+ - 명시적 초기화 불필요 (Lazy init)
+ - `clear()`는 필수 (finally 블록에서 호출)
+
+### 2. EAIMessage.transactionContextTransfer (전달용)
+
+```java
+// EAIMessage.java (elink-online-common)
+/**
+ * [주의] 비동기 JMS 전달 전용 - 직접 사용 금지!
+ */
+private Map transactionContextTransfer;
+
+public Map getTransactionContextTransfer();
+public void setTransactionContextTransfer(Map ctx);
+```
+
+- **위치**: `elink-online-common`
+- **역할**: 비동기 거래 시 JMS를 통한 컨텍스트 전달
+- **특징**:
+ - `Serializable` - ObjectMessage로 직렬화
+ - **직접 데이터 저장 용도로 사용 금지**
+ - 복원 후 즉시 null로 초기화
+
+---
+
+## 처리 흐름
+
+### 동기 (Sync) 처리
+
+```
+┌─────────────────────────────────────────────────────────────────────────┐
+│ ApiAdapterController.callApi() │
+│ │ │
+│ ├─ try { │
+│ │ service.callApi() │
+│ │ └─ RequestProcessor.hookup() │
+│ │ │ │
+│ │ ├─ [컨텍스트 사용 가능 - Lazy Init] ───────────────── │
+│ │ │ ElinkTransactionContext.setSeedSalt("value") │
+│ │ │ └─ 최초 호출 시 Map 자동 생성 │
+│ │ │ │
+│ │ ├─ FlowRouter.process() │
+│ │ │ └─ ElinkESBProcessProxy → Process 호출 │
+│ │ │ │
+│ │ ├─ [반환 후에도 컨텍스트 사용 가능] ✓ │
+│ │ │ │
+│ │ └─ 응답 반환 │
+│ │ } │
+│ └─ finally { │
+│ ElinkTransactionContext.clear() ← 최상위 진입점에서 해제 │
+│ } │
+└─────────────────────────────────────────────────────────────────────────┘
+```
+
+### 비동기 (Async) 처리 - Queue 사용
+
+```
+┌─────────────────────────────────────────────────────────────────────────┐
+│ [송신 스레드] │
+│ │
+│ ApiAdapterController.callApi() │
+│ │ │
+│ ├─ try { │
+│ │ RequestProcessor.hookup() │
+│ │ ├─ ElinkTransactionContext.setSeedSalt("value") │
+│ │ │ └─ ThreadLocal에 직접 저장 │
+│ │ │ │
+│ │ └─ FlowRouter.process() │
+│ │ ├─ [컨텍스트 복사] ───────────────────────────────────── │
+│ │ │ eaiMessage.setTransactionContextTransfer( │
+│ │ │ ElinkTransactionContext.getAll() │
+│ │ │ ) │
+│ │ └─ JMSSender.sendToQueue(eaiMessage, ...) │
+│ │ └─ EAIMessage 직렬화 (transactionContextTransfer 포함)│
+│ │ } │
+│ └─ finally { ElinkTransactionContext.clear() } │
+│ │ │
+└──────────────────────────┼──────────────────────────────────────────────┘
+ │
+ [JMS Queue]
+ │
+ ▼
+┌─────────────────────────────────────────────────────────────────────────┐
+│ [수신 스레드 - Consumer] │
+│ │
+│ FCQueueReceiver / DefaultQueueConsumer │
+│ │ │
+│ ├─ EAIMessage 역직렬화 (transactionContextTransfer 복원) │
+│ │ │
+│ └─ ElinkESBProcessProxy.callElinkESBProcess(BaseFCProcess, ...) │
+│ │ │
+│ ├─ [조건 충족: ASYNC && !outbound] │
+│ │ ├─ ElinkTransactionContext.restore( │
+│ │ │ eaiMessage.getTransactionContextTransfer() │
+│ │ │ ) │
+│ │ └─ eaiMessage.setTransactionContextTransfer(null) ← 즉시 초기화
+│ │ │
+│ ├─ BaseFCProcess.callService() │
+│ │ └─ ElinkESBProcessProxy(..., RESTProcess, ...) │
+│ │ └─ [조건 미충족: outbound] → 복원 안함 │
+│ │ └─ RESTProcess 호출 │
+│ │ └─ ElinkTransactionContext.getSeedSalt() │
+│ │ └─ 송신 스레드에서 설정한 값 조회 ✓ │
+│ │ │
+│ └─ finally { ElinkTransactionContext.clear() } │
+└─────────────────────────────────────────────────────────────────────────┘
+```
+
+---
+
+## 초기화/해제 위치
+
+| 위치 | 역할 | 비고 |
+|------|------|------|
+| `ApiAdapterController.callApi()` | 해제 (finally) | 동기 - 최상위 진입점 |
+| `RequestProcessorSupport.execute()` | 해제 (finally) | 동기 - 안전망 (이중 해제) |
+| `FlowRouter.process()` | 컨텍스트 복사 | 비동기 송신 전 |
+| `ElinkESBProcessProxy.callElinkESBProcess()` | 복원/해제 (조건부) | 비동기 수신 시 |
+
+### ElinkESBProcessProxy 복원 조건
+
+```java
+boolean shouldManageContext = eaiMessage != null
+ && EAIMessageKeys.ASYNC_SVC.equals(eaiMessage.getSvcTsmtUsgTp()) // ASYNC 거래
+ && (serviceURI == null || !serviceURI.startsWith("com.eactive.eai.outbound")); // outbound가 아닐 때
+
+if (shouldManageContext) {
+ ElinkTransactionContext.restore(eaiMessage.getTransactionContextTransfer());
+ eaiMessage.setTransactionContextTransfer(null); // 복원 후 즉시 초기화
+}
+```
+
+- **ASYNC 거래**: 동기 거래는 Lazy init으로 자동 처리
+- **outbound가 아닐 때**: BaseFCProcess 호출 시에만 복원, RESTProcess 호출 시에는 이미 복원된 상태
+
+> **Note**: `clear()`는 멱등(idempotent)하므로 여러 번 호출되어도 안전합니다.
+
+---
+
+## 사용 예시
+
+### 값 설정 (RequestProcessor, DefaultProcess 등)
+
+```java
+// SeedSalt 설정 (최초 호출 시 Map 자동 생성)
+ElinkTransactionContext.setSeedSalt("o123y498172");
+
+// EncryptionKey 설정
+ElinkTransactionContext.setEncryptionKey("myKey123");
+```
+
+### 값 조회 (JEP 함수, Transform 등)
+
+```java
+// SeedSalt 조회
+String seedSalt = ElinkTransactionContext.getSeedSalt();
+
+// EncryptionKey 조회
+String encryptionKey = ElinkTransactionContext.getEncryptionKey();
+```
+
+---
+
+## 변수 추가 방법
+
+새로운 트랜잭션 변수가 필요한 경우 `ElinkTransactionContext`에 접근자 메소드 추가:
+
+```java
+// ElinkTransactionContext.java
+
+// 1. Key 상수 추가
+private static final String KEY_NEW_VARIABLE = "NEW_VARIABLE";
+
+// 2. Setter 추가 (private put 헬퍼 사용)
+public static void setNewVariable(String value) {
+ put(KEY_NEW_VARIABLE, value);
+}
+
+// 3. Getter 추가 (private get 헬퍼 사용)
+public static String getNewVariable() {
+ return get(KEY_NEW_VARIABLE);
+}
+```
+
+---
+
+## 주의사항
+
+### Thread Pool 환경
+
+- `ApiAdapterController.callApi()` finally에서 `clear()` 호출
+- `ElinkESBProcessProxy.callElinkESBProcess()` finally에서 조건부 `clear()` 호출
+- Thread 재사용 시 이전 트랜잭션 데이터 누수 방지
+
+### 비동기 Queue 처리
+
+- `EAIMessage.transactionContextTransfer`는 **전달 전용** (직접 접근 금지)
+- `FlowRouter`에서 송신 전 `getAll()`로 복사
+- `ElinkESBProcessProxy`에서 `restore()` 후 즉시 null 초기화
+
+### transactionContextTransfer 직접 사용 금지
+
+```java
+// ❌ 잘못된 사용
+eaiMessage.getTransactionContextTransfer().put("key", "value");
+
+// ✓ 올바른 사용
+ElinkTransactionContext.setSeedSalt("value");
+```
+
+---
+
+## 관련 파일
+
+| 파일 | 위치 | 역할 |
+|------|------|------|
+| `ElinkTransactionContext.java` | `elink-online-core` | ThreadLocal 컨텍스트 저장소 |
+| `EAIMessage.java` | `elink-online-common` | transactionContextTransfer (전달용) |
+| `ApiAdapterController.java` | `eapim-online` | 해제 (동기 최상위 진입점) |
+| `FlowRouter.java` | `elink-online-common` | 비동기 송신 전 컨텍스트 복사 |
+| `ElinkESBProcessProxy.java` | `elink-online-common` | 복원/해제 (비동기 - 조건부) |
+| `RequestProcessorSupport.java` | `elink-online-common` | 해제 (동기 안전망) |
+
+---
+
+## 클래스 다이어그램
+
+```
+┌─────────────────────────────────────┐
+│ elink-online-core │
+├─────────────────────────────────────┤
+│ ElinkTransactionContext │
+│ ┌───────────────────────────────┐ │
+│ │ ThreadLocal>│◄── 직접 저장소 (Lazy Init)
+│ └───────────────────────────────┘ │
+│ + clear() │
+│ + getAll() → Map 복사본 │
+│ + restore(Map) │
+│ + setSeedSalt() / getSeedSalt() │
+│ + setEncryptionKey() / ... │
+└───────────────┬─────────────────────┘
+ │ 비동기 전달 시
+ │ getAll() → 복사
+ ▼
+┌─────────────────────────────────────┐
+│ elink-online-common │
+├─────────────────────────────────────┤
+│ EAIMessage │
+│ - transactionContextTransfer │◄── JMS 전달 전용 (직접 사용 금지!)
+│ : Map │ Serializable
+│ │
+│ [송신] FlowRouter에서 설정 │
+│ [수신] ElinkESBProcessProxy에서 │
+│ restore() 후 null 초기화 │
+└─────────────────────────────────────┘
+```
diff --git a/docs/레이아웃_조건부처리.md b/docs/레이아웃_조건부처리.md
new file mode 100644
index 0000000..8c58170
--- /dev/null
+++ b/docs/레이아웃_조건부처리.md
@@ -0,0 +1,32 @@
+# 레이아웃 조건부 처리 (RefValue)
+
+FlatReader에서 GROUP/GRID 항목의 조건부 처리를 위한 RefValue 설정 방법
+
+## 지원 조건
+
+| 표현식 | 의미 | 설명 |
+|--------|------|------|
+| `NM` | EQUALS | 값이 NM과 일치하는 경우 |
+| `NM\|EM` | OR | 값이 NM 또는 EM과 일치하는 경우 |
+| `!EM` | NOT | 값이 EM이 아닌 경우 |
+| `!NM\|EM` | NOT OR | 값이 NM도 아니고 EM도 아닌 경우 |
+
+## 레이아웃 설정 예시
+
+| 항목명 | 설명 | Depth | Type | Node | OccMin | Length | OccMax | RefPath | RefValue |
+|--------|------|-------|------|------|--------|--------|--------|---------|----------|
+| Message | 메시지부 | 1 | 3 | 0 | 1 | 0 | 1 | Message.Msg_Header.MSG_HEDR_KNCD | NM\|EM |
+| Msg_Header | 메시지헤더 | 2 | 3 | 0 | 1 | 0 | 1 | | |
+| MSG_HEDR_KNCD | 메시지헤더종류코드 | 3 | 2 | 1 | 1 | 2 | 1 | | NM |
+
+## 동작 설명
+
+위 예시에서 `Message` 항목은 `MSG_HEDR_KNCD` 값이 `NM` 또는 `EM`일 때만 처리됩니다.
+
+- `MSG_HEDR_KNCD = "NM"` → Message 처리됨
+- `MSG_HEDR_KNCD = "EM"` → Message 처리됨
+- `MSG_HEDR_KNCD = "XX"` → Message 스킵됨
+
+## 변경 파일
+
+- `elink-online-common/src/main/java/com/eactive/eai/message/parser/FlatReader.java`
diff --git a/docs/사용자정의함수.md b/docs/사용자정의함수.md
new file mode 100644
index 0000000..7656ed2
--- /dev/null
+++ b/docs/사용자정의함수.md
@@ -0,0 +1,70 @@
+# 사용자 정의 변환 함수
+
+## 1. substringrequestmessage
+
+최초요청데이터를 substring
+
+| 항목 | 값 |
+|------|-----|
+| 변환함수명 | substringrequestmessage |
+| 변환함수반환유형ID | [2101] STRING |
+| 변환함수유형ID | [2302] GENERIC |
+| 변환함수생성클래스 | com.eactive.eai.custom.transformer.function.userdefined.SubStringRequestMessage |
+
+### 파라미터
+
+| 일련번호 | 파라미터명 | 유형 | 설명 |
+|---------|-----------|------|------|
+| 1 | start | NUMBER | 시작 위치 |
+| 2 | end | NUMBER | 종료 위치 |
+
+### 사용 예시
+
+```
+substringrequestmessage(AGW_TESTCASE019S1_TGTR.status,3,7)
+```
+
+**샘플 메시지:**
+```
+ABCDEFGHIJK
+```
+
+**예상 결과:**
+```
+DEFG
+```
+
+---
+
+## 2. jsonpathextractrequestmessage
+
+최초요청(100)이 JSON 일 경우 특정 PATH의 데이터를 추출 하는 함수
+
+| 항목 | 값 |
+|------|-----|
+| 변환함수명 | jsonpathextractrequestmessage |
+| 변환함수반환유형ID | [2116] OBJECT |
+| 변환함수유형ID | [2302] GENERIC |
+| 변환함수생성클래스 | com.eactive.eai.custom.transformer.function.userdefined.JsonPathExtractRequestMessage |
+
+### 파라미터
+
+| 일련번호 | 파라미터명 | 유형 | 설명 |
+|---------|-----------|------|------|
+| 1 | jsonPath | STRING | 대상 PATH |
+
+### 사용 예시
+
+```
+jsonpathextractrequestmessage(AGW_TESTCASE022S1_TGTR.transactionId,"$.group1.field2")
+```
+
+**샘플 메시지:**
+```json
+{"group1":{"field1":"value1","field2":"value2"},"field3":"value3"}
+```
+
+**예상 결과:**
+```
+value2
+```
diff --git a/elink-online-common b/elink-online-common
index aacc1a3..1bbfe85 160000
--- a/elink-online-common
+++ b/elink-online-common
@@ -1 +1 @@
-Subproject commit aacc1a389e145453cf92c18e9d7ffef568cf89e7
+Subproject commit 1bbfe85d4f246c2c80d1c9d7f3457449c11fe5c7
diff --git a/elink-online-core b/elink-online-core
index 0f148e9..c22786b 160000
--- a/elink-online-core
+++ b/elink-online-core
@@ -1 +1 @@
-Subproject commit 0f148e997ec808e01a013baa8ca7b0053a69fe22
+Subproject commit c22786b72926f2a6180a8d5085f37a5f6c86068d
diff --git a/elink-online-core-jpa b/elink-online-core-jpa
index 2cd9c29..ea932d1 160000
--- a/elink-online-core-jpa
+++ b/elink-online-core-jpa
@@ -1 +1 @@
-Subproject commit 2cd9c29d4df228c1ffd7ed6471c8245510b19213
+Subproject commit ea932d1fddecd1f1fa8fc52959bcc6cfb455434a
diff --git a/elink-online-emsclient b/elink-online-emsclient
index f68423b..728ca86 160000
--- a/elink-online-emsclient
+++ b/elink-online-emsclient
@@ -1 +1 @@
-Subproject commit f68423b40ecb5076990739f09f87ec62f7fd17ae
+Subproject commit 728ca86c3766945d97046855b4ba3da4121a9409
diff --git a/elink-online-transformer b/elink-online-transformer
index c3e2de4..35b90c3 160000
--- a/elink-online-transformer
+++ b/elink-online-transformer
@@ -1 +1 @@
-Subproject commit c3e2de482be0fa692a5133cf77e0e3dc86357b6e
+Subproject commit 35b90c391ccaff66b503052ad52b9ad0d994ca1a
diff --git a/http/non-to-standard-api.http b/http/non-to-standard-api.http
index a74020b..66e35de 100644
--- a/http/non-to-standard-api.http
+++ b/http/non-to-standard-api.http
@@ -1,5 +1,15 @@
### 비표준 -> 표준 테스트
-POST http://localhost:7080/api/test/case012
+POST http://localhost:10210/api/test/case012
+Content-Type: application/json
+Accept: application/json
+
+{
+ "field1": "aaaa",
+ "field2": "bbbb"
+}
+
+### 비표준 -> 비표준 테스트
+POST http://localhost:10210/api/test/case001
Content-Type: application/json
Accept: application/json
@@ -7,5 +17,4 @@ Accept: application/json
"serviceId": "TST10001",
"aaa": "aaaa",
"bbb": "bbbb"
-}
-
+}
\ No newline at end of file
diff --git a/http/standard-api.http b/http/standard-api.http
index bb7b2b4..f5c0661 100644
--- a/http/standard-api.http
+++ b/http/standard-api.http
@@ -1,10 +1,5 @@
### 기본 테스트
-POST http://localhost:7080/api/test/case001
-Content-Type: application/json
-Accept: application/json
+POST http://localhost:10210/HTT/TstInHttSysStd
+Content-Type: text/plain; charset=ms949
-{
- "serviceId": "TST10001",
- "aaa": "aaaa",
- "bbb": "bbbb"
-}
\ No newline at end of file
+000010163034ITRT97774O20251203100415P00421003SR1010.15.11.86 ITREAI0201M2192614300070MCI 034LAC01613021 TESTCASE001 A1OBPOOY034ITRT97774O20251203100415P0042100103403330003330333TITR01T97774LAC016130SC002307110953LAC016130SC00.scn KORN00 0000000000NN 20251203N202660016 N N NN NN 00000000000000000000000000000000000000000000000000000000000004N2025120310041542202512031004155520251203100415415N 003 IO00000015{"key":"value"}@@
\ No newline at end of file
diff --git a/kjb-docs/inflow/inflow_control_group_ddl.sql b/kjb-docs/inflow/inflow_control_group_ddl.sql
new file mode 100644
index 0000000..e258eb9
--- /dev/null
+++ b/kjb-docs/inflow/inflow_control_group_ddl.sql
@@ -0,0 +1,51 @@
+-- ============================================
+-- 유량제어 그룹 테이블 DDL
+-- ============================================
+
+-- ============================================
+-- Oracle
+-- ============================================
+
+-- 유량제어 그룹 테이블
+CREATE TABLE inflow_control_group (
+ group_id VARCHAR2(36) NOT NULL, -- UUID
+ group_name VARCHAR2(100),
+ threshold NUMBER(10),
+ threshold_per_second NUMBER(10),
+ threshold_time_unit VARCHAR2(12),
+ use_yn VARCHAR2(1) DEFAULT '1',
+ modified_by VARCHAR2(50),
+ modified_at TIMESTAMP,
+ CONSTRAINT pk_inflow_control_group PRIMARY KEY (group_id)
+);
+
+COMMENT ON TABLE inflow_control_group IS '유량제어 그룹';
+COMMENT ON COLUMN inflow_control_group.group_id IS '그룹 ID (UUID)';
+COMMENT ON COLUMN inflow_control_group.group_name IS '그룹명';
+COMMENT ON COLUMN inflow_control_group.threshold IS '임계치';
+COMMENT ON COLUMN inflow_control_group.threshold_per_second IS '초당 임계치';
+COMMENT ON COLUMN inflow_control_group.threshold_time_unit IS '임계치 TimeUnit (SEC, MIN, HOU, DAY, MON)';
+COMMENT ON COLUMN inflow_control_group.use_yn IS '사용여부 (1:사용, 0:미사용)';
+COMMENT ON COLUMN inflow_control_group.modified_by IS '수정자';
+COMMENT ON COLUMN inflow_control_group.modified_at IS '수정일시';
+
+-- 그룹-인터페이스 매핑 테이블
+CREATE TABLE inflow_control_group_mapping (
+ interface_id VARCHAR2(100) NOT NULL,
+ group_id VARCHAR2(36) NOT NULL,
+ use_yn VARCHAR2(1) DEFAULT '1',
+ modified_by VARCHAR2(50),
+ modified_at TIMESTAMP,
+ CONSTRAINT pk_inflow_ctrl_grp_mapping PRIMARY KEY (interface_id)
+);
+
+COMMENT ON TABLE inflow_control_group_mapping IS '유량제어 그룹 매핑';
+COMMENT ON COLUMN inflow_control_group_mapping.interface_id IS '인터페이스 ID';
+COMMENT ON COLUMN inflow_control_group_mapping.group_id IS '그룹 ID';
+COMMENT ON COLUMN inflow_control_group_mapping.use_yn IS '사용여부 (1:사용, 0:미사용)';
+COMMENT ON COLUMN inflow_control_group_mapping.modified_by IS '수정자';
+COMMENT ON COLUMN inflow_control_group_mapping.modified_at IS '수정일시';
+
+-- 인덱스
+CREATE INDEX idx_inflow_ctrl_grp_map_grp ON inflow_control_group_mapping (group_id);
+
diff --git a/kjb-docs/inflow/그룹-유량제어-메뉴-추가-경로.md b/kjb-docs/inflow/그룹-유량제어-메뉴-추가-경로.md
new file mode 100644
index 0000000..c408040
--- /dev/null
+++ b/kjb-docs/inflow/그룹-유량제어-메뉴-추가-경로.md
@@ -0,0 +1,5 @@
+## 메뉴 추가 정보
+
+* 경로 : 환경정보 > 유량제어
+* 메뉴 명 : 그룹 별 유량제어
+* URL: /monitoring/onl/admin/inflow/inflowGroupControlMan.view
\ No newline at end of file
diff --git a/kjb-docs/std-deploy/KJB_StandardMessage_R10_20251208.md b/kjb-docs/std-deploy/KJB_StandardMessage_R10_20251208.md
new file mode 100644
index 0000000..44e73d9
--- /dev/null
+++ b/kjb-docs/std-deploy/KJB_StandardMessage_R10_20251208.md
@@ -0,0 +1,220 @@
+Header 헤더부 1 3 1 1 0 1
+Sys_Info 시스템식별 2 3 1 1 0 1
+STND_MESG_LEN 표준전문길이 3 2 1 1 8 12
+ENCD_CMPI_DVCD 암호화압축구분코드 3 2 1 1 1 1 0
+GUID GUID 3 2 1 1 36 1
+MESG_DMAN_DVCD 전문요청구분코드 3 2 1 1 1 1 S
+MESG_VER_NO 전문버전번호 3 2 1 1 3 1 R10
+Src_System 전송시스템 2 3 1 1 0 1
+FRST_TRNM_IPAD 최초전송IP주소 3 2 1 1 39 1
+FRST_TRNM_SYS_CD 최초전송시스템코드 3 2 1 1 3 1 API
+TRNM_SYS_CD 전송시스템코드 3 2 1 1 3 1
+TRNM_NODE_NO 전송노드번호 3 2 1 1 4 1
+MCI_SESN_ID MCI세션ID 3 2 1 1 8 1
+GNRZ_TMOT_TKTM 총괄타임아웃시간 3 2 1 1 3 1 070
+TX_TMOT_TKTM 거래타임아웃시간 3 2 1 1 3 1 060
+KJB_Add KJB추가 2 3 1 1 0 1
+OTSD_DMAN_SYS_CD 대외요청시스템코드 3 2 1 1 3 1 OBP
+EAI_NODE_NO EAI노드번호 3 2 1 1 2 1
+FEP_NODE_NO FEP노드번호 3 2 1 1 2 1
+FEP_SESN_ID FEP세션ID 3 2 1 1 6 1
+Spare_Zone 예비영역 2 3 1 1 0 1
+HEDR_SPR_CTNT 헤더예비영역 3 2 1 1 25 1
+Common 공통부 1 3 1 1 0 1
+Service_info 거래서비스정보 2 3 1 1 0 1
+GROUP_CMP_CD 그룹회사코드 3 2 1 1 3 1 034
+SRVC_ID 서비스ID 3 2 1 1 11 1
+PROCS_RSLT_RCMS_SRVC_ID 처리결과수신서비스ID 3 2 1 1 11 1
+IF_ID 인터페이스ID 3 2 1 1 20 1
+TX_SYNZ_DVCD 거래동기화구분코드 3 2 1 1 1 1
+HMAB_DVCD 내외구분코드 3 2 1 1 1 1 2
+OTSD_CHNL_INST_CD 대외채널기관코드 3 2 1 1 3 1
+SYS_OPRT_ENV_DVCD 시스템운영환경구분코드 3 2 1 1 1 1
+TX_TYP_DVCD 거래유형구분코드 3 2 1 1 1 1 O
+ORTR_RESTR_YN 원거래복원여부 3 2 1 1 1 1
+ORTR_GUID 원거래GUID 3 2 1 1 36 1
+Channel_Info 채널정보 2 3 1 1 0 1
+BANK_CD 은행코드 3 2 1 1 3 1
+TX_BRCD 거래부점코드 3 2 1 1 4 1
+DSPC_RCV_BRN_DVCD 파출수납부점구분코드 3 2 1 1 2 1
+RLTR_BRCD 실거래부점코드 3 2 1 1 4 1
+TRMN_INSL_BRCD 단말설치부점코드 3 2 1 1 4 1
+CHNL_TYCD 채널유형코드 3 2 1 1 1 1
+CHNL_DTLS_CLCD 채널세부분류코드 3 2 1 1 3 1
+TMNL_KIND_DVCD 단말기종류구분코드 3 2 1 1 2 1
+TRMN_NO 단말번호 3 2 1 1 6 1
+SCN_NO 화면번호 3 2 1 1 13 1
+SCN_FILE_VER 화면파일버전 3 2 1 1 10 2
+SCN_FILE_NM 화면파일명 3 2 1 1 30 1
+LANG_DVCD 언어구분코드 3 2 1 1 3 1 KOR
+CHNL_COM_SCTN_EXIS_YN 채널공통부문존재여부 3 2 1 1 1 1 N
+Confirm_Info 승인정보 2 3 1 1 0 1
+PRCG_APRV_PROCS_STCD 책임자승인처리상태코드 3 2 1 1 1 1
+PRCG_APRV_TYCD 책임자승인유형코드 3 2 1 1 1 1
+APRV_PRCG_EMPNO 승인책임자직원번호 3 2 1 1 7 1
+NURN_RSBT_EMPNO 차상위책임직원번호 3 2 1 1 7 1
+PRCG_APRV_SEQNO 책임자승인일련번호 3 2 1 1 10 2
+NURN_AGNCY_APRV_YN 차상위대행승인여부 3 2 1 1 1 1
+DSGT_PRCG_CHNG_YN 지정책임자변경여부 3 2 1 1 1 1
+CHNG_DSGT_PRCG_EMPNO 변경지정책임자직원번호 3 2 1 1 7 1
+PRCG_APRV_DMAN_RSN 책임자승인요청사유 3 2 1 1 40 1
+PRCG_APRV_RSN 책임자승인사유 3 2 1 1 40 1
+BizProc_Info 업무처리정보 2 3 1 1 0 1
+BZOP_DT 영업일자 3 2 1 1 8 1
+ANTT_YN 계정처리여부 3 2 1 1 1 1
+MESG_IQRY_DVCD 전문조회구분코드 3 2 1 1 1 1
+ATMC_CLSN_DVCD 자동화기기마감구분코드 3 2 1 1 1 1
+TLRNO 텔러번호 3 2 1 1 7 1
+ASST_TLRNO 보조텔러번호 3 2 1 1 7 1
+PSWD_VALDTN_YN 비밀번호검증여부 3 2 1 1 1 1
+TX_TELR_PSWD 거래텔러비밀번호 3 2 1 1 44 1
+CSIF_IDNT_DVCD 고객정보식별구분코드 3 2 1 1 3 1
+CSIF_ID 고객정보ID 3 2 1 1 30 1
+CSIF_CUST_NM 고객정보고객명 3 2 1 1 30 1
+CSIF_MASK_REVOC_YN 고객정보마스크해제여부 3 2 1 1 1 1
+CUST_PTLET_MASK_YN 고객포틀릿마스크여부 3 2 1 1 1 1
+IDC_IMG_NO 신분증이미지번호 3 2 1 1 32 1
+SMTWKP_TX_YN 스마트워크플레이스거래여부 3 2 1 1 1 1
+SECU_ACCO_REG_YN 보안계좌등록여부 3 2 1 1 1 1
+ABC_TX_DTLS_DVCD ABC거래세부구분코드 3 2 1 1 2 1
+CLNT_TELR_CSHN_RFLC_YN 클라이언트텔러시재반영여부 3 2 1 1 1 1
+SLIP_DIV_YN 전표구분여부 3 2 1 1 1 1
+SLIP_NO 전표번호 3 2 1 1 9 1
+TELR_SLIP_SEQNO 텔러전표일련번호 3 2 1 1 10 2
+TELR_CASH_AMT 텔러현금금액 3 2 1 1 17 2
+TELR_CBPC_AMT 텔러타점권금액 3 2 1 1 17 2
+TELR_TRFAMT 텔러대체금액 3 2 1 1 17 2
+LOGIN_DVCD 로그인구분코드 3 2 1 1 1 1
+TX_DT_EXTNS_YN 거래일자연장여부 3 2 1 1 1 1 N
+TX_DT 거래일자 3 2 1 1 8 1
+TX_TIME 거래시각 3 2 1 1 8 1
+SYS_DT 시스템일자 3 2 1 1 8 1
+SYS_TIME 시스템시각 3 2 1 1 8 1
+MESG_DMAN_DT 전문요청일자 3 2 1 1 8 1
+MESG_DMAN_TKTM 전문요청시간 3 2 1 1 9 1
+MESG_CNTY_YN 전문연속여부 3 2 1 1 1 1
+MESG_RSPN_DT 전문응답일자 3 2 1 1 8 1
+MESG_RSPN_TKTM 전문응답시간 3 2 1 1 9 1
+PROCS_RSLT_DVCD 처리결과구분코드 3 2 1 1 2 1
+OUTPUT_MESG_TYCD 출력전문유형코드 3 2 1 1 1 1
+LRQN_OUTPUT_DSCT_TRGT_YN 대량출력중단대상여부 3 2 1 1 1 1
+MESG_CNTY_SEQNO 전문연속일련번호 3 2 1 1 3 1
+Error_Info 에러정보 2 3 1 1 0 1
+ERR_CD 오류코드 3 2 1 1 6 1
+ERR_SYS_CD 오류시스템코드 3 2 1 1 3 1
+KJB_Add KJB추가 2 3 1 1 0 1
+ORTR_SCN_ID 원거래화면ID 3 2 1 1 13 1
+CORP_DPRM_NO 기업부서번호 3 2 1 1 5 1
+CSIF_IQRY_RSCD 고객정보조회사유코드 3 2 1 1 2 1
+Com_Spare_Zone 예비영역 2 3 1 1 0 1
+COM_SPR_CTNT 공통예비내용 3 2 1 1 212 1
+Channel_Common 채널공통부 1 3 0 1 0 1 Common.Channel_Info.CHNL_COM_SCTN_EXIS_YN Y
+Data_Header 데이터헤더 2 3 0 1 0 1
+DATA_HEDR_KNCD 데이터헤더종류코드 3 2 1 1 2 1
+DATA_HEDR_LEN 데이터헤더길이 3 2 1 1 8 1
+Data_For_Each 개별데이터부 2 3 0 1 0 1
+PSWD_ERR_DVCD 비밀번호오류구분코드 3 2 1 1 2 1
+ELFN_CUST_TYCD 전자금융고객유형코드 3 2 1 1 2 1
+USER_ID_S14 사용자ID_S14 3 2 1 1 14 1
+MST_ID_S14 마스터ID_S14 3 2 1 1 14 1
+SVR_TX_NO 서버거래번호 3 2 1 1 10 1
+HOST_TX_NO_S10 호스트거래번호_S10 3 2 1 1 10 1
+NEXT_PAGE_EXIS_YN1 다음페이지존재여부1 3 2 1 1 1 1
+SCCR_ISS_CD 보안카드발급코드 3 2 1 1 2 1
+SQ1_SCCR_SSBP_NO_SER 1차보안카드첨자번호순서 3 2 1 1 2 1
+SQ2_SCCR_SSBP_NO_SER 2차보안카드첨자번호순서 3 2 1 1 2 1
+SECU_MEDIA_SEQNO_S4 보안매체일련번호_S4 3 2 1 1 4 1
+SECU_MEDIA_DTL_DVCD_N3 보안매체상세구분코드_N3 3 2 1 1 3 1
+PAGE_NO 페이지번호 3 2 1 1 5 1
+PAGE_SIZE 페이지사이즈 3 2 1 1 5 1
+TTCN_N5 총건수_N5 3 2 1 1 5 1
+IQRY_CCNT_N5 조회건수_N5 3 2 1 1 5 1
+PRIQR_TX_NO 선조회거래번호 3 2 1 1 10 1
+SQ1_CUST_CNFR_INFO_CTNT_S39 1차고객확인정보내용_S39 3 2 1 1 39 1
+SQ2_CUST_CNFR_INFO_CTNT_S39 2차고객확인정보내용_S39 3 2 1 1 39 1
+MAC_S17 MAC주소_S17 3 2 1 1 17 1
+HDD_SEQ_NO_S24 HDD일련번호_S24 3 2 1 1 24 1
+CMCM_CD 통신사코드 3 2 1 1 1 1
+TLNO_S14 전화번호_S14 3 2 1 1 14 1
+OTP_EXPR_GDNC_DVCD_S1 OTP만기안내구분코드_S1 3 2 1 1 1 1
+KFTC_ENCD_MST_KEY_VER_S2 금융결제원암호화마스터키버전_S2 3 2 1 1 2 1
+KFTC_ENCD_RAND1_S32 금융결제원암호화난수1_S32 3 2 1 1 32 1
+KFTC_ENCD_RAND2_S32 금융결제원암호화난수2_S32 3 2 1 1 32 1
+ADDT_ATHN_YN_S1 추가인증여부_S1 3 2 1 1 1 1
+ADDT_ATHN_METH_DVCD_S2 추가인증수단구분코드_S2 3 2 1 1 2 1
+ADDT_ATHN_ATHN_VAL_S40 추가인증인증값_S40 3 2 1 1 40 1
+DUP_TX_YN_S1 중복거래여부_S1 3 2 1 1 1 1
+ABR_IP_BLC_YN_S1 해외IP차단여부_S1 3 2 1 1 1 1
+VIRT_ACCO_DVCD_S1 가상계좌조회구분_S1 3 2 1 1 1 1
+BZWK_DVCD1_S1 업무구분코드1_S1 3 2 1 1 1 1
+BZWK_DVCD2_S1 업무구분코드2_S1 3 2 1 1 1 1
+BZWK_DVCD3_S1 업무구분코드3_S1 3 2 1 1 1 1
+BZWK_DVCD4_S1 업무구분코드4_S1 3 2 1 1 1 1
+BZWK_DVCD5_S1 업무구분코드5_S1 3 2 1 1 1 1
+TX_SER_SEQNO_N3 거래순서일련번호_N3 3 2 1 1 3 1
+SECU_MEDIA_SEQNO_DMAN_VAL_S4 보안매체일련번호요청값_S4 3 2 1 1 4 1
+MEDIA_D1_UZ_POSB_AMT_N12 매체1일사용가능금액_N12 3 2 1 1 12 1
+CPHR_KEY_SECU_CO_CD_S1 암호키보안업체코드_S1 3 2 1 1 1 1
+HDD_VOLU_ID_S35 HDDVOLUMEID_S35 3 2 1 1 35 1
+SPR_FILD_S197 예비필드_S197 3 2 1 1 197 1
+Message 메시지부 1 3 0 1 0 1 Header.Sys_Info.MESG_DMAN_DVCD R
+Msg_Header 메시지헤더 2 3 0 1 0 1
+MSG_HEDR_KNCD 메시지헤더종류코드 3 2 1 1 2 1 NM
+MSG_HEDR_LEN 메시지헤더길이 3 2 1 1 8 2
+Msg_Body 메시지 2 3 0 1 0 1
+OUTPUT_ATRB_CD 출력속성코드 3 2 1 1 1 1 0
+OUTPUT_MSG_CD 출력메시지코드 3 2 1 1 10 1
+OUTPUT_MSG_CTNT 출력메시지내용 3 2 1 1 200 1
+OUTPUT_MSG_DESC 출력메시지설명 3 2 1 1 300 1
+ERR_MNGM_CTNT 오류조치내용 3 2 1 1 200 1
+ERR_CHGR_NM 오류담당자명 3 2 1 1 10 1
+ERR_CHGR_CNPL_NO 오류담당연락처번호 3 2 1 1 20 1
+OUTPUT_MSG_NCNT 출력메시지개수 3 2 1 1 4 2 0000
+Output_Msg_Grid 출력메시지 3 4 0 1 0 1 Message.Msg_Body.OUTPUT_MSG_NCNT
+OUTPUT_MSG_CD 출력메시지코드 4 2 0 1 10 1
+OUTPUT_MSG_CTNT 출력메시지내용 4 2 0 1 200 1
+OUTPUT_MSG_DESC 출력메시지설명 4 2 0 1 300 1
+ERR_MNGM_CTNT 오류조치내용 4 2 0 1 200 1
+ERR_LOCT_CTNT 오류위치내용 4 2 0 1 200 1
+ERR_OCCU_ITEM_NM 오류발생항목명 4 2 0 1 20 1
+Manager_Confirm 책임자승인부 1 3 0 1 0 1 Manager_Confirm.Data_Header.DATA_HEDR_KNCD AD
+Data_Header 데이터헤더 2 3 0 1 0 1
+DATA_HEDR_KNCD 데이터헤더종류코드 3 2 1 1 2 1
+DATA_HEDR_LEN 데이터헤더길이 3 2 1 1 8 2
+Data_Header_Etc 데이터헤더부가정보 2 3 0 1 0 1
+OUTPUT_SRVC_ID 출력서비스ID 3 2 1 1 13 1
+OUTPUT_SCN_ID 출력화면ID 3 2 1 1 13 1
+OUTPUT_SCN_DRVTN_MSG_CTNT 출력화면유도메시지내용 3 2 1 1 50 1
+DCG_DVCD 배출구분코드 3 2 1 1 1 1
+Data_For_Each 개별데이터부 2 3 0 1 0 1
+ACNO 계좌번호 3 2 1 1 16 1
+TRMN_CUST_FLNM 단말고객성명 3 2 1 1 20 1
+TX_AMT 거래금액 3 2 1 1 17 2
+APRV_RSCD_CCNT 승인사유코드건수 3 2 1 1 5 2
+APRV_RSCD 승인사유코드 3 2 1 1 5 1
+PRCG_APRV_DESC 책임자승인설명 3 2 1 1 50 1
+PRCG_APRV_TYCD 책임자승인유형코드 3 2 1 1 1 1
+PRCG_APRV_LIST_CCNT 책임자승인목록건수 3 2 1 1 5 2
+TX_DVCD 거래구분코드 3 2 1 1 2 1
+PRCG_EMPNO 책임자직원번호 3 2 1 1 6 1
+KOR_FLNM 한글성명 3 2 1 1 40 1
+BLNG_BRCD 소속부점코드 3 2 1 1 4 1
+BRN_KOR_NM 부점한글명 3 2 1 1 100 1
+LOGIN_IPAD 로그인IP주소 3 2 1 1 30 1
+JOBCLS_CD 직급코드 3 2 1 1 2 1
+LOGIN_STCD 로그인상태코드 3 2 1 1 2 1
+ABSC_YN 부재여부 3 2 1 1 1 1
+AGNCY_APRV_TLRNO 대행승인텔러번호 3 2 1 1 7 1
+BRMNR_YN 지점장여부 3 2 1 1 1 1
+AUDT_UNCN_PRCG_YN 감사통할책임자여부 3 2 1 1 1 1
+Data_Part 데이터부 1 3 1 1 0 1
+Data_Header 데이터헤더 2 3 1 1 0 1
+DATA_HEDR_KNCD 데이터헤더종류코드 3 2 1 1 2 1 IO
+DATA_HEDR_LEN 데이터헤더길이 3 2 1 1 8 2
+Data_Header_Etc 데이터헤더부가정보 2 3 0 1 0 1 Data_Part.Data_Header.DATA_HEDR_KNCD OD
+OUTPUT_SRVC_ID 출력서비스ID 3 2 1 1 13 1
+OUTPUT_SCN_ID 출력화면ID 3 2 1 1 13 1
+OUTPUT_SCN_DRVTN_MSG_CTNT 출력화면유도메시지내용 3 2 1 1 50 1
+DCG_DVCD 배출구분코드 3 2 1 1 1 1
+BizData 업무데이터 2 9 1 1 0 1
+END_BIT_CTNT 종료비트내용 1 2 1 1 2 11 @@
\ No newline at end of file
diff --git a/kjb-errors/.gitignore b/kjb-errors/.gitignore
new file mode 100644
index 0000000..08193f7
--- /dev/null
+++ b/kjb-errors/.gitignore
@@ -0,0 +1,32 @@
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store
diff --git a/kjb-errors/build.gradle b/kjb-errors/build.gradle
new file mode 100644
index 0000000..a987ef4
--- /dev/null
+++ b/kjb-errors/build.gradle
@@ -0,0 +1,29 @@
+plugins {
+ id 'java'
+}
+
+group = 'com.eactive.eai'
+version = '1.0.0'
+
+java {
+ sourceCompatibility = '17'
+}
+
+tasks.withType(JavaCompile) {
+ options.encoding = 'UTF-8'
+}
+
+repositories {
+ mavenCentral()
+}
+
+dependencies {
+ implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
+ implementation 'org.apache.httpcomponents.client5:httpclient5:5.2.1'
+
+ testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+}
+
+tasks.named('test') {
+ useJUnitPlatform()
+}
diff --git a/kjb-errors/gradle/wrapper/gradle-wrapper.jar b/kjb-errors/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..41d9927
Binary files /dev/null and b/kjb-errors/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/kjb-errors/gradle/wrapper/gradle-wrapper.properties b/kjb-errors/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..54228ea
--- /dev/null
+++ b/kjb-errors/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+networkTimeout=10000
diff --git a/kjb-errors/gradlew b/kjb-errors/gradlew
new file mode 100644
index 0000000..1b6c787
--- /dev/null
+++ b/kjb-errors/gradlew
@@ -0,0 +1,234 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+# Gradle start up script for POSIX generated by Gradle.
+#
+# Important for running:
+#
+# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+# noncompliant, but you have some other compliant shell such as ksh or
+# bash, then to run this script, type that shell name before the whole
+# command line, like:
+#
+# ksh Gradle
+#
+# Busybox and similar reduced shells will NOT work, because this script
+# requires all of these POSIX shell features:
+# * functions;
+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+# * compound commands having a testable exit status, especially «case»;
+# * various built-in commands including «command», «set», and «ulimit».
+#
+# Important for patching:
+#
+# (2) This script targets any POSIX shell, so it avoids extensions provided
+# by Bash, Ksh, etc; in particular arrays are avoided.
+#
+# The "traditional" practice of packing multiple parameters into a
+# space-separated string is a well documented source of bugs and security
+# problems, so this is (mostly) avoided, by progressively accumulating
+# options in "$@", and eventually passing that to Java.
+#
+# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+# see the in-line comments for details.
+#
+# There are tweaks for specific operating systems such as AIX, CygWin,
+# Darwin, MinGW, and NonStop.
+#
+# (3) This script is generated from the Groovy template
+# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# within the Gradle project.
+#
+# You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ case $link in #(
+ /*) app_path=$link ;; #(
+ *) app_path=$APP_HOME$link ;;
+ esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+ echo "$*"
+} >&2
+
+die () {
+ echo
+ echo "$*"
+ echo
+ exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) darwin=true ;; #(
+ MSYS* | MINGW* ) msys=true ;; #(
+ NONSTOP* ) nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD=$JAVA_HOME/jre/sh/java
+ else
+ JAVACMD=$JAVA_HOME/bin/java
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD=java
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ ulimit -n "$MAX_FD" ||
+ warn "Could not set maximum file descriptor limit to $MAX_FD"
+ esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+# * args from the command line
+# * the main class name
+# * -classpath
+# * -D...appname settings
+# * --module-path (only if needed)
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ for arg do
+ if
+ case $arg in #(
+ -*) false ;; # don't mess with options #(
+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
+ [ -e "$t" ] ;; #(
+ *) false ;;
+ esac
+ then
+ arg=$( cygpath --path --ignore --mixed "$arg" )
+ fi
+ # Roll the args list around exactly as many times as the number of
+ # args, so each arg winds up back in the position where it started, but
+ # possibly modified.
+ #
+ # NB: a `for` loop captures its iteration list before it begins, so
+ # changing the positional parameters here affects neither the number of
+ # iterations, nor the values presented in `arg`.
+ shift # remove old arg
+ set -- "$@" "$arg" # push replacement arg
+ done
+fi
+
+# Collect all arguments for the java command;
+# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# shell script including quotes and variable substitutions, so put them in
+# double quotes to make sure that they get re-expanded; and
+# * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+# set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+ printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+ xargs -n1 |
+ sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+ tr '\n' ' '
+ )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/kjb-errors/gradlew.bat b/kjb-errors/gradlew.bat
new file mode 100644
index 0000000..107acd3
--- /dev/null
+++ b/kjb-errors/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/kjb-errors/settings.gradle b/kjb-errors/settings.gradle
new file mode 100644
index 0000000..045fcf4
--- /dev/null
+++ b/kjb-errors/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'kjb-errors'
diff --git a/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/BearerTokenErrorTest.java b/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/BearerTokenErrorTest.java
new file mode 100644
index 0000000..7edd2f9
--- /dev/null
+++ b/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/BearerTokenErrorTest.java
@@ -0,0 +1,168 @@
+package com.eactive.eai.kjb.errors;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.apache.hc.client5.http.classic.methods.HttpPost;
+import org.apache.hc.client5.http.entity.UrlEncodedFormEntity;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.http.io.entity.EntityUtils;
+import org.apache.hc.core5.http.message.BasicNameValuePair;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class BearerTokenErrorTest {
+
+ @Test
+ void testCase001_잘못된GrantType() throws Exception {
+ // given
+ String url = TestConfig.getBaseUrl("/auth/oauth/v2/token");
+
+ List params = new ArrayList<>();
+ params.add(new BasicNameValuePair("grant_type", "password"));
+ params.add(new BasicNameValuePair("client_id", "AyeWx0OpYLJbHpZ21DDSxYfQPmD5Ckn8"));
+ params.add(new BasicNameValuePair("client_secret", "KwBYJT1m1v3SUvzN2HPHhy2Ad9Q2GADbgWkYZZg9Ybbc8R1uEuBJNQ9oVl13b1qiXwYvDWTaX0EanxY4SMjNfnBBsZzfNoMwwDPTb3IjQy5k3CRxTAYzcSnmzlC4FSsG"));
+ params.add(new BasicNameValuePair("scope", "api"));
+
+ // when
+ try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+ HttpPost httpPost = new HttpPost(url);
+ httpPost.setEntity(new UrlEncodedFormEntity(params));
+
+ String responseBody = httpClient.execute(httpPost, response -> {
+ String body = EntityUtils.toString(response.getEntity());
+ System.out.println("Response Body: " + body);
+
+ // then
+ assertEquals(401, response.getCode());
+ return body;
+ });
+
+ // MessageUtil.makeJsonErrorMessage 기본 포맷 검증
+ ErrorResponseValidator.validateErrorFormat(responseBody);
+ }
+ }
+
+ @Test
+ void testCase002_존재하지않는ClientId() throws Exception {
+ // given
+ String url = TestConfig.getBaseUrl("/auth/oauth/v2/token");
+
+ List params = new ArrayList<>();
+ params.add(new BasicNameValuePair("grant_type", "client_credentials"));
+ params.add(new BasicNameValuePair("client_id", "INVALID_CLIENT_ID"));
+ params.add(new BasicNameValuePair("client_secret", "invalid_secret"));
+ params.add(new BasicNameValuePair("scope", "api"));
+
+ // when
+ try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+ HttpPost httpPost = new HttpPost(url);
+ httpPost.setEntity(new UrlEncodedFormEntity(params));
+
+ String responseBody = httpClient.execute(httpPost, response -> {
+ String body = EntityUtils.toString(response.getEntity());
+ System.out.println("Response Body: " + body);
+
+ // then
+ assertEquals(401, response.getCode());
+ return body;
+ });
+
+ // MessageUtil.makeJsonErrorMessage 기본 포맷 검증
+ ErrorResponseValidator.validateErrorFormat(responseBody);
+ }
+ }
+
+ @Test
+ void testCase003_잘못된ClientSecret() throws Exception {
+ // given
+ String url = TestConfig.getBaseUrl("/auth/oauth/v2/token");
+
+ List params = new ArrayList<>();
+ params.add(new BasicNameValuePair("grant_type", "client_credentials"));
+ params.add(new BasicNameValuePair("client_id", "AyeWx0OpYLJbHpZ21DDSxYfQPmD5Ckn8"));
+ params.add(new BasicNameValuePair("client_secret", "WRONG_SECRET"));
+ params.add(new BasicNameValuePair("scope", "api"));
+
+ // when
+ try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+ HttpPost httpPost = new HttpPost(url);
+ httpPost.setEntity(new UrlEncodedFormEntity(params));
+
+ String responseBody = httpClient.execute(httpPost, response -> {
+ String body = EntityUtils.toString(response.getEntity());
+ System.out.println("Response Body: " + body);
+
+ // then
+ assertEquals(401, response.getCode());
+ return body;
+ });
+
+ // MessageUtil.makeJsonErrorMessage 기본 포맷 검증
+ ErrorResponseValidator.validateErrorFormat(responseBody);
+ }
+ }
+
+ @Test
+ void testCase004_Scope없음() throws Exception {
+ // given
+ String url = TestConfig.getBaseUrl("/auth/oauth/v2/token");
+
+ List params = new ArrayList<>();
+ params.add(new BasicNameValuePair("grant_type", "client_credentials"));
+ params.add(new BasicNameValuePair("client_id", "AyeWx0OpYLJbHpZ21DDSxYfQPmD5Ckn8"));
+ params.add(new BasicNameValuePair("client_secret", "KwBYJT1m1v3SUvzN2HPHhy2Ad9Q2GADbgWkYZZg9Ybbc8R1uEuBJNQ9oVl13b1qiXwYvDWTaX0EanxY4SMjNfnBBsZzfNoMwwDPTb3IjQy5k3CRxTAYzcSnmzlC4FSsG"));
+ params.add(new BasicNameValuePair("scope", ""));
+
+ // when
+ try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+ HttpPost httpPost = new HttpPost(url);
+ httpPost.setEntity(new UrlEncodedFormEntity(params));
+
+ String responseBody = httpClient.execute(httpPost, response -> {
+ String body = EntityUtils.toString(response.getEntity());
+ System.out.println("Response Body: " + body);
+
+ // then
+ assertEquals(401, response.getCode());
+ return body;
+ });
+
+ // MessageUtil.makeJsonErrorMessage 기본 포맷 검증
+ ErrorResponseValidator.validateErrorFormat(responseBody);
+ }
+ }
+
+ @Test
+ void testCase005_허용되지않은Scope() throws Exception {
+ // given
+ String url = TestConfig.getBaseUrl("/auth/oauth/v2/token");
+
+ List params = new ArrayList<>();
+ params.add(new BasicNameValuePair("grant_type", "client_credentials"));
+ params.add(new BasicNameValuePair("client_id", "AyeWx0OpYLJbHpZ21DDSxYfQPmD5Ckn8"));
+ params.add(new BasicNameValuePair("client_secret", "KwBYJT1m1v3SUvzN2HPHhy2Ad9Q2GADbgWkYZZg9Ybbc8R1uEuBJNQ9oVl13b1qiXwYvDWTaX0EanxY4SMjNfnBBsZzfNoMwwDPTb3IjQy5k3CRxTAYzcSnmzlC4FSsG"));
+ params.add(new BasicNameValuePair("scope", "invalid_scope"));
+
+ // when
+ try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+ HttpPost httpPost = new HttpPost(url);
+ httpPost.setEntity(new UrlEncodedFormEntity(params));
+
+ String responseBody = httpClient.execute(httpPost, response -> {
+ String body = EntityUtils.toString(response.getEntity());
+ System.out.println("Response Body: " + body);
+
+ // then
+ assertEquals(401, response.getCode());
+ return body;
+ });
+
+ // MessageUtil.makeJsonErrorMessage 기본 포맷 검증
+ ErrorResponseValidator.validateErrorFormat(responseBody);
+ }
+ }
+}
diff --git a/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/BearerTokenFilterErrorTest.java b/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/BearerTokenFilterErrorTest.java
new file mode 100644
index 0000000..d2db920
--- /dev/null
+++ b/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/BearerTokenFilterErrorTest.java
@@ -0,0 +1,41 @@
+package com.eactive.eai.kjb.errors;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.apache.hc.client5.http.classic.methods.HttpPost;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.io.entity.EntityUtils;
+import org.apache.hc.core5.http.io.entity.StringEntity;
+import org.junit.jupiter.api.Test;
+
+class BearerTokenFilterErrorTest {
+
+ @Test
+ void testCase001_잘못된Bearer토큰_401에러() throws Exception {
+ // given
+ String url = TestConfig.getBaseUrl("/api/auth/case009?transactionId=1234567890");
+ String invalidToken = "INVALID_TOKEN_12345";
+
+ // when
+ try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+ HttpPost httpPost = new HttpPost(url);
+ httpPost.setHeader("Authorization", "Bearer " + invalidToken);
+ httpPost.setHeader("Content-Type", "application/json");
+ httpPost.setEntity(new StringEntity("{}", ContentType.APPLICATION_JSON));
+
+ String responseBody = httpClient.execute(httpPost, response -> {
+ String body = EntityUtils.toString(response.getEntity());
+ System.out.println("Response Body: " + body);
+
+ // then
+ assertEquals(401, response.getCode());
+ return body;
+ });
+
+ // MessageUtil.makeJsonErrorMessage 기본 포맷 검증
+ ErrorResponseValidator.validateErrorFormat(responseBody);
+ }
+ }
+}
diff --git a/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/BearerTokenSuccessTest.java b/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/BearerTokenSuccessTest.java
new file mode 100644
index 0000000..7911a91
--- /dev/null
+++ b/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/BearerTokenSuccessTest.java
@@ -0,0 +1,67 @@
+package com.eactive.eai.kjb.errors;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.apache.hc.client5.http.classic.methods.HttpPost;
+import org.apache.hc.client5.http.entity.UrlEncodedFormEntity;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.http.io.entity.EntityUtils;
+import org.apache.hc.core5.http.message.BasicNameValuePair;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class BearerTokenSuccessTest {
+
+ private final ObjectMapper objectMapper = new ObjectMapper();
+
+ @Test
+ void testCase001_BearerToken발급성공() throws Exception {
+ // given
+ String url = TestConfig.getBaseUrl("/auth/oauth/v2/token");
+
+ List params = new ArrayList<>();
+ params.add(new BasicNameValuePair("grant_type", "client_credentials"));
+ params.add(new BasicNameValuePair("client_id", "AyeWx0OpYLJbHpZ21DDSxYfQPmD5Ckn8"));
+ params.add(new BasicNameValuePair("client_secret", "KwBYJT1m1v3SUvzN2HPHhy2Ad9Q2GADbgWkYZZg9Ybbc8R1uEuBJNQ9oVl13b1qiXwYvDWTaX0EanxY4SMjNfnBBsZzfNoMwwDPTb3IjQy5k3CRxTAYzcSnmzlC4FSsG"));
+ params.add(new BasicNameValuePair("scope", "api"));
+
+ // when
+ try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+ HttpPost httpPost = new HttpPost(url);
+ httpPost.setEntity(new UrlEncodedFormEntity(params));
+
+ String responseBody = httpClient.execute(httpPost, response -> {
+ String body = EntityUtils.toString(response.getEntity());
+ System.out.println("Response Body: " + body);
+
+ // then
+ assertEquals(200, response.getCode());
+ return body;
+ });
+
+ // 응답 검증
+ JsonNode jsonNode = objectMapper.readTree(responseBody);
+ assertNotNull(jsonNode, "JSON 응답이 null입니다");
+
+ // Bearer Token 응답 필드 확인
+ assertNotNull(jsonNode.get("access_token"), "access_token 필드가 없습니다");
+ assertNotNull(jsonNode.get("token_type"), "token_type 필드가 없습니다");
+ assertNotNull(jsonNode.get("expires_in"), "expires_in 필드가 없습니다");
+ assertNotNull(jsonNode.get("scope"), "scope 필드가 없습니다");
+
+ assertEquals("Bearer", jsonNode.get("token_type").asText());
+
+ String prettyJson = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(jsonNode);
+ System.out.println("Bearer Token Response:");
+ System.out.println(prettyJson);
+ }
+ }
+}
diff --git a/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/EAPIM_ErrorResponse_WorkHistory.md b/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/EAPIM_ErrorResponse_WorkHistory.md
new file mode 100644
index 0000000..e55730c
--- /dev/null
+++ b/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/EAPIM_ErrorResponse_WorkHistory.md
@@ -0,0 +1,218 @@
+# EAPIM 에러 응답 포맷 통일 작업 히스토리
+
+## 작업 배경
+
+### 목표
+모든 HTTP 에러 응답을 다음과 같은 표준 JSON 포맷으로 통일:
+```json
+{"error":"에러코드","error_description":"에러메시지"}
+```
+
+## 변경 내역
+
+### 1. MessageUtil 에러 포맷 정의
+**파일**: `elink-online-common/src/main/java/com/eactive/eai/common/util/MessageUtil.java`
+
+- 표준 에러 응답 포맷 정의
+ ```java
+ public static final String ERROR_MESSAGE_DEFAULT_FORMAT = "{\"error\":\"%s\",\"error_description\":\"%s\"}";
+ ```
+
+- 에러 코드 상수 추가
+ ```java
+ public static final String ERROR_CODE_AP_ERROR = "E.GW.AP_ERROR";
+ public static final String ERROR_CODE_AUTH_FAIL = "E.GW.AUTH_FAIL";
+ public static final String ERROR_CODE_SERVICE_NOT_FOUND = "E.GW.SERVICE_NOT_FOUND";
+ ```
+
+- 에러 메시지 생성 메서드
+ ```java
+ public static String makeJsonErrorMessage(String code, String msg)
+ public static String makeJsonErrorMessage(String code, String msg, String errorFormat)
+ ```
+
+### 2. 전역 ExceptionHandler 추가
+**파일**: `src/main/java/com/eactive/eai/authserver/config/WebMvcConfig.java` (신규 생성)
+
+Spring MVC 전역 예외 처리를 위한 `@ControllerAdvice` 클래스 추가
+
+**처리하는 예외**:
+- `HttpMessageNotReadableException` - HTTP 메시지 파싱 실패
+- `MethodArgumentNotValidException` - 유효성 검증 실패
+- `MissingServletRequestParameterException` - 필수 파라미터 누락
+- `BindException` - 바인딩 에러
+- `NoHandlerFoundException` - 404 Not Found (핸들러 없음)
+- `AuthenticationException` - 401 Unauthorized (인증 실패)
+- `AccessDeniedException` - 403 Forbidden (권한 없음)
+- `Exception` - 500 Internal Server Error (기타 예외)
+
+**동작 방식**:
+1. 예외 발생 시 적절한 HTTP 상태 코드 설정
+2. request에 `_authServerStatusCode`, `errorMessage` 속성 설정
+3. `/error.jsp`로 forward하여 표준 JSON 응답 생성
+
+### 3. error.jsp 수정
+**파일**: `WebContent/error.jsp`
+
+**변경 사항**:
+- 기존 HTML 에러 페이지를 JSON 응답으로 변경
+- `MessageUtil.makeJsonErrorMessage()` 호출하여 표준 포맷 응답 생성
+- HTTP 상태 코드에 따른 에러 코드 매핑:
+ - 401 → `ERROR_CODE_AUTH_FAIL`
+ - 404 → `ERROR_CODE_SERVICE_NOT_FOUND`
+ - 기타 → `ERROR_CODE_AP_ERROR`
+
+```jsp
+Integer statusCode = (Integer) request.getAttribute("_authServerStatusCode");
+if (statusCode != null) {
+ response.setStatus(statusCode);
+}
+
+String code;
+if (statusCode != null && statusCode == 401) {
+ code = MessageUtil.ERROR_CODE_AUTH_FAIL;
+} else if (statusCode != null && statusCode == 404) {
+ code = MessageUtil.ERROR_CODE_SERVICE_NOT_FOUND;
+} else {
+ code = MessageUtil.ERROR_CODE_AP_ERROR;
+}
+
+String message = (String)request.getAttribute("errorMessage");
+String jsonErrorMessage = MessageUtil.makeJsonErrorMessage(code, message);
+out.println(jsonErrorMessage);
+```
+
+### 4. WebSecurityConfig 에러 처리 추가
+**파일**: `src/main/java/com/eactive/eai/authserver/config/WebSecurityConfig.java`
+
+**변경 사항**:
+- Spring Security 레벨의 인증/권한 에러 처리 추가
+- `authenticationEntryPoint`: 401 Unauthorized → error.jsp 포워딩
+- `accessDeniedHandler`: 403 Forbidden → error.jsp 포워딩
+- `/error.jsp` 접근 허용 설정 추가
+
+### 5. web.xml 설정 추가
+**파일**: `WebContent/WEB-INF/web.xml`
+
+**변경 사항**:
+- DispatcherServlet에 `throwExceptionIfNoHandlerFound=true` 설정 추가
+ ```xml
+
+ throwExceptionIfNoHandlerFound
+ true
+
+ ```
+ → 핸들러 없을 시 `NoHandlerFoundException` 발생하도록 설정
+
+- error-page 매핑 (400, 401, 403, 404, 500 등)
+ ```xml
+
+ 404
+ /error.jsp
+
+ ```
+ → Servlet 레벨에서 발생한 에러도 error.jsp로 라우팅
+
+### 6. KjbMGOAuth2Controller 에러 처리 적용
+**파일**: `src/main/java/com/eactive/eai/authserver/custom/KjbMGOAuth2Controller.java`
+
+**변경 사항**:
+- `JwtAuthException`, 일반 예외 처리 시 `MessageUtil.makeJsonErrorMessage()` 사용
+- HTTP 400/401 에러를 표준 포맷으로 반환
+
+### 7. BearerTokenContoller 에러 처리 적용
+**파일**: `src/main/java/com/eactive/eai/authserver/custom/BearerTokenContoller.java`
+
+**변경 사항**:
+- `MessageUtil` import 추가
+- 기존 OAuth2 RFC 6749 에러 포맷을 MessageUtil 표준 포맷으로 변경
+- `JwtAuthException`: HTTP 401 + `ERROR_CODE_AUTH_FAIL`
+- 일반 예외: HTTP 500 + `ERROR_CODE_AP_ERROR`
+
+### 8. BearerTokenFilter 에러 처리 적용
+**파일**: `src/main/java/com/eactive/eai/authserver/custom/BearerTokenFilter.java`
+
+**변경 사항**:
+- `MessageUtil` import 추가
+- 필터에서 발생하는 에러 응답을 MessageUtil 표준 포맷으로 변경
+- `JwtAuthException`: HTTP 401 + `ERROR_CODE_AUTH_FAIL`
+- 일반 예외: HTTP 500 + `ERROR_CODE_AP_ERROR`
+- JSONObject 직접 생성 방식 제거
+
+### 9. ApiAdapterController 에러 처리 적용
+**파일**: `src/main/java/com/eactive/eai/adapter/controller/ApiAdapterController.java`
+
+**변경 사항**:
+- Adapter URI를 찾을 수 없는 경우: `ERROR_CODE_SERVICE_NOT_FOUND`
+- Adapter를 찾을 수 없는 경우: `ERROR_CODE_AP_ERROR`
+
+## 적용 범위
+
+### 처리되는 에러 시나리오
+
+1. **OAuth2 토큰 발급 실패** (`/mapi/oauth2/token`)
+ - 필수 파라미터 누락, 잘못된 grant_type, 인증 실패 등
+ - HTTP 400/401 + 표준 JSON 에러 응답
+
+2. **CA Bearer 토큰 발급 실패** (`/auth/oauth/v2/token`)
+ - 잘못된 grant_type, 존재하지 않는 client_id, 잘못된 client_secret, scope 오류 등
+ - HTTP 401/500 + 표준 JSON 에러 응답
+
+3. **Bearer 토큰 인증 실패** (`/api/auth/*`)
+ - 토큰 만료, 잘못된 토큰 등
+ - HTTP 401 + 표준 JSON 에러 응답
+
+4. **404 Not Found**
+ - 존재하지 않는 API 엔드포인트 호출
+ - HTTP 404 + 표준 JSON 에러 응답
+
+5. **400 Bad Request**
+ - 잘못된 JSON 포맷, 필수 파라미터 누락 등
+ - HTTP 400 + 표준 JSON 에러 응답
+
+6. **403 Forbidden**
+ - 권한 없는 리소스 접근
+ - HTTP 403 + 표준 JSON 에러 응답
+
+7. **500 Internal Server Error**
+ - 서버 내부 오류
+ - HTTP 500 + 표준 JSON 에러 응답
+
+## 테스트
+
+테스트 코드는 별도 모듈(`kjb-errors`)에 작성됨.
+
+**테스트 문서**: `kjb-errors/src/test/java/com/eactive/eai/kjb/errors/EAPIM_ExceptionHandler_Test.md`
+
+**주요 테스트**:
+- `OAuth2TokenSuccessTest` - OAuth2 토큰 발급 성공
+- `OAuth2BearerAuthTest` - Bearer 토큰 인증 성공
+- `OAuth2BearerAuth404ErrorTest` - Bearer 토큰 인증 후 404 에러
+- `ExceptionHandler400ErrorTest` - 400 에러 응답 검증
+- `ExceptionHandler404ErrorTest` - 404 에러 응답 검증
+- `ExceptionHandlerSuccessTest` - 일반 API 정상 응답
+- `BearerTokenSuccessTest` - CA Bearer 토큰 발급 성공
+- `BearerTokenErrorTest` - CA Bearer 토큰 발급 에러 (5가지 케이스)
+- `BearerTokenFilterErrorTest` - Bearer 토큰 필터 인증 실패
+
+**검증 항목**:
+- HTTP 상태 코드 정확성
+- 응답 포맷이 `{"error":"...","error_description":"..."}` 형식인지 확인
+- 에러 코드가 적절히 매핑되는지 확인
+
+## 에러 코드 매핑
+
+| HTTP Status | Error Code | 설명 |
+|-------------|-----------|------|
+| 400 | E.GW.AP_ERROR | Bad Request (잘못된 요청) |
+| 401 | E.GW.AUTH_FAIL | Unauthorized (인증 실패) |
+| 403 | E.GW.AP_ERROR | Forbidden (권한 없음) |
+| 404 | E.GW.SERVICE_NOT_FOUND | Not Found (서비스 없음) |
+| 500 | E.GW.AP_ERROR | Internal Server Error (서버 오류) |
+
+## 참고 사항
+
+### 주의사항
+- `MessageUtil.makeJsonErrorMessage()`는 메시지 내의 특수문자를 JSON escape 처리함
+- error.jsp는 JSON 응답만 출력하므로 브라우저에서 HTML로 보이지 않음
+- 상태 코드는 실제 HTTP 응답 상태 코드와 일치해야 함
diff --git a/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/EAPIM_ExceptionHandler_Test.md b/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/EAPIM_ExceptionHandler_Test.md
new file mode 100644
index 0000000..3d1cb0e
--- /dev/null
+++ b/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/EAPIM_ExceptionHandler_Test.md
@@ -0,0 +1,99 @@
+# EAPIM ExceptionHandler 테스트
+
+## 개요
+에러 응답이 `MessageUtil.makeJsonErrorMessage()` 포맷으로 통일되는지 검증
+
+**에러 응답 포맷**:
+```json
+{"error":"에러코드","error_description":"에러메시지"}
+```
+
+## 테스트 케이스
+
+### OAuth2 토큰 발급 성공 (OAuth2TokenSuccessTest)
+- **URL**: `http://127.0.0.1:30110/oauth/token`
+- **Content-Type**: `application/x-www-form-urlencoded`
+- **파라미터**: grant_type, client_id, client_secret, scope
+- **테스트 대상**: AuthorizationServerConfig 표준 OAuth2 토큰 발급
+- **검증**: HTTP 200, access_token, token_type, expires_in
+
+### Bearer 토큰 인증 성공 (OAuth2BearerAuthTest)
+- **Step 1**: 토큰 발급 (`/oauth/token`)
+- **Step 2**: Bearer 토큰으로 API 호출 (POST)
+- **URL**: `http://127.0.0.1:30110/api/auth/case009?transactionId=1234567890`
+- **Authorization**: `Bearer {access_token}`
+- **요청**: `{}`
+- **테스트 대상**: Bearer 토큰 인증 API
+- **검증**: HTTP 200, 정상 응답
+
+### Bearer 토큰 인증 404 에러 (OAuth2BearerAuth404ErrorTest)
+- **Step 1**: 토큰 발급 (`/oauth/token`)
+- **Step 2**: 존재하지 않는 API 호출 (POST)
+- **URL**: `http://127.0.0.1:30110/api/auth/caseXXX`
+- **Authorization**: `Bearer {access_token}`
+- **요청**: `{}`
+- **테스트 대상**: WebMvcConfig @ExceptionHandler(NoHandlerFoundException)
+- **검증**: HTTP 404, MessageUtil 포맷
+
+### 400 에러 (ExceptionHandler400ErrorTest)
+- **URL**: `http://127.0.0.1:30110/mapi/oauth2/token`
+- **요청**: `{}`
+- **테스트 대상**: KjbMGOAuth2Controller JwtAuthException 처리
+- **검증**: HTTP 400, MessageUtil 포맷
+
+### 404 에러 (ExceptionHandler404ErrorTest)
+- **URL**: `http://127.0.0.1:30110/oauth/token/v2`
+- **요청**: `{}`
+- **테스트 대상**: WebMvcConfig @ExceptionHandler(NoHandlerFoundException)
+- **검증**: HTTP 404, MessageUtil 포맷
+
+### 일반 API 정상 응답 (ExceptionHandlerSuccessTest)
+- **URL**: `http://localhost:30110/api/test/case001`
+- **요청**: `{"serviceId": "TST10001", "aaa": "aaaa", "bbb": "bbbb"}`
+- **테스트 대상**: 일반 컨트롤러 정상 응답
+- **검증**: HTTP 200, transactionId, status="approved"
+
+### Bearer 토큰 발급 성공 (BearerTokenSuccessTest)
+- **URL**: `http://127.0.0.1:30110/auth/oauth/v2/token`
+- **Content-Type**: `application/x-www-form-urlencoded`
+- **파라미터**: grant_type, client_id, client_secret, scope
+- **테스트 대상**: BearerTokenContoller CA Bearer Token 발급
+- **검증**: HTTP 200, access_token, token_type="Bearer", expires_in, scope
+
+### Bearer 토큰 발급 에러 (BearerTokenErrorTest)
+#### testCase001_잘못된GrantType
+- **URL**: `http://127.0.0.1:30110/auth/oauth/v2/token`
+- **grant_type**: `password` (잘못된 값)
+- **테스트 대상**: BearerTokenContoller JwtAuthException 처리
+- **검증**: HTTP 401, MessageUtil 포맷
+
+#### testCase002_존재하지않는ClientId
+- **URL**: `http://127.0.0.1:30110/auth/oauth/v2/token`
+- **client_id**: `INVALID_CLIENT_ID`
+- **테스트 대상**: BearerTokenContoller JwtAuthException 처리
+- **검증**: HTTP 401, MessageUtil 포맷
+
+#### testCase003_잘못된ClientSecret
+- **URL**: `http://127.0.0.1:30110/auth/oauth/v2/token`
+- **client_secret**: `WRONG_SECRET`
+- **테스트 대상**: BearerTokenContoller JwtAuthException 처리
+- **검증**: HTTP 401, MessageUtil 포맷
+
+#### testCase004_Scope없음
+- **URL**: `http://127.0.0.1:30110/auth/oauth/v2/token`
+- **scope**: `` (빈 값)
+- **테스트 대상**: BearerTokenContoller JwtAuthException 처리
+- **검증**: HTTP 401, MessageUtil 포맷
+
+#### testCase005_허용되지않은Scope
+- **URL**: `http://127.0.0.1:30110/auth/oauth/v2/token`
+- **scope**: `invalid_scope`
+- **테스트 대상**: BearerTokenContoller JwtAuthException 처리
+- **검증**: HTTP 401, MessageUtil 포맷
+
+### Bearer 토큰 필터 에러 (BearerTokenFilterErrorTest)
+- **URL**: `http://127.0.0.1:30110/api/auth/case009?transactionId=1234567890`
+- **Authorization**: `Bearer INVALID_TOKEN_12345`
+- **요청**: `{}`
+- **테스트 대상**: BearerTokenFilter JwtAuthException 처리
+- **검증**: HTTP 401, MessageUtil 포맷
diff --git a/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/ErrorResponseValidator.java b/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/ErrorResponseValidator.java
new file mode 100644
index 0000000..032ea78
--- /dev/null
+++ b/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/ErrorResponseValidator.java
@@ -0,0 +1,37 @@
+package com.eactive.eai.kjb.errors;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * MessageUtil.makeJsonErrorMessage 기본 포맷 검증 유틸리티
+ * 기본 포맷: {"error":"에러코드","error_description":"에러메시지"}
+ */
+public class ErrorResponseValidator {
+
+ private static final ObjectMapper objectMapper = new ObjectMapper();
+
+ /**
+ * MessageUtil.makeJsonErrorMessage 포맷 검증
+ * @param responseBody JSON 응답 문자열
+ * @throws Exception JSON 파싱 실패 시
+ */
+ public static void validateErrorFormat(String responseBody) throws Exception {
+ JsonNode jsonNode = objectMapper.readTree(responseBody);
+ assertNotNull(jsonNode, "JSON 응답이 null입니다");
+
+ assertTrue(jsonNode.has("error"), "error 필드가 존재해야 합니다");
+ assertTrue(jsonNode.has("error_description"), "error_description 필드가 존재해야 합니다");
+
+ assertNotNull(jsonNode.get("error").asText(), "error 값이 null입니다");
+ assertNotNull(jsonNode.get("error_description").asText(), "error_description 값이 null입니다");
+
+ // 검증 성공 시 Pretty Print
+ String prettyJson = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(jsonNode);
+ System.out.println("Validated Error Format:");
+ System.out.println(prettyJson);
+ }
+}
diff --git a/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/ExceptionHandler400ErrorTest.java b/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/ExceptionHandler400ErrorTest.java
new file mode 100644
index 0000000..bdbc547
--- /dev/null
+++ b/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/ExceptionHandler400ErrorTest.java
@@ -0,0 +1,44 @@
+package com.eactive.eai.kjb.errors;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.apache.hc.client5.http.classic.methods.HttpPost;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.io.entity.EntityUtils;
+import org.apache.hc.core5.http.io.entity.StringEntity;
+import org.junit.jupiter.api.Test;
+
+class ExceptionHandler400ErrorTest {
+
+ @Test
+ void testCase001_400에러() throws Exception {
+ // given
+ String url = TestConfig.getBaseUrl("/mapi/oauth2/token");
+
+ String requestBody = """
+ {}
+ """;
+
+ // when
+ try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+ HttpPost httpPost = new HttpPost(url);
+ httpPost.setHeader("Content-Type", "application/json");
+ httpPost.setHeader("Accept", "application/json");
+ httpPost.setEntity(new StringEntity(requestBody, ContentType.APPLICATION_JSON));
+
+ String responseBody = httpClient.execute(httpPost, response -> {
+ String body = EntityUtils.toString(response.getEntity());
+ System.out.println("Response Body: " + body);
+
+ // then
+ assertEquals(400, response.getCode());
+ return body;
+ });
+
+ // MessageUtil.makeJsonErrorMessage 기본 포맷 검증
+ ErrorResponseValidator.validateErrorFormat(responseBody);
+ }
+ }
+}
diff --git a/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/ExceptionHandler404ErrorTest.java b/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/ExceptionHandler404ErrorTest.java
new file mode 100644
index 0000000..a7e6532
--- /dev/null
+++ b/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/ExceptionHandler404ErrorTest.java
@@ -0,0 +1,44 @@
+package com.eactive.eai.kjb.errors;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.apache.hc.client5.http.classic.methods.HttpPost;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.io.entity.EntityUtils;
+import org.apache.hc.core5.http.io.entity.StringEntity;
+import org.junit.jupiter.api.Test;
+
+class ExceptionHandler404ErrorTest {
+
+ @Test
+ void testCase001_404에러() throws Exception {
+ // given
+ String url = TestConfig.getBaseUrl("/oauth/token/v2");
+
+ String requestBody = """
+ {}
+ """;
+
+ // when
+ try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+ HttpPost httpPost = new HttpPost(url);
+ httpPost.setHeader("Content-Type", "application/json");
+ httpPost.setHeader("Accept", "application/json");
+ httpPost.setEntity(new StringEntity(requestBody, ContentType.APPLICATION_JSON));
+
+ String responseBody = httpClient.execute(httpPost, response -> {
+ String body = EntityUtils.toString(response.getEntity());
+ System.out.println("Response Body: " + body);
+
+ // then
+ assertEquals(404, response.getCode());
+ return body;
+ });
+
+ // MessageUtil.makeJsonErrorMessage 기본 포맷 검증
+ ErrorResponseValidator.validateErrorFormat(responseBody);
+ }
+ }
+}
diff --git a/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/ExceptionHandlerSuccessTest.java b/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/ExceptionHandlerSuccessTest.java
new file mode 100644
index 0000000..a2f86d5
--- /dev/null
+++ b/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/ExceptionHandlerSuccessTest.java
@@ -0,0 +1,60 @@
+package com.eactive.eai.kjb.errors;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.apache.hc.client5.http.classic.methods.HttpPost;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.io.entity.EntityUtils;
+import org.apache.hc.core5.http.io.entity.StringEntity;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+class ExceptionHandlerSuccessTest {
+
+ private final ObjectMapper objectMapper = new ObjectMapper();
+
+ @Test
+ void testCase001_정상호출() throws Exception {
+ // given
+ String url = TestConfig.getBaseUrl("/api/test/case001");
+
+ String requestBody = """
+ {
+ "serviceId": "TST10001",
+ "aaa": "aaaa",
+ "bbb": "bbbb"
+ }
+ """;
+
+ // when
+ try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+ HttpPost httpPost = new HttpPost(url);
+ httpPost.setHeader("Content-Type", "application/json");
+ httpPost.setHeader("Accept", "application/json");
+ httpPost.setEntity(new StringEntity(requestBody, ContentType.APPLICATION_JSON));
+
+ String responseBody = httpClient.execute(httpPost, response -> {
+ assertEquals(200, response.getCode());
+ return EntityUtils.toString(response.getEntity());
+ });
+
+ // then
+ assertNotNull(responseBody);
+
+ JsonNode jsonNode = objectMapper.readTree(responseBody);
+ assertNotNull(jsonNode);
+
+ // validate
+ assertNotNull(jsonNode.get("transactionId"));
+ assertEquals("approved", jsonNode.get("status").asText());
+ String prettyJson = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(jsonNode);
+ System.out.println(prettyJson);
+ }
+ }
+}
diff --git a/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/OAuth2BearerAuth404ErrorTest.java b/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/OAuth2BearerAuth404ErrorTest.java
new file mode 100644
index 0000000..c368fe1
--- /dev/null
+++ b/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/OAuth2BearerAuth404ErrorTest.java
@@ -0,0 +1,78 @@
+package com.eactive.eai.kjb.errors;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.apache.hc.client5.http.classic.methods.HttpPost;
+import org.apache.hc.client5.http.entity.UrlEncodedFormEntity;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.http.io.entity.EntityUtils;
+import org.apache.hc.core5.http.io.entity.StringEntity;
+import org.apache.hc.core5.http.message.BasicNameValuePair;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class OAuth2BearerAuth404ErrorTest {
+
+ private final ObjectMapper objectMapper = new ObjectMapper();
+
+ @Test
+ void testCase001_Bearer인증_존재하지않는API_404에러() throws Exception {
+ // Step 1: 토큰 발급
+ String tokenUrl = TestConfig.getBaseUrl("/oauth2/token");
+ String accessToken;
+
+ try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+ HttpPost tokenPost = new HttpPost(tokenUrl);
+
+ List params = new ArrayList<>();
+ params.add(new BasicNameValuePair("grant_type", "client_credentials"));
+ params.add(new BasicNameValuePair("client_id", "AyeWx0OpYLJbHpZ21DDSxYfQPmD5Ckn8"));
+ params.add(new BasicNameValuePair("client_secret", "KwBYJT1m1v3SUvzN2HPHhy2Ad9Q2GADbgWkYZZg9Ybbc8R1uEuBJNQ9oVl13b1qiXwYvDWTaX0EanxY4SMjNfnBBsZzfNoMwwDPTb3IjQy5k3CRxTAYzcSnmzlC4FSsG"));
+ params.add(new BasicNameValuePair("scope", "api"));
+
+ tokenPost.setEntity(new UrlEncodedFormEntity(params));
+
+ String tokenResponse = httpClient.execute(tokenPost, response -> {
+ assertEquals(200, response.getCode(), "토큰 발급 실패");
+ return EntityUtils.toString(response.getEntity());
+ });
+
+ JsonNode tokenJson = objectMapper.readTree(tokenResponse);
+ accessToken = tokenJson.get("access_token").asText();
+ assertNotNull(accessToken, "access_token이 null입니다");
+
+ System.out.println("Access Token: " + accessToken);
+ }
+
+ // Step 2: 존재하지 않는 API 호출 (404 에러 예상)
+ String apiUrl = TestConfig.getBaseUrl("/api/auth/caseXXX");
+
+ try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+ HttpPost httpPost = new HttpPost(apiUrl);
+ httpPost.setHeader("Authorization", "Bearer " + accessToken);
+ httpPost.setHeader("Content-Type", "application/json");
+ httpPost.setEntity(new StringEntity("{}", ContentType.APPLICATION_JSON));
+
+ String responseBody = httpClient.execute(httpPost, response -> {
+ String body = EntityUtils.toString(response.getEntity());
+ System.out.println("Response Body: " + body);
+
+ // then
+ assertEquals(404, response.getCode(), "404 에러가 발생해야 합니다");
+ return body;
+ });
+
+ // MessageUtil.makeJsonErrorMessage 기본 포맷 검증
+ ErrorResponseValidator.validateErrorFormat(responseBody);
+ }
+ }
+}
diff --git a/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/OAuth2BearerAuthTest.java b/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/OAuth2BearerAuthTest.java
new file mode 100644
index 0000000..ca2b9d1
--- /dev/null
+++ b/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/OAuth2BearerAuthTest.java
@@ -0,0 +1,85 @@
+package com.eactive.eai.kjb.errors;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.apache.hc.client5.http.classic.methods.HttpPost;
+import org.apache.hc.client5.http.entity.UrlEncodedFormEntity;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.http.io.entity.EntityUtils;
+import org.apache.hc.core5.http.io.entity.StringEntity;
+import org.apache.hc.core5.http.message.BasicNameValuePair;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class OAuth2BearerAuthTest {
+
+ private final ObjectMapper objectMapper = new ObjectMapper();
+
+ @Test
+ void testCase001_Bearer인증_성공() throws Exception {
+ // Step 1: 토큰 발급
+ String tokenUrl = TestConfig.getBaseUrl("/oauth2/token");
+ String accessToken;
+
+ try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+ HttpPost tokenPost = new HttpPost(tokenUrl);
+
+ List params = new ArrayList<>();
+ params.add(new BasicNameValuePair("grant_type", "client_credentials"));
+ params.add(new BasicNameValuePair("client_id", "AyeWx0OpYLJbHpZ21DDSxYfQPmD5Ckn8"));
+ params.add(new BasicNameValuePair("client_secret", "KwBYJT1m1v3SUvzN2HPHhy2Ad9Q2GADbgWkYZZg9Ybbc8R1uEuBJNQ9oVl13b1qiXwYvDWTaX0EanxY4SMjNfnBBsZzfNoMwwDPTb3IjQy5k3CRxTAYzcSnmzlC4FSsG"));
+ params.add(new BasicNameValuePair("scope", "api"));
+
+ tokenPost.setEntity(new UrlEncodedFormEntity(params));
+
+ String tokenResponse = httpClient.execute(tokenPost, response -> {
+ assertEquals(200, response.getCode(), "토큰 발급 실패");
+ return EntityUtils.toString(response.getEntity());
+ });
+
+ JsonNode tokenJson = objectMapper.readTree(tokenResponse);
+ accessToken = tokenJson.get("access_token").asText();
+ assertNotNull(accessToken, "access_token이 null입니다");
+
+ System.out.println("Access Token: " + accessToken);
+ }
+
+ // Step 2: Bearer 토큰으로 인증 API 호출
+ String apiUrl = TestConfig.getBaseUrl("/api/auth/case009?transactionId=1234567890¶meterTest1=parameterTestValue1¶meterTest2=parameterTestValue2");
+
+ try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+ HttpPost httpPost = new HttpPost(apiUrl);
+ httpPost.setHeader("Authorization", "Bearer " + accessToken);
+ httpPost.setHeader("Content-Type", "application/json");
+
+ httpPost.setEntity(new StringEntity("{}", ContentType.APPLICATION_JSON));
+
+
+ String responseBody = httpClient.execute(httpPost, response -> {
+ String body = EntityUtils.toString(response.getEntity());
+ System.out.println("Response Body: " + body);
+
+ // then
+ assertEquals(200, response.getCode(), "Bearer 인증 실패");
+ return body;
+ });
+
+ // 응답 검증
+ JsonNode jsonNode = objectMapper.readTree(responseBody);
+ assertNotNull(jsonNode, "JSON 응답이 null입니다");
+
+ String prettyJson = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(jsonNode);
+ System.out.println("API Response:");
+ System.out.println(prettyJson);
+ }
+ }
+}
diff --git a/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/OAuth2TokenSuccessTest.java b/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/OAuth2TokenSuccessTest.java
new file mode 100644
index 0000000..a9f7e50
--- /dev/null
+++ b/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/OAuth2TokenSuccessTest.java
@@ -0,0 +1,64 @@
+package com.eactive.eai.kjb.errors;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.apache.hc.client5.http.classic.methods.HttpPost;
+import org.apache.hc.client5.http.entity.UrlEncodedFormEntity;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.http.io.entity.EntityUtils;
+import org.apache.hc.core5.http.message.BasicNameValuePair;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class OAuth2TokenSuccessTest {
+
+ private final ObjectMapper objectMapper = new ObjectMapper();
+
+ @Test
+ void testCase001_토큰발급성공() throws Exception {
+ // given
+ String url = TestConfig.getBaseUrl("/oauth2/token");
+
+ List params = new ArrayList<>();
+ params.add(new BasicNameValuePair("grant_type", "client_credentials"));
+ params.add(new BasicNameValuePair("client_id", "AyeWx0OpYLJbHpZ21DDSxYfQPmD5Ckn8"));
+ params.add(new BasicNameValuePair("client_secret", "KwBYJT1m1v3SUvzN2HPHhy2Ad9Q2GADbgWkYZZg9Ybbc8R1uEuBJNQ9oVl13b1qiXwYvDWTaX0EanxY4SMjNfnBBsZzfNoMwwDPTb3IjQy5k3CRxTAYzcSnmzlC4FSsG"));
+ params.add(new BasicNameValuePair("scope", "api"));
+
+ // when
+ try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+ HttpPost httpPost = new HttpPost(url);
+ httpPost.setEntity(new UrlEncodedFormEntity(params));
+
+ String responseBody = httpClient.execute(httpPost, response -> {
+ String body = EntityUtils.toString(response.getEntity());
+ System.out.println("Response Body: " + body);
+
+ // then
+ assertEquals(200, response.getCode());
+ return body;
+ });
+
+ // 응답 검증
+ JsonNode jsonNode = objectMapper.readTree(responseBody);
+ assertNotNull(jsonNode, "JSON 응답이 null입니다");
+
+ // OAuth2 토큰 응답 필드 확인
+ assertNotNull(jsonNode.get("access_token"), "access_token 필드가 없습니다");
+ assertNotNull(jsonNode.get("token_type"), "token_type 필드가 없습니다");
+ assertNotNull(jsonNode.get("expires_in"), "expires_in 필드가 없습니다");
+
+ String prettyJson = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(jsonNode);
+ System.out.println("Token Response:");
+ System.out.println(prettyJson);
+ }
+ }
+}
diff --git a/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/TestConfig.java b/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/TestConfig.java
new file mode 100644
index 0000000..ad2c912
--- /dev/null
+++ b/kjb-errors/src/test/java/com/eactive/eai/kjb/errors/TestConfig.java
@@ -0,0 +1,34 @@
+package com.eactive.eai.kjb.errors;
+
+public class TestConfig {
+
+ private static final String DEFAULT_HOST = "127.0.0.1";
+ private static final String DEFAULT_PORT = "30110";
+
+ /**
+ * 테스트 서버 호스트 반환
+ * 시스템 프로퍼티 test.host가 있으면 사용, 없으면 127.0.0.1
+ * @return 호스트 주소
+ */
+ public static String getHost() {
+ return System.getProperty("test.host", DEFAULT_HOST);
+ }
+
+ /**
+ * 테스트 서버 포트 반환
+ * 시스템 프로퍼티 test.port가 있으면 사용, 없으면 30110
+ * @return 포트 번호
+ */
+ public static String getPort() {
+ return System.getProperty("test.port", DEFAULT_PORT);
+ }
+
+ /**
+ * 테스트 베이스 URL 생성
+ * @param path API 경로 (예: "/oauth/token")
+ * @return 전체 URL
+ */
+ public static String getBaseUrl(String path) {
+ return String.format("http://%s:%s%s", getHost(), getPort(), path);
+ }
+}
diff --git a/libs/security-1.0.0.jar b/libs/security-1.0.0.jar
new file mode 100644
index 0000000..2e46994
Binary files /dev/null and b/libs/security-1.0.0.jar differ
diff --git a/src/main/java/com/eactive/eai/MessageKeyTest.java b/src/main/java/com/eactive/eai/MessageKeyTest.java
index f4e3e30..c7f2a12 100644
--- a/src/main/java/com/eactive/eai/MessageKeyTest.java
+++ b/src/main/java/com/eactive/eai/MessageKeyTest.java
@@ -178,7 +178,7 @@ public class MessageKeyTest {
}
private static void testXml() {
- System.out.println("\n=== XML 테스트 ===");
+ // System.out.println("\n=== XML 테스트 ===");
// 단순 경로 테스트
String xml1 = "SUCCESS callApi(HttpServletRequest servletRequest, HttpServletResponse servletResponse) throws Exception {
- // /ONLWeb/api/v1/public/getUserInfo.svc
- String apiUri = servletRequest.getRequestURI();
- // /api/v1/public/getUserInfo.svc
- apiUri = StringUtils.removeStart(apiUri, servletRequest.getContextPath());
- apiUri = StringUtils.removeEnd(apiUri, "/");
- HttpDynamicInAdapterUri adptUri = findAdptUri(apiUri, HttpDynamicInAdapterManager.getInstance());
+ public ResponseEntity callApi(HttpServletRequest servletRequest, HttpServletResponse servletResponse)
+ throws Exception {
+ // /ONLWeb/api/v1/public/getUserInfo.svc
+ String apiUri = servletRequest.getRequestURI();
+ // /api/v1/public/getUserInfo.svc
+ apiUri = StringUtils.removeStart(apiUri, servletRequest.getContextPath());
+ apiUri = StringUtils.removeEnd(apiUri, "/");
- if (logger.isDebug()) {
- logger.debug("ApiAdapterController] service request uri : " + servletRequest.getRequestURI());
- }
+ // ** jwhong TSEAIHS04의 api full path와 비교하여 adapter를 가져온다
+ String methodAndUri = servletRequest.getMethod() + "|" + apiUri;
+ HttpDynamicInAdapterUri adptUri = null;
+ String bzwkSvcKeyName = ""; // Adapter Group별 Action Class에 따라 구성이 달라짐. 예)
+ // _AGW_IN_RST_SyS:POST/account/{acc_no}
+ String adapterGrpName = ""; // Adapter Group명 예) _AGW_IN_RST_SyS : API_PATH(/api/test)
+ String apiSvcCode = ""; // eaiSvcCd 예) LONNCHCON00005S2
+ String apiFullPathKey = ""; // 예) POST|/api/test/account/list, POST|/api/test/account/{acc_no}
+ Map pathVariables = null;
+ try {
+ // PathVariable(ex:/api/test/account/{acc_no}) 대응 및 DAO조회 제거.
+ // /api/test/account/1234567 호출시 /api/test/account/{acc_no} API 로 식별.
+ STDMessageManager manager = STDMessageManager.getInstance();
+ STDMsgInfoAddOnVO stdMsgInfo = manager.getStdMsgInfoAddOn(methodAndUri);
+ bzwkSvcKeyName = stdMsgInfo.getBzwksvckeyname();
+ apiSvcCode = stdMsgInfo.getEaiSvcCd();
+ adapterGrpName = stdMsgInfo.gAdapterGroupName();
+ apiFullPathKey = stdMsgInfo.getApiFullPath();
+ if (STDMessageManager.isPathVariable(apiFullPathKey)) {
+ pathVariables = new AntPathMatcher().extractUriTemplateVariables(apiFullPathKey, methodAndUri);
+ }
- if (adptUri == null) {
- logError(servletRequest);
-// throw new Exception("can not find Adapter Uri");
- return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("can not find Adapter Uri");
- }
+ adptUri = findAdptUri(apiUri, HttpDynamicInAdapterManager.getInstance(), adapterGrpName);
+ } catch (Exception e) {
+ adptUri = null;
+ }
+ // ***
+ if (logger.isDebug()) {
+ logger.debug("ApiAdapterController] service request uri : " + servletRequest.getRequestURI());
+ }
- String adapterGroupName = adptUri.getAdptGrpName();
- String adapterName = adptUri.getAdptName();
- AdapterGroupVO adapterGroupVO = AdapterManager.getInstance().getAdapterGroupVO(adapterGroupName);
- AdapterVO adapterVO = AdapterManager.getInstance().getAdapterVO(adapterGroupName, adapterName);
- if (adapterVO == null) {
-// throw new Exception("Adapter not found error");
- return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Adapter not found error");
- }
+ if (adptUri == null) {
+ logError(servletRequest);
+ String errorMsg = MessageUtil.makeJsonErrorMessage(MessageUtil.ERROR_CODE_SERVICE_NOT_FOUND,
+ "can not find Adapter Uri");
+ return ResponseEntity.status(HttpStatus.NOT_FOUND).contentType(MediaType.APPLICATION_JSON).body(errorMsg);
+ }
- Properties httpProp = AdapterPropManager.getInstance().getProperties(adapterVO.getPropGroupName());
+ // Received time , jwhong
+ long receivedTimeMillis = System.currentTimeMillis(); // 밀리세컨 단위로 보내야함
+ String receivedTimeStr = String.valueOf(receivedTimeMillis);
- String adptMsgType = adapterVO.getAdapterGroupVO().getMessageType();
- String encode = StringUtils.defaultIfBlank(adapterGroupVO.getMessageEncode(), "UTF-8");
- MediaType mediaType = MediaType.valueOf("application/json;charset=" + encode);
- String errorResponseFormat = httpProp.getProperty(ERROR_RESPONSE_FORMAT);
-
- String responseType = httpProp.getProperty(RESPONSE_TYPE, "SYNC");
- ResponseEntity responseEntity = null;
- Properties transactionProp = new Properties();
- try {
- String responseData = service.callApi(servletRequest, servletResponse, httpProp, adapterGroupVO, adapterVO, transactionProp);
- // if (RESPONSE_TYPE_ASYNC.equals(responseType)) { // table의 값이 ASYNC 로 들어가 있는데 response_type_async는 ASYN 로 되어 있어 아래처럼 비교함 jwhong 2025
- if ("ASYNC".equals(responseType)) {
- //responseEntity = ResponseEntity.ok("dummy"); // comment by jwhong
- servletResponse.addHeader("traceId", responseData); // uuid를 response header에
- int httpStatus = servletResponse.getStatus();
- if (httpStatus == 200) {
- // 업체별 aync response message 가 다르다.
- String asyncMsgStyle = httpProp.getProperty("ASYNC_RTNMSG_TYPE", "").toUpperCase();
- String responseBody = makeResponseBodyMsg(asyncMsgStyle);
- responseEntity = ResponseEntity.status(httpStatus).contentType(mediaType).body(responseBody);
- // jwhong
- } else {
- responseEntity = ResponseEntity.status(httpStatus).contentType(mediaType).body(responseData);
- }
- } else {
+ String adapterGroupName = adptUri.getAdptGrpName();
+ String adapterName = adptUri.getAdptName();
+ AdapterGroupVO adapterGroupVO = AdapterManager.getInstance().getAdapterGroupVO(adapterGroupName);
+ AdapterVO adapterVO = AdapterManager.getInstance().getAdapterVO(adapterGroupName, adapterName);
+ if (adapterVO == null) {
+ String errorMsg = MessageUtil.makeJsonErrorMessage(MessageUtil.ERROR_CODE_AP_ERROR,
+ "Adapter not found error");
+ return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).contentType(MediaType.APPLICATION_JSON)
+ .body(errorMsg);
+ }
+
+ Properties httpProp = AdapterPropManager.getInstance().getProperties(adapterVO.getPropGroupName());
+
+ String adptMsgType = adapterVO.getAdapterGroupVO().getMessageType();
+ String encode = StringUtils.defaultIfBlank(adapterGroupVO.getMessageEncode(), "UTF-8");
+ MediaType mediaType = MediaType.valueOf("application/json;charset=" + encode);
+ String errorResponseFormat = httpProp.getProperty(ERROR_RESPONSE_FORMAT);
+
+ String responseType = httpProp.getProperty(RESPONSE_TYPE, "SYNC");
+ ResponseEntity responseEntity = null;
+ Properties transactionProp = new Properties();
+ // jwhong, put api received time, eaiSvcCode
+ transactionProp.put(INBOUND_REQUESTED_TIME, receivedTimeStr);
+ transactionProp.put(API_SERVICE_CODE, apiSvcCode);
+ if (pathVariables != null) {
+ transactionProp.put(INBOUND_PATH_VARIABLES, pathVariables);
+ }
+
+ try {
+ String responseData = service.callApi(servletRequest, servletResponse, httpProp, adapterGroupVO, adapterVO,
+ transactionProp);
+ // if (RESPONSE_TYPE_ASYNC.equals(responseType)) { // table의 값이 ASYNC 로 들어가 있는데
+ // response_type_async는 ASYN 로 되어 있어 아래처럼 비교함 jwhong 2025
+ if ("ASYNC".equals(responseType)) {
+ // responseEntity = ResponseEntity.ok("dummy"); // comment by jwhong
+ // servletResponse.addHeader("traceId", responseData); // uuid를 response header에
+ servletResponse.addHeader("traceId",
+ transactionProp.getProperty(TransactionContextKeys.TRANSACTION_UUID)); // uuid를 response header에
+ int httpStatus = servletResponse.getStatus();
+ if (httpStatus == 200) {
+ // 업체별 aync response message 가 다르다.
+ String asyncMsgStyle = httpProp.getProperty("ASYNC_RTNMSG_TYPE", "");
+ String responseBody = "";
+ boolean encryptAsyncAckApply = StringUtils
+ .equalsIgnoreCase(httpProp.getProperty("ASYNC_ENCRYPT_ACK", "N"), "Y");
+
+ if (asyncMsgStyle == null || asyncMsgStyle.trim().isEmpty()) {
+ responseBody = makeResponseBodyMsg();
+ } else {
+ responseBody = asyncMsgStyle;
+ }
+ if (encryptAsyncAckApply) {
+ responseBody = service.doPostEncryption(responseBody, transactionProp, servletRequest);
+ }
+
+ responseEntity = ResponseEntity.status(httpStatus).contentType(mediaType).body(responseBody);
+ // jwhong
+ } else {
+ responseEntity = ResponseEntity.status(httpStatus).contentType(mediaType).body(responseData);
+ }
+ } else {
// responseEntity = ResponseEntity.ok().contentType(mediaType).body(responseData);
// 버즈빌 포인트 적립 처리하기 위하여 정상응답이더라도 응답코드(apiRsltCd) 값이 200이 아닌 경우 처리를 위하여 수정
// Filter에서 설정한 response status값을 responseEntity 생성시 적용 modify by lwk 2025.03.24
- int httpStatus = servletResponse.getStatus();
- if (httpStatus != 200) {
- responseEntity = ResponseEntity.status(httpStatus).contentType(mediaType).body(responseData);
- } else {
- responseEntity = ResponseEntity.ok().contentType(mediaType).body(responseData);
- }
- }
- } catch (HttpStatusException e) {
- logger.warn("ApiAdapterController] " + adapterGroupName + "-" + adapterName + ">>" + e.getMessage());
- String errorMsg = MessageUtil.makeErrorMessageByMessageType(adptMsgType, encode, e.getCode(),
- e.getMessage(), errorResponseFormat);
- responseEntity = ResponseEntity.status(e.getStatus()).contentType(mediaType).body(errorMsg);
- } catch (JwtAuthException e) {
- logger.error(adapterGroupName + "-" + adapterName + ">>" + e.getMessage(), e);
- String errorMsg = MessageUtil.makeErrorMessageByMessageType(adptMsgType, encode, e.getCode(),
- e.getMessage(), errorResponseFormat);
- responseEntity = ResponseEntity.status(HttpStatus.UNAUTHORIZED).contentType(mediaType).body(errorMsg);
- } catch (Exception e) {
- logger.error(adapterGroupName + "-" + adapterName + ">>" + e.getMessage(), e);
- responseEntity = ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).contentType(mediaType).body(e);
- } finally {
- /**
- * 로깅 인터셉터에 데이터를 전달하기 위한 처리
- * 이미 거래처리가 끝나서 영향도가 없을만한 servletRequest에 Attribute로 전달
- * 추후 더 좋은방법이 생길경우 개선 요망
- */
- servletRequest.setAttribute(TransactionContextKeys.TRANSACTION_PROP, transactionProp);
- }
- return responseEntity;
- }
+ servletResponse.addHeader("traceId",
+ transactionProp.getProperty(TransactionContextKeys.TRANSACTION_UUID)); // uuid를 response header에
+ int httpStatus = servletResponse.getStatus();
+ if (httpStatus != 200) {
+ responseEntity = ResponseEntity.status(httpStatus).contentType(mediaType).body(responseData);
+ } else {
+ responseEntity = ResponseEntity.ok().contentType(mediaType).body(responseData);
+ }
+ }
-
- /**
- * url에서 뒤쪽 /이후를 제거하면서 찾는다. dataMap = new HashMap<>();
- dataMap.put("result", 1);
- Map map = new HashMap<>();
+ } catch (Exception e) {
+
- switch (asyncMsgStyle) {
- case "TB_SUC":
- map.put("rspCode", "TB_SUC_000");
- map.put("rspMsg", "정상");
- map.put("data", dataMap);
- break;
- case "ONLYDATA":
- map.put("data", dataMap);
- map.put("success", "true");
- break;
- default:
- map.put("code", "200");
- map.put("data", dataMap);
- map.put("message", "정상 처리 되었습니다.");
- break;
+ logger.error(adapterGroupName + "-" + adapterName + ">>" + e.getMessage(), e);
+
+ String errorMsg = null;
+
+ if( e instanceof HttpStatusException ) {
+ logger.warn("ApiAdapterController] " + adapterGroupName + "-" + adapterName + ">>" + e.getMessage());
+ HttpStatusException e1 = (HttpStatusException) e;
+ errorMsg = MessageUtil.makeErrorMessageByMessageType(adptMsgType, encode,
+ MessageUtil.ERROR_CODE_AP_ERROR, e1.getMessage(), errorResponseFormat);
+ responseEntity = ResponseEntity.status(e1.getStatus()).contentType(mediaType).body(errorMsg);
+ }
+ else if( e instanceof JwtAuthException )
+ {
+ logger.error(adapterGroupName + "-" + adapterName + ">>" + e.getMessage(), e);
+ errorMsg = MessageUtil.makeErrorMessageByMessageType(adptMsgType, encode,
+ MessageUtil.ERROR_CODE_AUTH_FAIL, e.getMessage(), errorResponseFormat);
+ responseEntity = ResponseEntity.status(HttpStatus.UNAUTHORIZED).contentType(mediaType).body(errorMsg);
+ }
+ else
+ {
+ logger.error(adapterGroupName + "-" + adapterName + ">>" + e.getMessage(), e);
+ errorMsg = MessageUtil.makeErrorMessageByMessageType(adptMsgType, encode,
+ MessageUtil.ERROR_CODE_AP_ERROR, e.getMessage(), errorResponseFormat);
+ responseEntity = ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).contentType(mediaType)
+ .body(errorMsg);
+ }
+ String postFilterNames = httpProp.getProperty("POST_FILTERS","");
+
+ if( postFilterNames.contains("HMAC_SHA256") ) {
+ HttpAdapterFilter filter = HttpAdapterFilterFactoryKjb.createFilter("HMAC_SHA256");
+ filter.doPostFilter(adapterGrpName, postFilterNames, errorMsg, transactionProp, servletRequest, servletResponse);
+ }
+
+
+ } finally {
+ /**
+ * 로깅 인터셉터에 데이터를 전달하기 위한 처리 이미 거래처리가 끝나서 영향도가 없을만한 servletRequest에 Attribute로 전달
+ * 추후 더 좋은방법이 생길경우 개선 요망
+ */
+ try {
+
+ servletRequest.setAttribute(TransactionContextKeys.TRANSACTION_PROP, transactionProp);
+
+ if (!"ASYNC".equals(responseType)) {
+ String uuid = transactionProp.getProperty(TransactionContextKeys.TRANSACTION_UUID);
+ String url = transactionProp.getProperty(HttpClientAdapterServiceKey.INBOUND_EXTURI);
+ String method = transactionProp.getProperty(HttpClientAdapterServiceKey.INBOUND_METHOD);
+ int httpStatusCode = servletResponse.getStatus();
+
+ Map headerMap = new HashMap<>();
+ // 응답 헤더 로깅
+ for (String headerName : servletResponse.getHeaderNames()) {
+ String headerValue = servletResponse.getHeader(headerName);
+ logger.debug(String.format("httpHeader logging headerKey=%s, headerValue=%s",
+ headerName, headerValue));
+ headerMap.put(headerName, headerValue);
+ }
+ //HttpAdapterExtraLogUtil.insertHttpAdapterExtraLog(uuid, 400, adapterGroupName,adapterName, headerMap, url, method, httpStatusCode);
+ }
+ } catch (Exception e) {
+ logger.warn("http header db logging fail.", e);
+ }
}
-
- JSONObject json = new JSONObject();
- json.putAll(map);
-
- return json.toJSONString();
- }
+ return responseEntity;
+ }
+ /**
+ * url에서 뒤쪽 /이후를 제거하면서 찾는다. entry : manager.adptUriMap.entrySet()) {
+ HttpDynamicInAdapterUri uriObj = entry.getValue();
+ logger.warn("GroupName=" + uriObj.getAdptGrpName() + ", AdapterName=" + uriObj.getAdptName() + ", URI="
+ + uriObj.getUri());
+ }
+ logger.warn("================================");
+
+ //
+ for (int i = 0; i < 10; i++) {
+ HttpDynamicInAdapterUri adptUri = manager.getAdptUri(apiUri);
+ if (adptUri != null) {
+ if (adptUri.getAdptGrpName().equals(adapterGrpName)) {
+ return adptUri;
+ }
+ }
+
+ // /api/v1/public
+ apiUri = StringUtils.substringBeforeLast(apiUri, "/");
+ if (apiUri.length() < 4) { // /api
+ return null;
+ }
+ }
+
+ return null;
+ }
+
+ private void logError(HttpServletRequest request) {
+ InboundErrorInfoVO errorInfoVO = new InboundErrorInfoVO();
+
+ EAIServerManager eaiServerManager = EAIServerManager.getInstance();
+ String serverName = eaiServerManager.getLocalServerName();
+ String uuid = null;
+ StringBuffer sb = new StringBuffer();
+
+ String instanceid1 = serverName.substring(0, 2);
+ String instanceid2 = serverName.substring(serverName.length() - 2, serverName.length());
+ String instid = instanceid1 + instanceid2;
+ uuid = instid + UUIDGenerator.getUUID();
+
+ String[] msgArgs = new String[1];
+ msgArgs[0] = request.getRequestURI();
+
+ String errorCode = "RECEAIIRP010";
+ String errorMsg = ExceptionUtil.make(new Exception("cat not find uri"), errorCode, msgArgs);
+
+ errorInfoVO.setEaiSvcSno(uuid); // EAI서비스일련번호
+ errorInfoVO.setAdptBwkGrpNm("HTTP_IN_NO_URI"); // 어댑터업무그룹명
+ errorInfoVO.setErrCd(errorCode); // 에러코드
+ errorInfoVO.setErrTxt(errorMsg); // 에러내용
+ errorInfoVO.setErrTm(DatetimeUtil.getCurrentTime(new Date().getTime())); // 에러발생시각
+ errorInfoVO.setErrDstcd(" ");
+ sb.append("Remote Addr : ").append(request.getRemoteAddr()).append("\n").append("Request URI : ")
+ .append(request.getRequestURI());
+ errorInfoVO.setBwkDataTxt(sb.toString()); // 업무데이터내용
+ errorInfoVO.setEaiSvrInstNm(serverName); // EAI서버인스턴스명
+
+ InboundErrorLogger.error(errorInfoVO);
+ }
+
+ private String makeResponseBodyMsg() {
+
+ Map dataMap = new HashMap<>();
+ dataMap.put("result", 1);
+ Map map = new HashMap<>();
+
+ map.put("code", "200");
+ map.put("data", dataMap);
+ map.put("message", "정상 처리 되었습니다.");
+
+ JSONObject json = new JSONObject();
+ json.putAll(map);
+
+ return json.toJSONString();
+ }
+
+ /*
+ * private String makeResponseBodyMsg(String asyncMsgStyle) {
+ *
+ * Map dataMap = new HashMap<>(); dataMap.put("result", 1);
+ * Map map = new HashMap<>();
+ *
+ * switch (asyncMsgStyle) { case "TB_SUC": map.put("rspCode", "TB_SUC_000");
+ * map.put("rspMsg", "정상"); map.put("data", dataMap); break; case "ONLYDATA":
+ * map.put("data", dataMap); map.put("success", "true"); break; default:
+ * map.put("code", "200"); map.put("data", dataMap); map.put("message",
+ * "정상 처리 되었습니다."); break; }
+ *
+ * JSONObject json = new JSONObject(); json.putAll(map);
+ *
+ * return json.toJSONString(); }
+ */
}
\ No newline at end of file
diff --git a/src/main/java/com/eactive/eai/adapter/controller/ApiRequestBodyFilter.java b/src/main/java/com/eactive/eai/adapter/controller/ApiRequestBodyFilter.java
new file mode 100644
index 0000000..ae36fc3
--- /dev/null
+++ b/src/main/java/com/eactive/eai/adapter/controller/ApiRequestBodyFilter.java
@@ -0,0 +1,157 @@
+package com.eactive.eai.adapter.controller;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.charset.Charset;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import com.eactive.eai.adapter.AdapterGroupVO;
+import com.eactive.eai.adapter.AdapterManager;
+import com.eactive.eai.adapter.http.dynamic.HttpDynamicInAdapterManager;
+import com.eactive.eai.adapter.http.dynamic.HttpDynamicInAdapterUri;
+import com.eactive.eai.common.stdmessage.STDMessageManager;
+import com.eactive.eai.common.stdmessage.STDMsgInfoAddOnVO;
+
+
+public class ApiRequestBodyFilter extends OncePerRequestFilter {
+
+ static final String KJB_ROOTLESS_ARRAY = "{ \"KJB_ROOTLESS_ARRAY\" : ";
+
+ @Override
+ protected void doFilterInternal(HttpServletRequest request,
+ HttpServletResponse response,
+ FilterChain filterChain)
+ throws ServletException, IOException {
+
+ if (!isTarget(request)) {
+ filterChain.doFilter(request, response);
+ return;
+ }
+
+
+ String encoding = getInboundGroupAdapterEncoding(request);
+
+
+
+ //원본 바디를 byte[]로 읽기 (개행 포함 그대로) 왜? 뒤에 필터에서 HMAC값 계산할수도 있어서 변조되면 안됨. 개행문자도 그대로 가야함.
+ byte[] rawBody = readBodyAsBytes(request);
+
+ if (rawBody == null || rawBody.length == 0) {
+ filterChain.doFilter(request, response);
+ return;
+ }
+
+ byte[] finalBody = rawBody;
+
+ try {
+
+ String bodyStr = new String(rawBody, encoding);
+ Object json = JSONValue.parse(bodyStr);
+
+ if (json instanceof JSONArray) {
+ bodyStr = KJB_ROOTLESS_ARRAY + bodyStr + "}";
+ finalBody = bodyStr.getBytes(encoding);
+ }
+
+ } catch (Exception e) {
+ // JSON 파싱 실패 시 원본 유지
+ finalBody = rawBody;
+ }
+
+ // Wrapper로 재주입
+ HttpServletRequest wrapped =
+ new CachedBodyHttpServletRequest(request, finalBody);
+
+ filterChain.doFilter(wrapped, response);
+ }
+
+ private boolean isTarget(HttpServletRequest request) {
+ String uri = request.getRequestURI();
+ // token 이 포함되면 무조건 제외
+ if (uri.contains("/token")) {
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+
+ private byte[] readBodyAsBytes(HttpServletRequest request) throws IOException {
+ try (ServletInputStream is = request.getInputStream();
+ ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+
+ byte[] buffer = new byte[4096];
+ int len;
+ while ((len = is.read(buffer)) != -1) {
+ baos.write(buffer, 0, len);
+ }
+ return baos.toByteArray();
+ }
+ }
+
+ private String getInboundGroupAdapterEncoding(HttpServletRequest request) {
+ String apiUri = request.getRequestURI();
+ apiUri = StringUtils.removeStart(apiUri, request.getContextPath());
+ apiUri = StringUtils.removeEnd(apiUri, "/");
+
+ String methodAndUri = request.getMethod() + "|" + apiUri;
+ String adapterGrpName;
+ HttpDynamicInAdapterUri adptUri = null;
+
+ try {
+ STDMessageManager manager = STDMessageManager.getInstance();
+ STDMsgInfoAddOnVO stdMsgInfo = manager.getStdMsgInfoAddOn(methodAndUri);
+ adapterGrpName = stdMsgInfo.gAdapterGroupName();
+
+ adptUri = findAdptUri(apiUri, HttpDynamicInAdapterManager.getInstance(), adapterGrpName);
+
+ AdapterGroupVO adapterGroupVO = AdapterManager.getInstance().getAdapterGroupVO(adptUri.getAdptGrpName());
+
+ if (adapterGroupVO == null) {
+ return Charset.defaultCharset().name();
+ }
+
+ return StringUtils.isNotBlank(adapterGroupVO.getMessageEncode()) ? adapterGroupVO.getMessageEncode()
+ : Charset.defaultCharset().name(); // 서버 jvm file.encoding 확인, file.encoding=utf-8 주고있음.
+
+ } catch (Exception e) {
+ logger.warn("Received a transaction with an unknown interface ID", e);
+ return Charset.defaultCharset().name();// utf-8
+ }
+
+ }
+
+ private HttpDynamicInAdapterUri findAdptUri(String apiUri, HttpDynamicInAdapterManager manager, String adapterGrpName) throws Exception {
+ if (StringUtils.isBlank(apiUri)) {
+ return null;
+ }
+
+
+ for (int i = 0; i < 10; i++) {
+ HttpDynamicInAdapterUri adptUri = manager.getAdptUri(apiUri);
+ if (adptUri != null) {
+ if (adptUri.getAdptGrpName().equals(adapterGrpName)) {
+ return adptUri;
+ }
+ }
+
+ apiUri = StringUtils.substringBeforeLast(apiUri, "/");
+ if (apiUri.length() < 4) { // /api
+ return null;
+ }
+ }
+
+ return null;
+ }
+}
diff --git a/src/main/java/com/eactive/eai/adapter/controller/ApiResponseAdvice.java b/src/main/java/com/eactive/eai/adapter/controller/ApiResponseAdvice.java
new file mode 100644
index 0000000..8fb5489
--- /dev/null
+++ b/src/main/java/com/eactive/eai/adapter/controller/ApiResponseAdvice.java
@@ -0,0 +1,55 @@
+package com.eactive.eai.adapter.controller;
+
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+import org.springframework.core.MethodParameter;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.server.ServerHttpRequest;
+import org.springframework.http.server.ServerHttpResponse;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
+
+@RestControllerAdvice
+public class ApiResponseAdvice implements ResponseBodyAdvice {
+
+ static final String KJB_ROOTLESS_ARRAY = "{ \"KJB_ROOTLESS_ARRAY\" : ";
+
+ @Override
+ public boolean supports(MethodParameter returnType, Class> converterType) {
+ // TODO Auto-generated method stub
+ return true;
+ }
+
+ @Override
+ public Object beforeBodyWrite(Object body, MethodParameter returnType, MediaType selectedContentType,
+ Class> selectedConverterType, ServerHttpRequest request,
+ ServerHttpResponse response) {
+
+ if (body instanceof String) {
+
+ return removeRootlessArrayKeyFormResponseBody((String) body);
+ }
+
+ return body;
+ }
+
+ String removeRootlessArrayKeyFormResponseBody(String body) {
+
+ try {
+ Object root = JSONValue.parse(body);
+
+ if (root instanceof JSONObject && ((JSONObject) root).containsKey("KJB_ROOTLESS_ARRAY")) {
+ JSONArray jsonArray = (JSONArray) ((JSONObject) root).get("KJB_ROOTLESS_ARRAY");
+ return jsonArray.toJSONString();
+ } else {
+ return body;
+ }
+ } catch (Exception e) {
+ return body;
+ }
+
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/eactive/eai/adapter/controller/CachedBodyHttpServletRequest.java b/src/main/java/com/eactive/eai/adapter/controller/CachedBodyHttpServletRequest.java
new file mode 100644
index 0000000..c3c0f9e
--- /dev/null
+++ b/src/main/java/com/eactive/eai/adapter/controller/CachedBodyHttpServletRequest.java
@@ -0,0 +1,51 @@
+package com.eactive.eai.adapter.controller;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.InputStreamReader;
+
+import javax.servlet.ReadListener;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+
+public class CachedBodyHttpServletRequest extends HttpServletRequestWrapper {
+
+ private final byte[] cachedBody;
+
+ public CachedBodyHttpServletRequest(HttpServletRequest request, byte[] body) {
+ super(request);
+ this.cachedBody = body;
+ }
+
+ @Override
+ public ServletInputStream getInputStream() {
+ ByteArrayInputStream bais = new ByteArrayInputStream(cachedBody);
+
+ return new ServletInputStream() {
+ @Override
+ public int read() {
+ return bais.read();
+ }
+
+ @Override
+ public boolean isFinished() {
+ return bais.available() == 0;
+ }
+
+ @Override
+ public boolean isReady() {
+ return true;
+ }
+
+ @Override
+ public void setReadListener(ReadListener readListener) {
+ }
+ };
+ }
+
+ @Override
+ public BufferedReader getReader() {
+ return new BufferedReader(new InputStreamReader(getInputStream()));
+ }
+ }
diff --git a/src/main/java/com/eactive/eai/adapter/interceptor/HttpResponseLoggingInterceptor.java b/src/main/java/com/eactive/eai/adapter/interceptor/HttpResponseLoggingInterceptor.java
index a61cede..2a8f8e3 100644
--- a/src/main/java/com/eactive/eai/adapter/interceptor/HttpResponseLoggingInterceptor.java
+++ b/src/main/java/com/eactive/eai/adapter/interceptor/HttpResponseLoggingInterceptor.java
@@ -4,6 +4,8 @@ import com.eactive.eai.adapter.http.client.HttpClientAdapterServiceKey;
import com.eactive.eai.adapter.http.dynamic.HttpAdapterServiceKey;
import com.eactive.eai.common.TransactionContextKeys;
import com.eactive.eai.common.util.HttpAdapterExtraLogUtil;
+import com.eactive.eai.common.util.Logger;
+
import org.apache.commons.lang.StringUtils;
import org.springframework.web.servlet.HandlerInterceptor;
@@ -14,11 +16,17 @@ import java.util.Map;
import java.util.Properties;
public class HttpResponseLoggingInterceptor implements HandlerInterceptor {
-
+
+ static Logger logger = Logger.getLogger(Logger.LOGGER_DEFAULT);
+
@Override
public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
+
+ logger.debug("httpHeader logging Interceptor start");
+
Properties transactionProp = (Properties) request.getAttribute(TransactionContextKeys.TRANSACTION_PROP);
if(transactionProp == null || "ASYN".equals(transactionProp.getProperty(HttpAdapterServiceKey.INBOUND_SYNC_ASYNC_TYPE))){
+ logger.debug("httpHeader logging Interceptor ASYNC");
return;
}
@@ -27,6 +35,8 @@ public class HttpResponseLoggingInterceptor implements HandlerInterceptor {
String adapterName = transactionProp.getProperty(HttpClientAdapterServiceKey.ADAPTER_NAME);
String url = transactionProp.getProperty(HttpClientAdapterServiceKey.INBOUND_EXTURI);
String method = transactionProp.getProperty(HttpClientAdapterServiceKey.INBOUND_METHOD);
+
+ logger.debug(String.format( "httpHeader logging Interceptor uuid=%s, adapterGroupName=%s, adapterName=%s, url=%s, method=%s", uuid, adapterGroupName, adapterName, url, method));
if(StringUtils.isBlank(uuid) || StringUtils.isBlank(adapterGroupName)){
return;
@@ -36,6 +46,7 @@ public class HttpResponseLoggingInterceptor implements HandlerInterceptor {
// 응답 헤더 로깅
for (String headerName : response.getHeaderNames()) {
String headerValue = response.getHeader(headerName);
+ logger.debug(String.format( "httpHeader logging Interceptor headerKey=%s, headerValue=%s", headerName, headerValue));
headerMap.put(headerName, headerValue);
}
diff --git a/src/main/java/com/eactive/eai/adapter/service/ApiAdapterService.java b/src/main/java/com/eactive/eai/adapter/service/ApiAdapterService.java
index 88a46f3..fb0c4d3 100644
--- a/src/main/java/com/eactive/eai/adapter/service/ApiAdapterService.java
+++ b/src/main/java/com/eactive/eai/adapter/service/ApiAdapterService.java
@@ -51,6 +51,7 @@ import java.io.IOException;
import java.io.ObjectInputStream;
import org.springframework.security.oauth2.provider.ClientDetails;
import com.nimbusds.jwt.SignedJWT;
+import com.eactive.eai.common.context.ElinkTransactionContext;
@Service
@@ -68,6 +69,7 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
private static final String FILE_GROUP_NAME = "image-file";
private static final String UPLOAD_ROOT_PATH = "UPLOAD_ROOT_PATH";
public static final String PAYLOAD_PARAM_NAME_CLIENT_ID = "client_id"; // jwhong
+ private boolean encryptResponseApply; // inbound에 대한 응답 암호화 여부 flag
public String callApi(HttpServletRequest request, HttpServletResponse response, Properties httpProp, AdapterGroupVO adapterGroupVO, AdapterVO adapterVO, Properties transactionProp) throws Exception {
int traceLevel = 0;
@@ -76,7 +78,6 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
String adptGrpName = adapterGroupVO.getName();
String adptName = adapterVO.getName();
-
String urlDecodeYn = httpProp.getProperty(URL_DECODE_YN, "N");
String encode = StringUtils.defaultIfBlank(adapterGroupVO.getMessageEncode(), "UTF-8");
@@ -93,6 +94,7 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
transactionProp.put(INBOUND_METHOD, request.getMethod());
transactionProp.put(INBOUND_URI, request.getRequestURI());
transactionProp.put(INBOUND_HEADER, getHeaders(request));
+ transactionProp.put(INBOUND_EXTPARAMS, StringUtils.defaultString(request.getQueryString()));
if (StringUtils.equals(adapterVO.getAdapterGroupVO().getType(), Keys.TYPE_REST)
|| StringUtils.equals(adapterVO.getAdapterGroupVO().getType(), Keys.TYPE_HTTP_CUSTOM)) {
// /api/v1/public/getUserInfo.svc
@@ -116,12 +118,20 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
transactionProp.put(HEADER_NAME_CLIENT_ID, getHeaders(request).get(HEADER_NAME_CLIENT_ID));
}
transactionProp.put(ENCRYPT_BASE_TYPE, httpProp.getProperty(ENCRYPT_BASE_TYPE, "")); //jwhong
- //transactionProp.put(INBOUND_TOKEN, getHeaders(request).get(INBOUND_TOKEN)); // jwhong
- transactionProp.put(INBOUND_TOKEN, getHeaders(request).get(INBOUND_TOKEN) != null ? getHeaders(request).get(INBOUND_TOKEN) : ""); //jwhong , null 이면 default로 "" put
+// //transactionProp.put(INBOUND_TOKEN, getHeaders(request).get(INBOUND_TOKEN)); // jwhong
+// transactionProp.put(INBOUND_TOKEN, getHeaders(request).get(INBOUND_TOKEN) != null ? getHeaders(request).get(INBOUND_TOKEN) : ""); //jwhong , null 이면 default로 "" put
+ String inboundToken = getHeaders(request).getOrDefault(INBOUND_TOKEN, "").toString();
+ if (StringUtils.isNotBlank(inboundToken) && StringUtils.startsWith(inboundToken, "Bearer ")) {
+ inboundToken = inboundToken.substring(7);
+ }
+ transactionProp.put(INBOUND_TOKEN, inboundToken);
transactionProp.put(ENCRYPT_AES256_IV, httpProp.getProperty(ENCRYPT_AES256_IV, "")); //jwhong
transactionProp.put(ENCRYPT_AES256_KEY, httpProp.getProperty(ENCRYPT_AES256_KEY, "")); //jwhong
+
+ // SEED 컬럼암호하 시 Key로 사용함
+ String seedkey = getHeaders(request).getOrDefault("x-obp-partnercode", "").toString();
+ ElinkTransactionContext.setSeedKey(seedkey);
-
try {
traceLevel = Integer.parseInt(traceLevelTemp);
} catch (Exception e) {
@@ -142,6 +152,8 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
case PUT:
if (StringUtils.contains(request.getContentType(), "application/x-www-form-urlencoded")) {
isParameterType = true;
+ } else if ( StringUtils.isNoneBlank(request.getQueryString()) ) { // jwhong
+ isParameterType = true;
} else {
isParameterType = false;
}
@@ -152,6 +164,7 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
if (isParameterType) {
paramValue = request.getQueryString();
+ transactionProp.put(INBOUND_QUERY_STRING, StringUtils.defaultString(paramValue)); // Filter에서 QueryString 검증을 위해 저장
if (paramValue == null)
paramValue = "";
if (traceLevel >= 3) {
@@ -195,40 +208,46 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
logger.debug("HttpAdapterServiceRest] RECV (" + adptGrpName + ") = [" + paramValue + "]\n"
+ CommonLib.getDumpMessage(paramValue.getBytes(encode)));
}
- } else {
- ServletInputStream sis = request.getInputStream();
- ByteBuffer bb = ByteBuffer.allocate(1024).setAutoExpand(true);
- int i = 0;
- byte[] cbuf = new byte[1024];
- while ((i = sis.read(cbuf, 0, 1024)) != -1) {
- if (i == 1024) {
- bb.put(cbuf);
- } else {
- byte[] tail = new byte[i];
- System.arraycopy(cbuf, 0, tail, 0, i);
- bb.put(tail);
- }
- }
- byte[] data = new byte[bb.position()];
- bb.position(0);
- bb.get(data);
- paramValue = new String(data, encode);
+ } else {
+ if (request.getContentLength() > 0) {
+ ServletInputStream sis = request.getInputStream();
+ ByteBuffer bb = ByteBuffer.allocate(1024).setAutoExpand(true);
+ int i = 0;
+ byte[] cbuf = new byte[1024];
+ while ((i = sis.read(cbuf, 0, 1024)) != -1) {
+ if (i == 1024) {
+ bb.put(cbuf);
+ } else {
+ byte[] tail = new byte[i];
+ System.arraycopy(cbuf, 0, tail, 0, i);
+ bb.put(tail);
+ }
+ }
+ byte[] data = new byte[bb.position()];
+ bb.position(0);
+ bb.get(data);
+ paramValue = new String(data, encode);
- if (traceLevel >= 3) {
- HttpMemoryLogger.txlog(adptGrpName + adptName,
- "RECV " + "[" + paramValue + "]" + CommonLib.getDumpMessage(data));
- }
-
- if (logger.isDebug()) {
- logger.debug("HttpAdapterServiceRest] RECV (" + adptGrpName + ") = [" + paramValue + "]\n"
- + CommonLib.getDumpMessage(data));
- }
- }
+ if (traceLevel >= 3) {
+ HttpMemoryLogger.txlog(adptGrpName + adptName,
+ "RECV " + "[" + paramValue + "]" + CommonLib.getDumpMessage(data));
+ }
+
+ if (logger.isDebug()) {
+ logger.debug("HttpAdapterServiceRest] RECV (" + adptGrpName + ") = [" + paramValue + "]\n"
+ + CommonLib.getDumpMessage(data));
+ }
+ }
+ }
if (paramValue == null) { // parameter가 없는 경우때문에 처리
paramValue = "";
- }
- else { // jwhong decrypt
+ }
+ // 순수한 Body값을 저장을 위해 위치 변경.
+ transactionProp.put(INBOUND_REQUEST_MESSAGE, paramValue);
+
+ // paramValue가 null이 아닌 빈문자열(""," ")인 경우에 대비하여 조건 수정.
+ if (StringUtils.isNotBlank(paramValue)) { // jwhong decrypt
paramValue = doPreDecryption(paramValue, transactionProp, request);
}
@@ -284,7 +303,8 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
message = "";
}
- transactionProp.put(INBOUND_REQUEST_MESSAGE, message);
+ // 위치변경 : 가공되지 않은 Body값을 저장하기 위하여 위쪽으로 이동.
+// transactionProp.put(INBOUND_REQUEST_MESSAGE, message);
// 로컬 서비스 호출 ,encoding 처리 추가
String result = (String) service(adptGrpName, adptName, message, transactionProp, request, response);
@@ -310,34 +330,20 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
result = mapper.writeValueAsString(rootNode);
}
}
-
- // ASYNC 인 경우 광주은행은 RETURN 해 주는 값들이 수정되어야 한다. JWHONG
- /*
- if ("ASYN".equals(syncAsyncType) && MessageType.JSON.equals(adptMsgType) && StringUtils.isNotBlank(headerGroupName)) {
- ObjectMapper mapper = new ObjectMapper();
- ObjectNode rootNode = (ObjectNode) mapper.readTree(result);
- JsonNode headerGroup = rootNode.get(headerGroupName);
- if(headerGroup != null) {
- for(Iterator it = headerGroup.fieldNames(); it.hasNext();) {
- String name = it.next();
- String value = headerGroup.get(name).asText();
- response.addHeader(name, value);
- }
- rootNode.remove(headerGroupName);
- result = mapper.writeValueAsString(rootNode);
- }
- }
- */
-
- // KJBank는 요청에 대한 응답 (Sync응답, Aync 에 대한 Ack응답) 에 대하여 암호화 하지 않는다. 무조건 안한다. 따라서 아래부분은 구현은 했지만 사용하지 않는다.
- //result = doPostEncryption(result, transactionProp); // jwhong Encrypt
+
+ // KJBank는 요청에 대한 응답 (Sync응답, Aync 에 대한 Ack응답) 에 대하여 암호화 하지 않는다. 무조건 안한다. 따라서 아래부분은 구현은 했지만 사용하지 않는다.
+ // 위 2가지 경우 암호화 하는걸로 요청 변경되어 아래 암호화 수행하도록 수정함
+ encryptResponseApply = StringUtils.equalsIgnoreCase(httpProp.getProperty("ENCRYPT_RESPONSE_APPLY", "N"), "Y");
+ if ( encryptResponseApply) {
+ result = doPostEncryption(result, transactionProp, request); // jwhong Encrypt
+ }
return result;
}
// jwhong decrypt
- private String doPreDecryption(String eaiBody, Properties transactionProp, HttpServletRequest request) {
+ private String doPreDecryption(String eaiBody, Properties transactionProp, HttpServletRequest request) throws Exception {
String decryptAlgorithm = transactionProp.getProperty(ENCRYPT_ALGORITHM, "");
String xElinkClientId = transactionProp.getProperty(HEADER_NAME_CLIENT_ID, ""); // 이 값이 OAuth의 client id 값이다 . http header 에 포함되어 온다. jwhong
String encryptBaseKeyType = transactionProp.getProperty(ENCRYPT_BASE_TYPE);
@@ -372,6 +378,11 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
byte[] decryptedMessage = null;
decryptedMessage = doInboundPreDecrypt(eaiBody, decryptAlgorithm,clientSecret,secretAES256Iv, secretAES256Key );
+ if (decryptedMessage == null) {
+ throw new Exception("[ApiAdapterService] Decrypt Error : Invalid encrypted message");
+ }
+
+
String resultMessage = new String(decryptedMessage, StandardCharsets.UTF_8 );
return resultMessage;
//return new String(decryptedMessage, StandardCharsets.UTF_8 );
@@ -379,19 +390,22 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
// jwhong encrypt
- private String doPostEncryption(String eaiBody, Properties transactionProp) {
+ public String doPostEncryption(String eaiBody, Properties transactionProp, HttpServletRequest request) throws Exception {
+
String decryptAlgorithm = transactionProp.getProperty(ENCRYPT_ALGORITHM, "");
String xElinkClientId = transactionProp.getProperty(HEADER_NAME_CLIENT_ID, ""); // 이 값이 OAuth의 client id 값이다 . http header 에 포함되어 온다. jwhong
String encryptBaseKeyType = transactionProp.getProperty(ENCRYPT_BASE_TYPE);
- String inboundToken = transactionProp.getProperty(INBOUND_TOKEN, "");
+ String inboundToken = "";
String secretAES256Iv = transactionProp.getProperty("ENCRYPT_AES256_IV");
String secretAES256Key = transactionProp.getProperty("ENCRYPT_AES256_KEY");
-
-
+
if ( decryptAlgorithm == "" ) { // 복호화 대상이 아님
return eaiBody;
}
+
+ inboundToken = JwtTokenExtractor(request);
+ xElinkClientId = JwtClientIdExtractor(inboundToken); // token에서 client id를 추출함
// 암호화 key를 token 내용으로 할지 client secret 내용으로 할지 결정함. adapter property에 정의함
// ENCRYPT_ALGORITHM 을 설정했는데 ENCRYPT_BASE_TYPE을 설정안하면 Decrypt 수행시 Exception 발생함
@@ -407,12 +421,16 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
}
}
- byte[] decryptedMessage = null;
- decryptedMessage = doInboundPostEncrypt(eaiBody, decryptAlgorithm,clientSecret,secretAES256Iv, secretAES256Key );
+ String encryptedMessage = null;
+ encryptedMessage = doInboundPostEncrypt(eaiBody, decryptAlgorithm,clientSecret,secretAES256Iv, secretAES256Key );
- String resultMessage = new String(decryptedMessage, StandardCharsets.UTF_8 );
- return resultMessage;
- //return new String(decryptedMessage, StandardCharsets.UTF_8 );
+ if (encryptedMessage == null) {
+ throw new Exception("[ApiAdapterService] Encrypt Error : Invalid PlainText message");
+ }
+
+ return encryptedMessage;
+ //String resultMessage = new String(encryptedMessage, StandardCharsets.UTF_8 );
+ //return resultMessage;
}
@@ -444,29 +462,33 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
}
- private byte[] doInboundPreDecrypt(String eaiStringBody, String decryptAlgorithm, String clientSecretKey, String secretAES256Iv, String secretAES256Key) {
+ private byte[] doInboundPreDecrypt(String eaiStringBody, String decryptAlgorithm, String clientSecretKey, String secretAES256Iv, String secretAES256Key) throws Exception {
byte[] decryptedMessage = null;
//String eaiStringBody = new String(eaiBody, StandardCharsets.UTF_8);
eaiStringBody = extractBodyMsg(decryptAlgorithm, eaiStringBody);
+ if (eaiStringBody == null) {
+ throw new Exception("[ApiAdapterService] Cannot decrypt Error : input is plain text");
+ }
+
//test source
- //System.out.println("eaiBody 바이트 배열 길이: " + eaiBody.length);
- System.out.println("Base64 문자열: " + eaiStringBody);
- System.out.println("Base64 문자열 길이: " + eaiStringBody.length());
- System.out.println("Base64 문자열 끝: " + eaiStringBody.substring(eaiStringBody.length() - 10));
+ logger.debug("Base64 문자열: " + eaiStringBody);
+ logger.debug("Base64 문자열 길이: " + eaiStringBody.length());
+ logger.debug("Base64 문자열 끝: " + eaiStringBody.substring(eaiStringBody.length() - 10));
// Base64 디코딩 테스트
try {
byte[] decoded = Base64.getDecoder().decode(eaiStringBody);
- System.out.println("디코딩 성공, 길이: " + decoded.length);
+ logger.debug("디코딩 성공, 길이: " + decoded.length);
} catch (IllegalArgumentException e) {
- System.out.println("Base64 디코딩 실패: " + e.getMessage());
+ logger.debug("Base64 디코딩 실패: " + e.getMessage());
}
// end test source
switch (decryptAlgorithm) {
+ case "AES128":
case "AES128-TOSS":
try {
String key128 = clientSecretKey.substring(22,38); //togetherEncoder 경우는 substring(44,60) 이네??
@@ -477,7 +499,7 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
e.printStackTrace();
logger.error("HttpClientAdapterServiceRest] AES128 Decryption error=" + e.getMessage());
}
- break;
+ break;
case "AES128-TOGETHER":
try {
String key128 = clientSecretKey.substring(44,60); //togetherEncoder 경우는 substring(44,60) 이네??
@@ -550,108 +572,109 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
String decryptedJsonKey = "";
String decryptedBodyMessage = "";
- switch (decryptAlgorithm) {
- case "AES128-TOSS":
- decryptedJsonKey = "preScreeningRequest";
- break;
- case "AES128-TOGETHER":
- decryptedJsonKey = "obpTxData";
- break;
- case "AES256":
- decryptedJsonKey = "preScreeningRequest";
- break;
- case "AES256-KAKAO":
- decryptedJsonKey = "encrypted_data";
- break;
- case "AES256-TOSS":
- decryptedJsonKey = "encryptedData";
- break;
- case "AES256GCM":
- break;
- default:
- break;
- }
+ decryptedJsonKey = getJsonKey(decryptAlgorithm);
try {
JSONParser parser = new JSONParser();
JSONObject jsonObject = (JSONObject) parser.parse(eaiStringBody);
- decryptedBodyMessage = (String) jsonObject.get(decryptedJsonKey);
+ decryptedBodyMessage = (String) jsonObject.get(decryptedJsonKey);
} catch (Exception e) {
e.printStackTrace();
logger.error("HttpClient5AdapterServiceRest] extractBodyMsg error : " + e.getMessage());
}
-
+
return decryptedBodyMessage;
}
-
- private byte[] doInboundPostEncrypt(String eaiStringBody, String encryptAlgorithm, String clientSecretKey, String secretAES256Iv, String secretAES256Key) {
-
- byte[] encryptedMessage = null;
- //String eaiStringBody = new String(eaiBody, StandardCharsets.UTF_8);
-
- //test source
- //System.out.println("eaiBody 바이트 배열 길이: " + eaiBody.length);
- System.out.println("Base64 문자열: " + eaiStringBody);
- System.out.println("Base64 문자열 길이: " + eaiStringBody.length());
- System.out.println("Base64 문자열 끝: " + eaiStringBody.substring(eaiStringBody.length() - 10));
+
+ private String getJsonKey(String Algorithm) {
- // Base64 디코딩 테스트
- try {
- byte[] decoded = Base64.getDecoder().decode(eaiStringBody);
- System.out.println("디코딩 성공, 길이: " + decoded.length);
- } catch (IllegalArgumentException e) {
- System.out.println("Base64 디코딩 실패: " + e.getMessage());
- }
- // end test source
+ String jsonKey = "";
+
+ switch (Algorithm) {
+ case "AES128":
+ case "AES128-TOSS":
+ jsonKey = "preScreeningRequest";
+ break;
+ case "AES128-TOGETHER":
+ jsonKey = "obpTxData";
+ break;
+ case "AES256":
+ jsonKey = "preScreeningRequest";
+ break;
+ case "AES256-KAKAO":
+ jsonKey = "encrypted_data";
+ break;
+ case "AES256-TOSS":
+ jsonKey = "encryptedData";
+ break;
+ case "AES256-NICEON":
+ jsonKey = "enc_data";
+ break;
+ case "AES256GCM":
+ break;
+ default:
+ break;
+ }
+ return jsonKey;
+ }
+ private String doInboundPostEncrypt(String eaiStringBody, String encryptAlgorithm, String clientSecretKey, String secretAES256Iv, String secretAES256Key) {
+
+ //byte[] encryptedMessage = null;
+ String encryptedStrMessage = null;
+ String encryptedJsonKey = "";
+
+ encryptedJsonKey = getJsonKey(encryptAlgorithm);
+
switch (encryptAlgorithm) {
+ case "AES128":
case "AES128-TOSS":
try {
String key128 = clientSecretKey.substring(22,38); //togetherEncoder 경우는 substring(44,60) 이네??
- String decryptedStrMessage = AESCipher.encrypt(eaiStringBody, key128);
- encryptedMessage = decryptedStrMessage.getBytes(StandardCharsets.UTF_8);
+ encryptedStrMessage = AESCipher.encrypt(eaiStringBody, key128);
+ //encryptedMessage = encryptedStrMessage.getBytes(StandardCharsets.UTF_8);
} catch (Exception e) {
e.printStackTrace();
- logger.error("HttpClientAdapterServiceRest] AES128 Decryption error=" + e.getMessage());
+ logger.error("HttpClientAdapterServiceRest] AES128 Encryption error=" + e.getMessage());
}
break;
case "AES128-TOGETHER":
try {
String key128 = clientSecretKey.substring(44,60); //togetherEncoder 경우는 substring(44,60) 이네??
- String decryptedStrMessage = AESCipher.encrypt(eaiStringBody, key128);
- encryptedMessage = decryptedStrMessage.getBytes(StandardCharsets.UTF_8);
+ encryptedStrMessage = AESCipher.encrypt(eaiStringBody, key128);
+ //encryptedMessage = encryptedStrMessage.getBytes(StandardCharsets.UTF_8);
} catch (Exception e) {
e.printStackTrace();
- logger.error("HttpClientAdapterServiceRest] AES128 Decryption error=" + e.getMessage());
+ logger.error("HttpClientAdapterServiceRest] AES128 Encryption error=" + e.getMessage());
}
break;
case "AES256":
try {
String key = clientSecretKey.substring(10,42);
- String decryptedStrMessage = AES256Cipher.encrypt(eaiStringBody, key);
- encryptedMessage = decryptedStrMessage.getBytes(StandardCharsets.UTF_8);
+ encryptedStrMessage = AES256Cipher.encrypt(eaiStringBody, key);
+ //encryptedMessage = encryptedStrMessage.getBytes(StandardCharsets.UTF_8);
} catch (Exception e) {
e.printStackTrace();
- logger.error("HttpClientAdapterServiceRest] AES256 Decryption error=" + e.getMessage());
+ logger.error("HttpClientAdapterServiceRest] AES256 Encryption error=" + e.getMessage());
}
break;
case "AES256-KAKAO":
try {
- String decryptedStrMessage = AES256Cipher.encrypt(eaiStringBody, secretAES256Iv, secretAES256Key);
- encryptedMessage = decryptedStrMessage.getBytes(StandardCharsets.UTF_8);
+ encryptedStrMessage = AES256Cipher.encrypt(eaiStringBody, secretAES256Iv, secretAES256Key);
+ //encryptedMessage = encryptedStrMessage.getBytes(StandardCharsets.UTF_8);
} catch (Exception e) {
e.printStackTrace();
- logger.error("HttpClientAdapterServiceRest] AES256 Decryption error=" + e.getMessage());
+ logger.error("HttpClientAdapterServiceRest] AES256 Encryption error=" + e.getMessage());
}
break;
case "AES256-TOSS":
try {
- String decryptedStrMessage = AES256Cipher.encrypt(eaiStringBody, secretAES256Iv, secretAES256Key);
- encryptedMessage = decryptedStrMessage.getBytes(StandardCharsets.UTF_8);
+ encryptedStrMessage = AES256Cipher.encrypt(eaiStringBody, secretAES256Iv, secretAES256Key);
+ //encryptedMessage = encryptedStrMessage.getBytes(StandardCharsets.UTF_8);
} catch (Exception e) {
e.printStackTrace();
- logger.error("HttpClientAdapterServiceRest] AES256 Decryption error=" + e.getMessage());
+ logger.error("HttpClientAdapterServiceRest] AES256 Encryption error=" + e.getMessage());
}
break;
@@ -661,8 +684,8 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
AES256GCMCipher cipher = new AES256GCMCipher(key);
byte[] aad = "metadata".getBytes();
- String decryptedStrMessage = cipher.encrypt(eaiStringBody , aad);
- encryptedMessage = decryptedStrMessage.getBytes(StandardCharsets.UTF_8);
+ encryptedStrMessage = cipher.encrypt(eaiStringBody , aad);
+ //encryptedMessage = encryptedStrMessage.getBytes(StandardCharsets.UTF_8);
} catch (Exception e) {
e.printStackTrace();
@@ -671,7 +694,8 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
break;
default:
try {
- encryptedMessage = eaiStringBody.getBytes();
+ encryptedStrMessage = eaiStringBody;
+ //encryptedMessage = eaiStringBody.getBytes();
} catch (Exception e) {
e.printStackTrace();
logger.error("HttpClientAdapterServiceRest] doOutboundPostFilter Array copy error=" + e.getMessage());
@@ -679,7 +703,12 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
break;
}
- return encryptedMessage;
+ Map map = new HashMap<>();
+ map.put(encryptedJsonKey, encryptedStrMessage);
+ JSONObject json = new JSONObject();
+ json.putAll(map);
+ return json.toJSONString();
+ //return encryptedMessage;
}
@@ -693,7 +722,7 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
logger.error(e.getMessage());
}
- System.out.println("Token is: " + Token);
+ logger.debug("Token is: " + Token);
return Token;
}
@@ -709,7 +738,7 @@ public class ApiAdapterService extends HttpAdapterServiceSupport {
tokenClientId = "";
}
- System.out.println("Token Client ID: " + tokenClientId);
+ logger.debug("Token Client ID: " + tokenClientId);
return tokenClientId;
}
diff --git a/src/main/java/com/eactive/eai/authserver/config/AuthorizationServerConfig.java b/src/main/java/com/eactive/eai/authserver/config/AuthorizationServerConfig.java
index 33be4d0..38e4362 100644
--- a/src/main/java/com/eactive/eai/authserver/config/AuthorizationServerConfig.java
+++ b/src/main/java/com/eactive/eai/authserver/config/AuthorizationServerConfig.java
@@ -1,13 +1,11 @@
package com.eactive.eai.authserver.config;
import java.security.KeyPair;
+import java.time.LocalDateTime;
+import java.util.Arrays;
import javax.sql.DataSource;
-import com.eactive.eai.authserver.dao.TokenIssuanceLogDAO;
-import com.eactive.eai.authserver.service.OAuth2Manager;
-import com.eactive.eai.authserver.vo.ClientVO;
-import com.eactive.eai.common.logger.EAIDBLogControl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -16,6 +14,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.Order;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
+import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.core.userdetails.UserDetailsService;
@@ -27,31 +26,25 @@ import org.springframework.security.oauth2.config.annotation.web.configuration.E
import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer;
import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer;
import org.springframework.security.oauth2.provider.ClientDetailsService;
+import org.springframework.security.oauth2.provider.OAuth2Authentication;
import org.springframework.security.oauth2.provider.error.WebResponseExceptionTranslator;
+import org.springframework.security.oauth2.provider.token.TokenEnhancer;
import org.springframework.security.oauth2.provider.token.TokenEnhancerChain;
-import org.springframework.security.oauth2.provider.token.TokenStore;
import org.springframework.security.oauth2.provider.token.store.JwtAccessTokenConverter;
import org.springframework.security.oauth2.provider.token.store.JwtTokenStore;
import org.springframework.security.oauth2.provider.token.store.KeyStoreKeyFactory;
-import com.eactive.eai.authserver.provider.ElinkJdbcTokenStore;
+import com.eactive.eai.authserver.dao.TokenIssuanceLogDAO;
+import com.eactive.eai.authserver.service.OAuth2Manager;
+import com.eactive.eai.authserver.vo.ClientVO;
+import com.eactive.eai.common.dao.DAOException;
import com.eactive.eai.common.dao.Keys;
+import com.eactive.eai.common.logger.EAIDBLogControl;
import com.eactive.eai.common.property.PropGroupVO;
import com.eactive.eai.common.property.PropManager;
import com.eactive.eai.common.util.Logger;
import com.eactive.eai.common.util.ServiceLocator;
-
-import java.time.LocalDateTime;
-import java.util.Arrays;
-import java.util.Map;
-
-import org.springframework.security.oauth2.provider.OAuth2Authentication;
-import org.springframework.security.oauth2.provider.token.TokenEnhancer;
-import com.eactive.eai.common.dao.DAOException;
import com.eactive.eai.data.entity.onl.authserver.TokenIssuanceLog;
-import org.springframework.security.web.authentication.WebAuthenticationDetails;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
@Configuration
@EnableAuthorizationServer
@@ -79,6 +72,8 @@ public class AuthorizationServerConfig extends AuthorizationServerConfigurerAdap
@Autowired
@Qualifier("eLinkUserDetailsService")
private UserDetailsService userDetailsService;
+
+
@Override
public void configure(final AuthorizationServerSecurityConfigurer security) throws Exception {
@@ -104,9 +99,10 @@ public class AuthorizationServerConfig extends AuthorizationServerConfigurerAdap
tokenType = vo.getProperty(PROP_TOKEN_TYPE, "JWT");
}
- endpoints.pathMapping("/oauth/token", "/api/v1/oauth/token");
+ endpoints.pathMapping("/oauth/token", "/oauth2/token") ;
endpoints.authenticationManager(authenticationManager);
endpoints.userDetailsService(userDetailsService);
+ endpoints.allowedTokenEndpointRequestMethods(HttpMethod.GET, HttpMethod.POST);
// JWT 토큰을 사용하는 경우
JwtAccessTokenConverter converter = jwtAccessTokenConverter();
@@ -215,10 +211,7 @@ public class AuthorizationServerConfig extends AuthorizationServerConfigurerAdap
private void logTokenIssuance(boolean isSuccess, boolean isRestrictionExempt, String resultMessage, String accessToken) {
try {
- if (!EAIDBLogControl.isEnable()) {
- logger.warn("DB logging is disabled. Skipping token issuance logging.");
- return;
- }
+
RequestContextData data = RequestContextData.ThreadLocalRequestContext.get();
OAuth2Manager.getInstance();
@@ -241,6 +234,16 @@ public class AuthorizationServerConfig extends AuthorizationServerConfigurerAdap
log.setRestrictionExemptYn(isRestrictionExempt ? "Y" : "N");
log.setResultMessage(resultMessage);
log.setAccessToken(accessToken); // Add access token value to the log
+
+ if( !isSuccess ) {
+ logger.error("Token request[/oauth/token or /oauth2/token] => clientId: {}, grantType: {}, scope: {}",
+ clientId, data.getGrantType(), data.getScope());
+ }
+
+ if (!EAIDBLogControl.isEnable()) {
+ logger.warn("DB logging is disabled. Skipping token issuance logging.");
+ return;
+ }
tokenIssuanceLogDAO.saveTokenIssuanceLog(log);
} catch (Throwable th) {
diff --git a/src/main/java/com/eactive/eai/authserver/config/CustomOAuth2AuthenticationEntryPoint.java b/src/main/java/com/eactive/eai/authserver/config/CustomOAuth2AuthenticationEntryPoint.java
new file mode 100644
index 0000000..892d4a5
--- /dev/null
+++ b/src/main/java/com/eactive/eai/authserver/config/CustomOAuth2AuthenticationEntryPoint.java
@@ -0,0 +1,126 @@
+package com.eactive.eai.authserver.config;
+
+import java.io.IOException;
+import java.time.LocalDateTime;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.oauth2.provider.error.OAuth2AuthenticationEntryPoint;
+
+import com.eactive.eai.authserver.dao.TokenIssuanceLogDAO;
+import com.eactive.eai.authserver.service.OAuth2Manager;
+import com.eactive.eai.authserver.vo.ClientVO;
+import com.eactive.eai.common.logger.EAIDBLogControl;
+import com.eactive.eai.common.util.Logger;
+import com.eactive.eai.common.util.MessageUtil;
+import com.eactive.eai.data.entity.onl.authserver.TokenIssuanceLog;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class CustomOAuth2AuthenticationEntryPoint extends OAuth2AuthenticationEntryPoint {
+
+ static Logger logger = Logger.getLogger(Logger.LOGGER_DEFAULT);
+
+ private final ObjectMapper objectMapper = new ObjectMapper();
+
+ private final TokenIssuanceLogDAO tokenIssuanceLogDAO;
+
+ public CustomOAuth2AuthenticationEntryPoint(TokenIssuanceLogDAO dao) {
+ this.tokenIssuanceLogDAO = dao;
+ }
+
+ @Override
+ public void commence(HttpServletRequest request,
+ HttpServletResponse response,
+ AuthenticationException authException) throws IOException {
+
+ try {
+ RequestContextData data = new RequestContextData();
+ data.setClientId(request.getParameter("client_id"));
+ data.setIpAddress(extractIpAddress(request));
+ data.setGrantType(request.getParameter("grant_type"));
+ data.setScope(request.getParameter("scope"));
+ data.setUsername(request.getParameter("username"));
+ data.setResource(request.getParameter("resource"));
+
+ RequestContextData.ThreadLocalRequestContext.set(data);
+ logTokenIssuance(false,false, authException.getMessage(), null);
+ } finally {
+ RequestContextData.ThreadLocalRequestContext.clear();
+ }
+
+ response.setContentType("application/json;charset=UTF-8");
+ response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+
+ String errorMessage = MessageUtil.makeJsonErrorMessage(MessageUtil.ERROR_CODE_AUTH_FAIL, authException.getMessage());
+
+ response.getWriter().write(errorMessage);
+ response.getWriter().flush();
+ }
+
+ private String extractIpAddress(HttpServletRequest request) {
+ String ipAddress = request.getHeader("X-Forwarded-For");
+ if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+ ipAddress = request.getHeader("Proxy-Client-IP");
+ }
+ if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+ ipAddress = request.getHeader("WL-Proxy-Client-IP");
+ }
+ if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+ ipAddress = request.getHeader("HTTP_CLIENT_IP");
+ }
+ if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+ ipAddress = request.getHeader("HTTP_X_FORWARDED_FOR");
+ }
+ if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+ ipAddress = request.getRemoteAddr();
+ }
+ return ipAddress;
+ }
+
+ private void logTokenIssuance(boolean isSuccess, boolean isRestrictionExempt, String resultMessage, String accessToken) {
+ try {
+
+ RequestContextData data = RequestContextData.ThreadLocalRequestContext.get();
+ OAuth2Manager.getInstance();
+
+ TokenIssuanceLog log = new TokenIssuanceLog();
+ String clientId = data.getClientId();
+ log.setClientId(clientId);
+
+ if(StringUtils.isNotBlank(clientId)) {
+ ClientVO clientVO = OAuth2Manager.getInstance().getClientInfo(clientId);
+ log.setAppName(clientVO.getClientName());
+ log.setOrgId(clientVO.getOrgId());
+ log.setOrgName(clientVO.getOrgName());
+ }
+
+ log.setGrantType(data.getGrantType());
+ log.setScope(data.getScope());
+ log.setIpAddress(data.getIpAddress());
+ log.setSuccessYn(isSuccess ? "Y" : "N");
+ log.setIssuanceDateTime(LocalDateTime.now());
+ log.setRestrictionExemptYn(isRestrictionExempt ? "Y" : "N");
+ log.setResultMessage(resultMessage);
+ log.setAccessToken(accessToken); // Add access token value to the log
+
+ if( !isSuccess ) {
+ logger.error("Token request[/oauth/token or /oauth2/token] => clientId: {}, grantType: {}, scope: {}",
+ clientId, data.getGrantType(), data.getScope());
+ }
+
+ if (!EAIDBLogControl.isEnable()) {
+ logger.warn("DB logging is disabled. Skipping token issuance logging.");
+ return;
+ }
+
+ tokenIssuanceLogDAO.saveTokenIssuanceLog(log);
+ } catch (Throwable th) {
+ logger.error("Error while logging token issuance: " + th.getMessage(), th);
+ }
+ }
+}
+
+
diff --git a/src/main/java/com/eactive/eai/authserver/config/CustomTokenEndpointExceptionResolver.java b/src/main/java/com/eactive/eai/authserver/config/CustomTokenEndpointExceptionResolver.java
new file mode 100644
index 0000000..438dc02
--- /dev/null
+++ b/src/main/java/com/eactive/eai/authserver/config/CustomTokenEndpointExceptionResolver.java
@@ -0,0 +1,134 @@
+package com.eactive.eai.authserver.config;
+
+import java.io.IOException;
+import java.time.LocalDateTime;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+import org.springframework.security.oauth2.common.exceptions.InvalidRequestException;
+import org.springframework.web.servlet.HandlerExceptionResolver;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.eactive.eai.authserver.dao.TokenIssuanceLogDAO;
+import com.eactive.eai.authserver.service.OAuth2Manager;
+import com.eactive.eai.authserver.vo.ClientVO;
+import com.eactive.eai.common.logger.EAIDBLogControl;
+import com.eactive.eai.common.util.Logger;
+import com.eactive.eai.common.util.MessageUtil;
+import com.eactive.eai.data.entity.onl.authserver.TokenIssuanceLog;
+
+@Configuration
+@Order(Ordered.HIGHEST_PRECEDENCE) // 다른 HandlerExceptionResolver보다 우선 적용
+public class CustomTokenEndpointExceptionResolver implements HandlerExceptionResolver {
+
+ static Logger logger = Logger.getLogger(Logger.LOGGER_DEFAULT);
+
+ @Autowired
+ private TokenIssuanceLogDAO tokenIssuanceLogDAO;
+
+ @Override
+ public ModelAndView resolveException(HttpServletRequest request, HttpServletResponse response, Object handler,
+ Exception ex) {
+
+ // OAuth2 Token 요청 grant_type 누락 시
+ if (ex instanceof InvalidRequestException) {
+ response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+
+ String errorMessage = MessageUtil.makeJsonErrorMessage(MessageUtil.ERROR_CODE_AUTH_FAIL, ex.getMessage());
+
+ try {
+
+ RequestContextData data = new RequestContextData();
+ data.setClientId(request.getParameter("client_id"));
+ data.setIpAddress(extractIpAddress(request));
+ data.setGrantType(request.getParameter("grant_type"));
+ data.setScope(request.getParameter("scope"));
+ data.setUsername(request.getParameter("username"));
+ data.setResource(request.getParameter("resource"));
+
+ RequestContextData.ThreadLocalRequestContext.set(data);
+ logTokenIssuance(false, false, errorMessage, null);
+ response.setContentType("application/json;charset=UTF-8");
+ response.getWriter().write(errorMessage);
+ response.getWriter().flush();
+ } catch (IOException e) {
+ e.printStackTrace();
+ } finally {
+ RequestContextData.ThreadLocalRequestContext.clear();
+ }
+
+ return new ModelAndView();
+ }
+
+ // 다른 예외는 다른 HandlerExceptionResolver에게 위임
+ return null;
+ }
+
+ private String extractIpAddress(HttpServletRequest request) {
+ String ipAddress = request.getHeader("X-Forwarded-For");
+ if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+ ipAddress = request.getHeader("Proxy-Client-IP");
+ }
+ if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+ ipAddress = request.getHeader("WL-Proxy-Client-IP");
+ }
+ if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+ ipAddress = request.getHeader("HTTP_CLIENT_IP");
+ }
+ if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+ ipAddress = request.getHeader("HTTP_X_FORWARDED_FOR");
+ }
+ if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+ ipAddress = request.getRemoteAddr();
+ }
+ return ipAddress;
+ }
+
+ private void logTokenIssuance(boolean isSuccess, boolean isRestrictionExempt, String resultMessage,
+ String accessToken) {
+ try {
+ RequestContextData data = RequestContextData.ThreadLocalRequestContext.get();
+ OAuth2Manager.getInstance();
+
+ TokenIssuanceLog log = new TokenIssuanceLog();
+ String clientId = data.getClientId();
+ log.setClientId(clientId);
+
+ if (StringUtils.isNotBlank(clientId)) {
+ ClientVO clientVO = OAuth2Manager.getInstance().getClientInfo(clientId);
+ log.setAppName(clientVO.getClientName());
+ log.setOrgId(clientVO.getOrgId());
+ log.setOrgName(clientVO.getOrgName());
+ }
+
+ log.setGrantType(data.getGrantType());
+ log.setScope(data.getScope());
+ log.setIpAddress(data.getIpAddress());
+ log.setSuccessYn(isSuccess ? "Y" : "N");
+ log.setIssuanceDateTime(LocalDateTime.now());
+ log.setRestrictionExemptYn(isRestrictionExempt ? "Y" : "N");
+ log.setResultMessage(resultMessage);
+ log.setAccessToken(accessToken); // Add access token value to the log
+
+ if( !isSuccess ) {
+ logger.error("Token request[/oauth/token or /oauth2/token] => clientId: {}, grantType: {}, scope: {}",
+ clientId, data.getGrantType(), data.getScope());
+ }
+
+ if (!EAIDBLogControl.isEnable()) {
+ logger.warn("DB logging is disabled. Skipping token issuance logging.");
+ return;
+ }
+
+ tokenIssuanceLogDAO.saveTokenIssuanceLog(log);
+ } catch (Throwable th) {
+ logger.error("Error while logging token issuance: " + th.getMessage(), th);
+ }
+ }
+}
diff --git a/src/main/java/com/eactive/eai/authserver/config/OAuth2FilterCustomizer.java b/src/main/java/com/eactive/eai/authserver/config/OAuth2FilterCustomizer.java
new file mode 100644
index 0000000..25eb6bf
--- /dev/null
+++ b/src/main/java/com/eactive/eai/authserver/config/OAuth2FilterCustomizer.java
@@ -0,0 +1,39 @@
+package com.eactive.eai.authserver.config;
+
+import javax.servlet.Filter;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.security.oauth2.provider.client.ClientCredentialsTokenEndpointFilter;
+import org.springframework.security.web.FilterChainProxy;
+import org.springframework.stereotype.Component;
+
+import com.eactive.eai.authserver.dao.TokenIssuanceLogDAO;
+
+@Component
+public class OAuth2FilterCustomizer implements ApplicationListener {
+
+ private boolean initialized = false;
+
+ @Autowired
+ private TokenIssuanceLogDAO tokenIssuanceLogDAO;
+
+ @Override
+ public void onApplicationEvent(ContextRefreshedEvent event) {
+ if (initialized) return;
+
+ Filter springSecurityFilterChain = event.getApplicationContext()
+ .getBean("springSecurityFilterChain", Filter.class);
+
+ FilterChainProxy filterChainProxy = (FilterChainProxy) springSecurityFilterChain;
+
+ filterChainProxy.getFilterChains().stream()
+ .flatMap(chain -> chain.getFilters().stream())
+ .filter(filter -> filter instanceof ClientCredentialsTokenEndpointFilter)
+ .forEach(filter -> ((ClientCredentialsTokenEndpointFilter) filter)
+ .setAuthenticationEntryPoint(new CustomOAuth2AuthenticationEntryPoint(tokenIssuanceLogDAO)));
+
+ initialized = true;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/eactive/eai/authserver/config/OAuthRequestLoggingFilter.java b/src/main/java/com/eactive/eai/authserver/config/OAuthRequestLoggingFilter.java
index 59278ca..efb0f18 100644
--- a/src/main/java/com/eactive/eai/authserver/config/OAuthRequestLoggingFilter.java
+++ b/src/main/java/com/eactive/eai/authserver/config/OAuthRequestLoggingFilter.java
@@ -1,5 +1,6 @@
package com.eactive.eai.authserver.config;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.context.SecurityContextHolder;
@@ -12,7 +13,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Collection;
-public class OAuthRequestLoggingFilter extends OncePerRequestFilter {
+public class OAuthRequestLoggingFilter extends OncePerRequestFilter {
@Override
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
@@ -24,9 +25,10 @@ public class OAuthRequestLoggingFilter extends OncePerRequestFilter {
data.setGrantType(request.getParameter("grant_type"));
data.setScope(request.getParameter("scope"));
data.setUsername(request.getParameter("username"));
+ data.setResource(request.getParameter("resource"));
RequestContextData.ThreadLocalRequestContext.set(data);
-
+
filterChain.doFilter(request, response);
} finally {
RequestContextData.ThreadLocalRequestContext.clear();
diff --git a/src/main/java/com/eactive/eai/authserver/config/RequestContextData.java b/src/main/java/com/eactive/eai/authserver/config/RequestContextData.java
index 19815de..20a261a 100644
--- a/src/main/java/com/eactive/eai/authserver/config/RequestContextData.java
+++ b/src/main/java/com/eactive/eai/authserver/config/RequestContextData.java
@@ -3,12 +3,13 @@ package com.eactive.eai.authserver.config;
import lombok.Data;
@Data
-public class RequestContextData {
+public class RequestContextData {
private String clientId;
private String ipAddress;
private String grantType;
private String scope;
private String username;
+ private String resource;
// Getters and setters
diff --git a/src/main/java/com/eactive/eai/authserver/config/WebMvcConfig.java b/src/main/java/com/eactive/eai/authserver/config/WebMvcConfig.java
new file mode 100644
index 0000000..98f24b2
--- /dev/null
+++ b/src/main/java/com/eactive/eai/authserver/config/WebMvcConfig.java
@@ -0,0 +1,70 @@
+package com.eactive.eai.authserver.config;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.converter.HttpMessageNotReadableException;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.validation.BindException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.MissingServletRequestParameterException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.servlet.NoHandlerFoundException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@Configuration
+@ControllerAdvice
+public class WebMvcConfig {
+
+ @ExceptionHandler({
+ HttpMessageNotReadableException.class,
+ MethodArgumentNotValidException.class,
+ MissingServletRequestParameterException.class,
+ BindException.class
+ })
+ public String handleBadRequest(HttpServletRequest request, HttpServletResponse response, Exception ex) {
+ response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+ request.setAttribute("_authServerStatusCode", HttpServletResponse.SC_BAD_REQUEST);
+ request.setAttribute("errorMessage", "400 Bad Request");
+ return "forward:/error.jsp";
+ }
+
+ @ExceptionHandler(NoHandlerFoundException.class)
+ public String handleNotFound(HttpServletRequest request, HttpServletResponse response, Exception ex) {
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+ request.setAttribute("_authServerStatusCode", HttpServletResponse.SC_NOT_FOUND);
+ request.setAttribute("errorMessage", "404 Not Found");
+ return "forward:/error.jsp";
+ }
+
+ @ExceptionHandler(AuthenticationException.class)
+ public String handleUnauthorized(HttpServletRequest request, HttpServletResponse response, Exception ex) {
+ response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+ request.setAttribute("_authServerStatusCode", HttpServletResponse.SC_UNAUTHORIZED);
+ request.setAttribute("errorMessage", "401 Unauthorized");
+ return "forward:/error.jsp";
+ }
+
+ @ExceptionHandler(AccessDeniedException.class)
+ public String handleAccessDenied(HttpServletRequest request, HttpServletResponse response, Exception ex) {
+ response.setStatus(HttpServletResponse.SC_FORBIDDEN);
+ request.setAttribute("_authServerStatusCode", HttpServletResponse.SC_FORBIDDEN);
+ request.setAttribute("errorMessage", "403 Forbidden");
+ return "forward:/error.jsp";
+ }
+
+ @ExceptionHandler(Exception.class)
+ public String handleException(HttpServletRequest request, HttpServletResponse response, Exception ex) {
+ response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+ request.setAttribute("_authServerStatusCode", HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+ String detailMessage = ex.getMessage();
+ if ( StringUtils.isBlank(detailMessage) ) {
+ detailMessage = "광주은행 관리자에게 문의하세요.";
+ }
+ request.setAttribute("errorMessage", detailMessage);
+ return "forward:/error.jsp";
+ }
+}
diff --git a/src/main/java/com/eactive/eai/authserver/config/WebSecurityConfig.java b/src/main/java/com/eactive/eai/authserver/config/WebSecurityConfig.java
index f61bad2..e968562 100644
--- a/src/main/java/com/eactive/eai/authserver/config/WebSecurityConfig.java
+++ b/src/main/java/com/eactive/eai/authserver/config/WebSecurityConfig.java
@@ -14,6 +14,8 @@ import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+import javax.servlet.http.HttpServletResponse;
+
@Configuration
@EnableWebSecurity
@Order(1)
@@ -29,8 +31,23 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
.headers().frameOptions().disable()
.and()
.authorizeRequests()
+ .antMatchers("/error.jsp").permitAll()
.antMatchers("/**").permitAll()
.and()
+ .exceptionHandling()
+ .authenticationEntryPoint((request, response, authException) -> {
+ response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+ request.setAttribute("_authServerStatusCode", HttpServletResponse.SC_UNAUTHORIZED);
+ request.setAttribute("errorMessage", "401 Unauthorized");
+ request.getRequestDispatcher("/error.jsp").forward(request, response);
+ })
+ .accessDeniedHandler((request, response, accessDeniedException) -> {
+ response.setStatus(HttpServletResponse.SC_FORBIDDEN);
+ request.setAttribute("_authServerStatusCode", HttpServletResponse.SC_FORBIDDEN);
+ request.setAttribute("errorMessage", "403 Forbidden");
+ request.getRequestDispatcher("/error.jsp").forward(request, response);
+ })
+ .and()
.formLogin();
// .and()
// .httpBasic();
diff --git a/src/main/java/com/eactive/eai/authserver/custom/BearerTokenController.java b/src/main/java/com/eactive/eai/authserver/custom/BearerTokenController.java
new file mode 100644
index 0000000..20d4d30
--- /dev/null
+++ b/src/main/java/com/eactive/eai/authserver/custom/BearerTokenController.java
@@ -0,0 +1,200 @@
+package com.eactive.eai.authserver.custom;
+
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
+import org.json.simple.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.oauth2.provider.ClientDetails;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.eactive.eai.adapter.http.dynamic.filter.JwtAuthException;
+import com.eactive.eai.authserver.config.RequestContextData;
+import com.eactive.eai.authserver.dao.TokenIssuanceLogDAO;
+import com.eactive.eai.authserver.service.BearerTokenService;
+import com.eactive.eai.authserver.service.OAuth2Manager;
+import com.eactive.eai.authserver.vo.ClientVO;
+import com.eactive.eai.common.logger.EAIDBLogControl;
+import com.eactive.eai.common.util.Logger;
+import com.eactive.eai.common.util.MessageUtil;
+import com.eactive.eai.data.entity.onl.authserver.TokenIssuanceLog;
+
+@RestController
+@RequestMapping("/auth/oauth/v2")
+public class BearerTokenController {
+
+ public static Logger logger = Logger.getLogger(Logger.LOGGER_DEFAULT);
+ private final BearerTokenService tokenService;
+
+ @Autowired
+ private TokenIssuanceLogDAO tokenIssuanceLogDAO;
+
+ public BearerTokenController(BearerTokenService tokenService) {
+ this.tokenService = tokenService;
+ }
+
+ @RequestMapping(
+ value = "/token",
+ method = {RequestMethod.POST, RequestMethod.GET}
+ )
+ public ResponseEntity issueCAToken(HttpServletRequest request, @RequestParam MultiValueMap req) throws JwtAuthException {
+ JSONObject resObject = new JSONObject();
+ String clientId = req.getFirst("client_id");
+ String grantType = req.getFirst("grant_type");
+ String clientSecret = req.getFirst("client_secret");
+ String scopes = req.getFirst("scope");
+
+ try {
+
+
+ RequestContextData data = new RequestContextData();
+ data.setClientId(request.getParameter("client_id"));
+ data.setIpAddress(extractIpAddress(request));
+ data.setGrantType(request.getParameter("grant_type"));
+ data.setScope(request.getParameter("scope"));
+ data.setUsername(request.getParameter("username"));
+ data.setResource(request.getParameter("resource"));
+
+ RequestContextData.ThreadLocalRequestContext.set(data);
+
+
+
+ if (!StringUtils.equals(grantType, "client_credentials") ) {
+ throw new JwtAuthException("unsupported_grant_type", "Unsupported grant type");
+ }
+
+ ClientDetails clientDetails = OAuth2Manager.getInstance().getClientDeatilsStore().get(clientId);
+ if (clientDetails == null) {
+ throw new JwtAuthException("invalid_client", "Bad client credentials(not found)");
+ }
+
+ String tokenType = "Bearer";
+
+
+
+
+ Long expiresIn = Long.valueOf(clientDetails.getAccessTokenValiditySeconds());
+
+ String[] reqScopeArr = org.springframework.util.StringUtils.tokenizeToStringArray(scopes, " ");
+ Set scopeSet = new HashSet();
+ for (String scope : reqScopeArr) {
+ scopeSet.add(scope);
+ }
+ veryfyClient(clientDetails, clientSecret, scopeSet);
+
+ String token = tokenService.generateCAToken(clientId, expiresIn, scopeSet);
+
+ Map tokenMap = new HashMap<>();
+ tokenMap.put("token_type", tokenType);
+ tokenMap.put("access_token", token);
+ tokenMap.put("expires_in", expiresIn);
+ tokenMap.put("scope", scopes);
+ // ... and so on for all key-value pairs
+ resObject.putAll(tokenMap);
+
+ logTokenIssuance(true,false, resObject.toJSONString(), token);
+
+ return ResponseEntity.ok(resObject);
+ } catch (JwtAuthException e) {
+ logger.error("Token request[/auth/oauth/v2/token] => clientId: {}, grantType: {}, scope: {}",
+ clientId, grantType, scopes);
+ logger.error(e);
+ String errorJson = MessageUtil.makeJsonErrorMessage(MessageUtil.ERROR_CODE_AUTH_FAIL, e.getMessage());
+ logTokenIssuance(false ,false, e.getMessage(), null);
+ return ResponseEntity.status(401).body(errorJson);
+ } catch (Exception e) {
+ logger.error("Token request[/auth/oauth/v2/token] => clientId: {}, grantType: {}, scope: {}",
+ clientId, grantType, scopes);
+ logger.error(e);
+ String errorJson = MessageUtil.makeJsonErrorMessage(MessageUtil.ERROR_CODE_AP_ERROR, e.getMessage());
+ logTokenIssuance(false ,false, e.getMessage(), null);
+ return ResponseEntity.status(500).body(errorJson);
+ }finally {
+ RequestContextData.ThreadLocalRequestContext.clear();
+ }
+ }
+
+ private String extractIpAddress(HttpServletRequest request) {
+ String ipAddress = request.getHeader("X-Forwarded-For");
+ if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+ ipAddress = request.getHeader("Proxy-Client-IP");
+ }
+ if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+ ipAddress = request.getHeader("WL-Proxy-Client-IP");
+ }
+ if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+ ipAddress = request.getHeader("HTTP_CLIENT_IP");
+ }
+ if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+ ipAddress = request.getHeader("HTTP_X_FORWARDED_FOR");
+ }
+ if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+ ipAddress = request.getRemoteAddr();
+ }
+ return ipAddress;
+ }
+
+ private void logTokenIssuance(boolean isSuccess, boolean isRestrictionExempt, String resultMessage, String accessToken) {
+ try {
+ if (!EAIDBLogControl.isEnable()) {
+ logger.warn("DB logging is disabled. Skipping token issuance logging.");
+ return;
+ }
+ RequestContextData data = RequestContextData.ThreadLocalRequestContext.get();
+ OAuth2Manager.getInstance();
+
+ TokenIssuanceLog log = new TokenIssuanceLog();
+ String clientId = data.getClientId();
+ log.setClientId(clientId);
+
+ if(StringUtils.isNotBlank(clientId)) {
+ ClientVO clientVO = OAuth2Manager.getInstance().getClientInfo(clientId);
+ log.setAppName(clientVO.getClientName());
+ log.setOrgId(clientVO.getOrgId());
+ log.setOrgName(clientVO.getOrgName());
+ }
+
+ log.setGrantType(data.getGrantType());
+ log.setScope(data.getScope());
+ log.setIpAddress(data.getIpAddress());
+ log.setSuccessYn(isSuccess ? "Y" : "N");
+ log.setIssuanceDateTime(LocalDateTime.now());
+ log.setRestrictionExemptYn(isRestrictionExempt ? "Y" : "N");
+ log.setResultMessage(resultMessage);
+ log.setAccessToken(accessToken); // Add access token value to the log
+
+ tokenIssuanceLogDAO.saveTokenIssuanceLog(log);
+ } catch (Throwable th) {
+ logger.error("Error while logging token issuance: " + th.getMessage(), th);
+ }
+ }
+
+ private void veryfyClient(ClientDetails clientDetails, String clientSecret, Set scopeSet) throws JwtAuthException {
+ if (!StringUtils.equals(clientDetails.getClientSecret(), clientSecret)) {
+ throw new JwtAuthException("invalid_client", "Bad client credentials(client_secret is empty or not match)");
+ }
+
+ if (scopeSet.isEmpty()) {
+ throw new JwtAuthException("invalid_client", "Bad client credentials(Scope is empty)");
+ }
+
+ if (!clientDetails.getScope().containsAll(scopeSet)) {
+ throw new JwtAuthException("invalid_client", "Bad client credentials(Include unacceptable scope)");
+ }
+ }
+}
+
diff --git a/src/main/java/com/eactive/eai/authserver/custom/KjbMGOAuth2AccessTokenRequest.java b/src/main/java/com/eactive/eai/authserver/custom/KjbMGOAuth2AccessTokenRequest.java
new file mode 100644
index 0000000..dcd880b
--- /dev/null
+++ b/src/main/java/com/eactive/eai/authserver/custom/KjbMGOAuth2AccessTokenRequest.java
@@ -0,0 +1,63 @@
+package com.eactive.eai.authserver.custom;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@SuppressWarnings("serial")
+public class KjbMGOAuth2AccessTokenRequest implements Serializable {
+ @JsonProperty("grant_type")
+ private String grantType;
+ @JsonProperty("client_id")
+ private String clientId;
+ @JsonProperty("client_secret")
+ private String clientSecret;
+ private String resource;
+ private String scope;
+
+ public String getGrantType() {
+ return grantType;
+ }
+
+ public void setGrantType(String grantType) {
+ this.grantType = grantType;
+ }
+
+ public String getClientId() {
+ return clientId;
+ }
+
+ public void setClientId(String clientId) {
+ this.clientId = clientId;
+ }
+
+ public String getClientSecret() {
+ return clientSecret;
+ }
+
+ public void setClientSecret(String clientSecret) {
+ this.clientSecret = clientSecret;
+ }
+
+ public String getResource() {
+ return resource;
+ }
+
+ public void setResource(String resource) {
+ this.resource = resource;
+ }
+
+ public String getScope() {
+ return scope;
+ }
+
+ public void setScope(String scope) {
+ this.scope = scope;
+ }
+
+ @Override
+ public String toString() {
+ return "KjbMGOAuth2AccessTokenRequest [grantType=" + grantType + ", clientId=" + clientId + ", clientSecret="
+ + clientSecret + ", resource=" + resource + ", scope=" + scope + "]";
+ }
+}
diff --git a/src/main/java/com/eactive/eai/authserver/custom/KjbMGOAuth2AccessTokenResponse.java b/src/main/java/com/eactive/eai/authserver/custom/KjbMGOAuth2AccessTokenResponse.java
new file mode 100644
index 0000000..b99ffe1
--- /dev/null
+++ b/src/main/java/com/eactive/eai/authserver/custom/KjbMGOAuth2AccessTokenResponse.java
@@ -0,0 +1,105 @@
+package com.eactive.eai.authserver.custom;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+
+@SuppressWarnings("serial")
+@JsonInclude(Include.NON_NULL)
+public class KjbMGOAuth2AccessTokenResponse implements Serializable {
+ private String responseCode;
+ private String responseMessage;
+ @JsonProperty("access_token")
+ private String accessToken;
+ @JsonProperty("refresh_token")
+ private String refreshToken;
+ @JsonProperty("token_type")
+ private String tokenType;
+ @JsonProperty("expires_in")
+ private Long expiresIn;
+ @JsonProperty("expires_on")
+ private Long expiresOn;
+ private String resource;
+ private String scope;
+
+ public String getResponseCode() {
+ return responseCode;
+ }
+
+ public void setResponseCode(String responseCode) {
+ this.responseCode = responseCode;
+ }
+
+ public String getResponseMessage() {
+ return responseMessage;
+ }
+
+ public void setResponseMessage(String responseMessage) {
+ this.responseMessage = responseMessage;
+ }
+
+ public String getAccessToken() {
+ return accessToken;
+ }
+
+ public void setAccessToken(String accessToken) {
+ this.accessToken = accessToken;
+ }
+
+ public String getrefreshToken() {
+ return refreshToken;
+ }
+
+ public void setrefreshToken(String refreshToken) {
+ this.refreshToken = refreshToken;
+ }
+
+ public String getTokenType() {
+ return tokenType;
+ }
+
+ public void setTokenType(String tokenType) {
+ this.tokenType = tokenType;
+ }
+
+ public Long getExpiresIn() {
+ return expiresIn;
+ }
+
+ public void setExpiresIn(Long expiresIn) {
+ this.expiresIn = expiresIn;
+ }
+
+ public Long getExpiresOn() {
+ return expiresOn;
+ }
+
+ public void setExpiresOn(Long expiresOn) {
+ this.expiresOn = expiresOn;
+ }
+
+ public String getResource() {
+ return resource;
+ }
+
+ public void setResource(String resource) {
+ this.resource = resource;
+ }
+
+ public String getScope() {
+ return scope;
+ }
+
+ public void setScope(String scope) {
+ this.scope = scope;
+ }
+
+ @Override
+ public String toString() {
+ return "KjbMGOAuth2AccessTokenResponse [responseCode=" + responseCode + ", responseMessage=" + responseMessage
+ + ", accessToken=" + accessToken + ", tokenType=" + tokenType + ", expiresIn=" + expiresIn
+ + ", refreshToken=" + refreshToken+ ", expiresOn=" + expiresOn+ ", resource=" + resource+ ", scope=" + scope + "]";
+ }
+}
diff --git a/src/main/java/com/eactive/eai/authserver/custom/KjbMGOAuth2Controller.java b/src/main/java/com/eactive/eai/authserver/custom/KjbMGOAuth2Controller.java
new file mode 100644
index 0000000..5899759
--- /dev/null
+++ b/src/main/java/com/eactive/eai/authserver/custom/KjbMGOAuth2Controller.java
@@ -0,0 +1,360 @@
+package com.eactive.eai.authserver.custom;
+
+import java.nio.charset.StandardCharsets;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.Principal;
+import java.security.SecureRandom;
+import java.security.Signature;
+import java.time.LocalDateTime;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import javax.crypto.Cipher;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.math.NumberUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.oauth2.common.OAuth2AccessToken;
+import org.springframework.security.oauth2.common.util.OAuth2Utils;
+import org.springframework.security.oauth2.provider.ClientDetails;
+import org.springframework.security.oauth2.provider.OAuth2Authentication;
+import org.springframework.security.oauth2.provider.OAuth2Request;
+import org.springframework.security.oauth2.provider.endpoint.TokenEndpoint;
+import org.springframework.security.oauth2.provider.token.TokenEnhancer;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.eactive.eai.adapter.http.dynamic.filter.JwtAuthException;
+import com.eactive.eai.authserver.config.IssueLimitOAuth2Exception;
+import com.eactive.eai.authserver.config.RequestContextData;
+import com.eactive.eai.authserver.dao.TokenIssuanceLogDAO;
+import com.eactive.eai.authserver.service.OAuth2Manager;
+import com.eactive.eai.authserver.util.BeanUtils;
+import com.eactive.eai.authserver.vo.ClientVO;
+import com.eactive.eai.common.dao.DAOException;
+import com.eactive.eai.common.logger.EAIDBLogControl;
+import com.eactive.eai.common.util.Logger;
+import com.eactive.eai.common.util.MessageUtil;
+import com.eactive.eai.common.util.UUID;
+import com.eactive.eai.data.entity.onl.authserver.TokenIssuanceLog;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@Controller
+public class KjbMGOAuth2Controller {
+ public static Logger logger = Logger.getLogger(Logger.LOGGER_DEFAULT);
+
+ private static final String HEADER_TRACEID = "traceId";
+
+ private static final String SERVICE_CODE_ACCESS_TOKEN = "00"; // 임시설정
+ @Autowired
+ private TokenIssuanceLogDAO tokenIssuanceLogDAO;
+
+
+ @RequestMapping(value = "/mapi/oauth2/token", method = RequestMethod.POST, consumes = "application/json", produces = "application/json; charset=UTF-8")
+ @ResponseBody
+ public ResponseEntity tokenJson(@RequestBody KjbMGOAuth2AccessTokenRequest tokenRequest,
+ HttpServletRequest request, HttpServletResponse response) {
+
+ return issueToken(tokenRequest, request, response);
+ }
+
+ @RequestMapping(value = "/mapi/oauth2/token", method = RequestMethod.POST, consumes = "application/x-www-form-urlencoded", produces = "application/json; charset=UTF-8")
+ @ResponseBody
+ public ResponseEntity tokenForm(@RequestParam Map params, HttpServletRequest request,
+ HttpServletResponse response) {
+
+ KjbMGOAuth2AccessTokenRequest tokenRequest = new KjbMGOAuth2AccessTokenRequest();
+
+ tokenRequest.setGrantType(params.get("grant_type"));
+ tokenRequest.setClientId(params.get("client_id"));
+ tokenRequest.setClientSecret(params.get("client_secret"));
+ tokenRequest.setScope(params.get("scope"));
+ tokenRequest.setResource(params.get("resource"));
+
+ return issueToken(tokenRequest, request, response);
+ }
+
+ @GetMapping(value = "/mapi/oauth2/token", produces = "application/json; charset=UTF-8")
+ @ResponseBody
+ public ResponseEntity tokenGet(@RequestParam Map params, HttpServletRequest request,
+ HttpServletResponse response) {
+
+ KjbMGOAuth2AccessTokenRequest tokenRequest = new KjbMGOAuth2AccessTokenRequest();
+
+ tokenRequest.setGrantType(params.get("grant_type"));
+ tokenRequest.setClientId(params.get("client_id"));
+ tokenRequest.setClientSecret(params.get("client_secret"));
+ tokenRequest.setScope(params.get("scope"));
+ tokenRequest.setResource(params.get("resource"));
+
+ return issueToken(tokenRequest, request, response);
+ }
+
+ private ResponseEntity issueToken(
+ KjbMGOAuth2AccessTokenRequest tokenRequest,
+ HttpServletRequest request,
+ HttpServletResponse response) {
+
+ if (logger.isDebug()) {
+ logger.debug(tokenRequest.toString());
+ }
+
+ RequestContextData data = new RequestContextData();
+ data.setClientId(tokenRequest.getClientId());
+ data.setIpAddress(extractIpAddress(request));
+ data.setGrantType(tokenRequest.getGrantType());
+ data.setScope(tokenRequest.getScope());
+ data.setUsername("none");
+ data.setResource("none");
+
+ RequestContextData.ThreadLocalRequestContext.set(data);
+
+
+ KjbMGOAuth2AccessTokenResponse responseToken = new KjbMGOAuth2AccessTokenResponse();
+
+ String grantType = tokenRequest.getGrantType();
+ String clientId = tokenRequest.getClientId();
+ String clientSecret = tokenRequest.getClientSecret();
+ String scopes = tokenRequest.getScope();
+
+ try {
+ if (!StringUtils.equals(tokenRequest.getGrantType(), "client_credentials")) {
+ throw new JwtAuthException(
+ String.format("%d%s%s", HttpStatus.BAD_REQUEST.value(), SERVICE_CODE_ACCESS_TOKEN, "02"),
+ "Invalid Mandatory Field {grantType}");
+ }
+
+ String[] scopeArr = org.springframework.util.StringUtils.tokenizeToStringArray(scopes, " ");
+ Set scopeSet = new HashSet();
+ for (String scope : scopeArr) {
+ scopeSet.add(scope);
+ }
+
+ String[] resourceArr = org.springframework.util.StringUtils.tokenizeToStringArray(tokenRequest.getResource(), ",");
+ Set resourceSet = new HashSet();
+ for (String resource : resourceArr) {
+ resourceSet.add(resource);
+ }
+
+ ClientDetails clientDetails = OAuth2Manager.getInstance().getClientDeatilsStore().get(clientId);
+ verifyClient(clientDetails, clientId, clientSecret, scopeSet);
+
+ String traceId = UUID.randomUUID().toString().replace("-", "");
+ response.setHeader(HEADER_TRACEID, traceId);
+
+ HashMap authorizationParameters = new HashMap();
+ authorizationParameters.put(OAuth2Utils.GRANT_TYPE, grantType);
+ authorizationParameters.put(OAuth2Utils.CLIENT_ID, clientId);
+ authorizationParameters.put("client_secret", clientSecret);
+
+ Set responseType = new HashSet();
+ responseType.add(tokenRequest.getGrantType());
+
+ OAuth2Request authorizationRequest = new OAuth2Request(authorizationParameters, clientId, null, true, scopeSet,
+ resourceSet, "", responseType, null);
+
+ Principal principal = new OAuth2Authentication(authorizationRequest, null);
+ ResponseEntity result = tokenEndpoint().postAccessToken(principal,
+ authorizationParameters);
+ OAuth2AccessToken token = result.getBody();
+ if(StringUtils.isNotBlank(token.getTokenType()) && StringUtils.equalsIgnoreCase(token.getTokenType(), "bearer")) {
+ responseToken.setTokenType("Bearer");
+ } else { responseToken.setTokenType(token.getTokenType()); }
+ responseToken.setAccessToken(token.getValue());
+ responseToken.setExpiresIn(Long.valueOf(token.getExpiresIn()));
+ responseToken.setrefreshToken("");
+ responseToken.setExpiresOn(System.currentTimeMillis() + (token.getExpiresIn() * 1000));
+ responseToken.setScope(tokenRequest.getScope());
+ responseToken.setResource(tokenRequest.getResource());
+
+ // 성공 시 JSON 문자열로 변환하여 반환
+ ObjectMapper mapper = new ObjectMapper();
+ String successJson = mapper.writeValueAsString(responseToken);
+
+ return ResponseEntity.ok(successJson);
+
+ } catch (JwtAuthException e) {
+ logger.info("Token request[/mapi/oauth2/token] => clientId: {}, grantType: {}, scope: {}",
+ clientId, grantType, scopes);
+ logger.error(e.getMessage());
+ String errorJson = MessageUtil.makeJsonErrorMessage(MessageUtil.ERROR_CODE_AUTH_FAIL, e.getMessage());
+ int statusCode = NumberUtils.toInt(StringUtils.left(e.getCode(), 3), HttpStatus.UNAUTHORIZED.value());
+ logTokenIssuance(false ,false, e.getMessage(), null);
+ return ResponseEntity.status(statusCode).body(errorJson);
+
+ } catch (Exception e) {
+ logger.info("Token request[/mapi/oauth2/token] => clientId: {}, grantType: {}, scope: {}",
+ clientId, grantType, scopes);
+ logger.error(e.getMessage());
+ String errorJson = MessageUtil.makeJsonErrorMessage(MessageUtil.ERROR_CODE_AUTH_FAIL, "Unauthorized. [Unknown]");
+ logTokenIssuance(false ,false, e.getMessage(), null);
+ return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(errorJson);
+ }finally {
+ RequestContextData.ThreadLocalRequestContext.clear();
+ }
+
+
+ }
+
+ private String extractIpAddress(HttpServletRequest request) {
+ String ipAddress = request.getHeader("X-Forwarded-For");
+ if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+ ipAddress = request.getHeader("Proxy-Client-IP");
+ }
+ if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+ ipAddress = request.getHeader("WL-Proxy-Client-IP");
+ }
+ if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+ ipAddress = request.getHeader("HTTP_CLIENT_IP");
+ }
+ if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+ ipAddress = request.getHeader("HTTP_X_FORWARDED_FOR");
+ }
+ if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+ ipAddress = request.getRemoteAddr();
+ }
+ return ipAddress;
+ }
+
+ private void verifyClient(ClientDetails clientDetails, String clientId, String clientSecret, Set scopeSet)
+ throws JwtAuthException {
+
+ if (StringUtils.isBlank(clientId)) {
+ throw new JwtAuthException(
+ String.format("%d%s%s", HttpStatus.BAD_REQUEST.value(), SERVICE_CODE_ACCESS_TOKEN, "02"),
+ "Invalid Mandatory Field {client_id}");
+ }
+
+ if (clientDetails == null) {
+ throw new JwtAuthException(
+ String.format("%d%s%s", HttpStatus.UNAUTHORIZED.value(), SERVICE_CODE_ACCESS_TOKEN, "00"),
+ "Unauthorized. [client not found]");
+ }
+
+ if (StringUtils.isBlank(clientSecret)) {
+ throw new JwtAuthException(
+ String.format("%d%s%s", HttpStatus.BAD_REQUEST.value(), SERVICE_CODE_ACCESS_TOKEN, "02"),
+ "Invalid Mandatory Field {client_secret}");
+ }
+
+ if (!StringUtils.equals(clientDetails.getClientSecret(), clientSecret)) {
+ throw new JwtAuthException(
+ String.format("%d%s%s", HttpStatus.UNAUTHORIZED.value(), SERVICE_CODE_ACCESS_TOKEN, "00"),
+ "Unauthorized. [Bad client credentials(Client Secret is not match)]");
+ }
+
+ if (scopeSet.isEmpty()) {
+ throw new JwtAuthException(
+ String.format("%d%s%s", HttpStatus.BAD_REQUEST.value(), SERVICE_CODE_ACCESS_TOKEN, "02"),
+ "Invalid Mandatory Field {scope}");
+ }
+
+ if (!clientDetails.getScope().containsAll(scopeSet)) {
+ throw new JwtAuthException(
+ String.format("%d%s%s", HttpStatus.UNAUTHORIZED.value(), SERVICE_CODE_ACCESS_TOKEN, "00"),
+ "Unauthorized. [Bad client credentials(Include unacceptable scope)]");
+ }
+
+ }
+
+ private TokenEndpoint tokenEndpoint() {
+ return BeanUtils.getBean("tokenEndpoint", TokenEndpoint.class);
+ }
+
+ private void logTokenIssuance(boolean isSuccess, boolean isRestrictionExempt, String resultMessage, String accessToken) {
+ try {
+ if (!EAIDBLogControl.isEnable()) {
+ logger.warn("DB logging is disabled. Skipping token issuance logging.");
+ return;
+ }
+ RequestContextData data = RequestContextData.ThreadLocalRequestContext.get();
+ OAuth2Manager.getInstance();
+
+ TokenIssuanceLog log = new TokenIssuanceLog();
+ String clientId = data.getClientId();
+ log.setClientId(clientId);
+
+ if(StringUtils.isNotBlank(clientId)) {
+ ClientVO clientVO = OAuth2Manager.getInstance().getClientInfo(clientId);
+ log.setAppName(clientVO.getClientName());
+ log.setOrgId(clientVO.getOrgId());
+ log.setOrgName(clientVO.getOrgName());
+ }
+
+ log.setGrantType(data.getGrantType());
+ log.setScope(data.getScope());
+ log.setIpAddress(data.getIpAddress());
+ log.setSuccessYn(isSuccess ? "Y" : "N");
+ log.setIssuanceDateTime(LocalDateTime.now());
+ log.setRestrictionExemptYn(isRestrictionExempt ? "Y" : "N");
+ log.setResultMessage(resultMessage);
+ log.setAccessToken(accessToken); // Add access token value to the log
+
+ tokenIssuanceLogDAO.saveTokenIssuanceLog(log);
+ } catch (Throwable th) {
+ logger.error("Error while logging token issuance: " + th.getMessage(), th);
+ }
+ }
+
+ public static void main(String[] args) throws Exception {
+ // First generate a public/private key pair
+ KeyPairGenerator generator = KeyPairGenerator.getInstance("RSA");
+ // generator.initialize(512, new SecureRandom());
+ //generator.initialize(1024, new SecureRandom());
+ generator.initialize(2048, new SecureRandom());
+ KeyPair pair = generator.generateKeyPair();
+
+ // The private key can be used to sign (not encrypt!) a message. The public key
+ // holder can then verify the message.
+
+ String message = "sSGJDwlJsel5WeXodzd3J3MQ20KYCZpL|2022-12-21T14:36:19+07:00";
+
+ // Let's sign our message
+ Signature privateSignature = Signature.getInstance("SHA256withRSA");
+ privateSignature.initSign(pair.getPrivate());
+ privateSignature.update(message.getBytes(StandardCharsets.UTF_8));
+ // System.out.println("private key=" + Base64.getEncoder().encodeToString(pair.getPrivate().getEncoded()));
+ byte[] signature = privateSignature.sign();
+ //System.out.println("signature=" + new String(signature, StandardCharsets.UTF_8));
+ // System.out.println("signature=" + Base64.getEncoder().encodeToString(signature));
+
+ // Let's check the signature
+ Signature publicSignature = Signature.getInstance("SHA256withRSA");
+ publicSignature.initVerify(pair.getPublic());
+ publicSignature.update(message.getBytes(StandardCharsets.UTF_8));
+ boolean isCorrect = publicSignature.verify(signature);
+ // System.out.println("public key=" + Base64.getEncoder().encodeToString(pair.getPublic().getEncoded()));
+
+ // System.out.println("Signature correct: " + isCorrect);
+
+ // The public key can be used to encrypt a message, the private key can be used
+ // to decrypt it.
+ // Encrypt the message
+ Cipher encryptCipher = Cipher.getInstance("RSA");
+ encryptCipher.init(Cipher.ENCRYPT_MODE, pair.getPublic());
+
+ byte[] cipherText = encryptCipher.doFinal(message.getBytes(StandardCharsets.UTF_8));
+
+ // Now decrypt it
+ Cipher decriptCipher = Cipher.getInstance("RSA");
+ decriptCipher.init(Cipher.DECRYPT_MODE, pair.getPrivate());
+
+ String decipheredMessage = new String(decriptCipher.doFinal(cipherText), StandardCharsets.UTF_8);
+
+ // System.out.println(decipheredMessage);
+ }
+}
diff --git a/src/main/java/com/eactive/eai/custom/adapter/app/impl/JwtTokenCreator.java b/src/main/java/com/eactive/eai/custom/adapter/app/impl/JwtTokenCreator.java
new file mode 100644
index 0000000..47a4ded
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/adapter/app/impl/JwtTokenCreator.java
@@ -0,0 +1,477 @@
+package com.eactive.eai.custom.adapter.app.impl;
+
+import java.text.ParseException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.Set;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
+//import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.oauth2.common.OAuth2AccessToken;
+import org.springframework.security.oauth2.common.util.OAuth2Utils;
+import org.springframework.security.oauth2.provider.ClientDetails;
+import org.springframework.security.oauth2.provider.OAuth2Authentication;
+import org.springframework.security.oauth2.provider.OAuth2Request;
+import org.springframework.security.oauth2.provider.TokenRequest;
+import org.springframework.security.oauth2.provider.token.DefaultTokenServices;
+import org.springframework.security.oauth2.provider.token.TokenEnhancer;
+import org.springframework.security.oauth2.provider.token.TokenEnhancerChain;
+import org.springframework.security.oauth2.provider.token.TokenStore;
+import org.springframework.security.oauth2.provider.token.store.JwtAccessTokenConverter;
+import org.springframework.security.oauth2.provider.token.store.JwtTokenStore;
+
+import com.eactive.eai.adapter.app.BusinessApplication;
+import com.eactive.eai.adapter.http.dynamic.filter.ApiAuthFilter;
+import com.eactive.eai.adapter.http.dynamic.filter.JwtAuthException;
+//import com.eactive.eai.adapter.http.dynamic.filter.JwtAuthFilter;
+import com.eactive.eai.authserver.service.OAuth2Manager;
+import com.eactive.eai.authserver.util.BeanUtils;
+import com.eactive.eai.authserver.vo.ClientVO;
+import com.eactive.eai.common.util.Logger;
+//import com.nimbusds.jwt.SignedJWT;
+
+/**
+ * JWT 토큰을 발급한다.(인증은 요청시스템에서 수행하고 토큰만 발급)
+ *
+ * @author
+ *
+ */
+public class JwtTokenCreator implements BusinessApplication {
+ public static Logger logger = Logger.getLogger(Logger.LOGGER_DEFAULT);
+
+ private static final boolean VERYFY_CLIENT_SECRET = true;
+ private static final String[] GRANT_TYPES = { "client_credentials", "authorization_code", "password",
+ "refresh_token" };
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public Object executeApplication(Properties prop, Object messageBytes, Properties tempProp) throws Exception {
+ // 응답전문용 Json Object
+ JSONObject resObject = new JSONObject();
+
+ try {
+ if (messageBytes == null) {
+ throw new Exception("Message is null.");
+ }
+
+ String message = new String((byte[]) messageBytes);
+ if (StringUtils.isBlank(message)) {
+ throw new Exception("Message is empty.");
+ }
+
+ /**
+ * {
+ * "grant_type":"client_credentials",
+ * "client_id":"WNHZOadBfB9UCPPuq6YArKUW87elXmZX",
+ * "client_secret":"JhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9",
+ * "scope":"manage",
+ * "expires_in":3600,
+ * "resource_ids":"aaa, bbb",
+ * "authorities":"ROLE_ADM, ROLE_DEV",
+ * "user_name":"aaaaaaaaaaaaaa",
+ * "support_refresh_token_yn": "Y",
+ * "refresh_token_expires_in":86400,
+ * "refresh_token":"JhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOj~~",
+ * "iss":"AZABBB0000",
+ * "aud":"ZZAAAA0000"
+ * }
+ */
+ boolean isVerifyClientSecret = VERYFY_CLIENT_SECRET;
+ // 요청전문 Json Object
+ JSONObject jsonObject = (JSONObject) JSONValue.parse(message);
+
+ /* 2022.5.25. yseo
+ * 복합거래여부 확인, 복합거래의 경우 요청전문의 내용을 응답전문에 그대로 복사
+ * 복합거래 : 토큰발급 이후 2차 처리를 위한 Outbound Adapter를 다시 호출하는 거래
+ * 복합거래 대상 EAIServiceCD는 APP Adapter의 프로퍼티(SVC_CD)에 등록해서 관리.
+ */
+ String svcCds = prop.getProperty("SVC_CD");
+ String[] svcCdArr = org.springframework.util.StringUtils.tokenizeToStringArray(svcCds, ",");
+ Boolean isComplex = ArrayUtils.contains(svcCdArr, tempProp.getProperty("EAISvcCd"))?true:false;
+ if(isComplex) {
+ resObject = jsonObject;
+ }
+ logger.debug("1. isComplex : [" + isComplex + "]");
+
+ String grantType = (String) jsonObject.get(OAuth2Utils.GRANT_TYPE);
+ if (!ArrayUtils.contains(GRANT_TYPES, grantType)) {
+ throw new JwtAuthException("unsupported_grant_type", "Unsupported grant type");
+ }
+ logger.debug("2. grantType : [" + grantType + "]");
+
+ String clientId = (String) jsonObject.get(OAuth2Utils.CLIENT_ID);
+ if (StringUtils.isBlank(clientId)) {
+ throw new JwtAuthException("invalid_client", "Bad client credentials(client_id is empty)");
+ /* clientId에 허용된 grantType인지 확인 2022.05.23 yseo*/
+ } else {
+ veryfyGrantType(clientId, grantType);
+ }
+ logger.debug("3. clientId : [" + clientId + "]");
+
+ /* grantType = "client_credentials" 이면 client_secret 체크 2022.05.23 yseo
+ * Mydata 관련해서는 무조건 체크해야함.
+ */
+// if (!StringUtils.equalsIgnoreCase(grantType, "client_credentials")) isVerifyClientSecret = false;
+ if (isVerifyClientSecret) {
+ String clientSecret = (String) jsonObject.get("client_secret");
+ if (StringUtils.isBlank(clientSecret)) {
+ throw new JwtAuthException("invalid_client", "Bad client credentials(client_secret is empty)");
+ }
+ veryfyClientSecret(clientId, clientSecret);
+ logger.debug("4. clientSecret : [" + clientSecret + "]");
+ }
+
+ Set scopeSet = assignScope((String) jsonObject.get(OAuth2Utils.SCOPE));
+ if (scopeSet == null || scopeSet.size() == 0) {
+ if (!StringUtils.equals(grantType, "refresh_token")) {
+ throw new Exception("scope is empty.");
+ }
+ }
+ logger.debug("5. scopeSet : [" + scopeSet + "]");
+
+ Set resourceIdSet = assignResourceIds((String) jsonObject.get("resource"));
+ Set authoritiesSet = assignAuthorities((String) jsonObject.get("authorities"));
+
+ String userName = (String) jsonObject.get("user_name");
+ if (StringUtils.equals(grantType, "password") || StringUtils.equals(grantType, "authorization_code")) {
+ if (StringUtils.isBlank(userName)) {
+ throw new Exception("user_name is empty.");
+ }
+ }
+ logger.debug("6. userName : [" + userName + "]");
+
+ /* 요청정보에 expires_in(토큰유효기간) 값이 없는 경우, client정보에 등록된 유효기간 찾아 대체 2022.05.23 yseo*/
+ String expIn = String.valueOf(jsonObject.get(OAuth2AccessToken.EXPIRES_IN));
+ Long expiresIn = null;
+ if (StringUtils.isNumeric(expIn)) {
+ expiresIn = Long.parseLong(expIn);
+ } else if (StringUtils.isBlank(expIn) || StringUtils.equalsIgnoreCase("null", expIn)) {
+ expiresIn = assignDefaultExpiresIn(clientId, "expires_in");
+ } else {
+ throw new Exception("expires_in is not numeric.");
+ }
+ logger.debug("7. expiresIn : [" + expIn + "]");
+// Long expiresIn = (Long) jsonObject.get(OAuth2AccessToken.EXPIRES_IN);
+// if (expiresIn == null) {
+// expiresIn = assignDefaultExpiresIn(clientId, "expires_in");
+// }
+
+ boolean supportRefreshToken = BooleanUtils.toBoolean((String) jsonObject.getOrDefault("support_refresh_token_yn", "N"));
+ /* 요청정보에 refresh_token_expires_in(리프레시토큰유효기간) 값이 없는 경우, client정보에 등록된 유효기간 찾아 대체 2022.05.23 yseo*/
+ String refreshExpIn = String.valueOf(jsonObject.get("refresh_token_expires_in"));
+ Long refreshTokenExpiresIn = null;
+ if (supportRefreshToken && StringUtils.isNumeric(refreshExpIn)) {
+ refreshTokenExpiresIn = Long.parseLong(refreshExpIn);
+ } else if (supportRefreshToken && (StringUtils.isBlank(refreshExpIn) || StringUtils.equalsIgnoreCase("null", refreshExpIn))) {
+ refreshTokenExpiresIn = assignDefaultExpiresIn(clientId, "refresh_token_expires_in");
+ } else if (supportRefreshToken) {
+ throw new Exception("refresh_token_expires_in is not numeric.");
+ }
+ logger.debug("8. refreshTokenExpiresIn : [" + refreshExpIn + "]");
+// Long refreshTokenExpiresIn = (Long) jsonObject.get("refresh_token_expires_in");
+// if (supportRefreshToken && refreshTokenExpiresIn == null) {
+// refreshTokenExpiresIn = assignDefaultExpiresIn(clientId, "refresh_token_expires_in");
+// }
+
+ String refreshToken = (String) jsonObject.get("refresh_token");
+ if (StringUtils.equals(grantType, "refresh_token") && StringUtils.isBlank(refreshToken)) {
+ throw new JwtAuthException("invalid_token", "refresh_token is empty.");
+ }
+ logger.debug("9. refreshToken : [" + refreshToken + "]");
+
+ String iss = (String) jsonObject.get("iss");
+// if (StringUtils.isBlank(iss)) {
+// iss = assignDefaultStringValue(clientId, "iss");
+// }
+// logger.debug("10. iss : [" + iss + "]");
+//
+ String aud = (String) jsonObject.get("aud");
+// if (StringUtils.isBlank(aud)) {
+// aud = assignDefaultStringValue(clientId, "aud");
+// }
+// logger.debug("11. aud : [" + aud + "]");
+
+ String tokenStr = createToken(grantType, clientId, scopeSet, resourceIdSet, authoritiesSet, userName, expiresIn,
+ supportRefreshToken, refreshTokenExpiresIn, refreshToken, iss, aud);
+// logger.debug("#####created tokenStr==>"+tokenStr);
+
+ //20211122 bearer -> Bearer로 변환철. mydata api준수
+ JSONObject jsonObj = (JSONObject) JSONValue.parse(tokenStr);
+ String tokenType = (String)jsonObj.get("token_type");
+ if(StringUtils.isNotBlank(tokenType) && StringUtils.equalsIgnoreCase(tokenType, "bearer")) {
+ jsonObj.put("token_type","Bearer");
+ }
+ jsonObj.remove("jti");
+ jsonObj.put("resource", (String) jsonObject.get("resource"));
+ if (StringUtils.equals(grantType, "password") || StringUtils.equals(grantType, "authorization_code")) {
+ jsonObj.put("refresh_token_expires_in", refreshTokenExpiresIn-1);
+ }
+ tokenStr = jsonObj.toJSONString();
+ logger.debug("##### Bearer checked tokenStr==>"+tokenStr);
+
+ // 복합거래의 경우 발급된 토큰정보를 "TOKEN_DATAGROUP" 그룹으로 추가
+ if(isComplex) {
+ resObject.put("TOKEN_DATAGROUP", jsonObj);
+ } else {
+ resObject.putAll(jsonObj);
+ }
+ String resStr = resObject.toJSONString();
+
+ return resStr.getBytes();
+ } catch (JwtAuthException e) {
+ logger.error(e);
+
+ JSONObject errorJson = new JSONObject();
+ errorJson.put("error", e.getCode());
+ errorJson.put("error_description", e.getMessage());
+ resObject.putAll(errorJson);
+ return resObject.toJSONString().getBytes();
+ } catch (Exception e) {
+ logger.error(e);
+
+ JSONObject errorJson = new JSONObject();
+ errorJson.put("error", "invalid_request");
+ errorJson.put("error_description", e.getMessage());
+ resObject.putAll(errorJson);
+ return resObject.toJSONString().getBytes();
+ }
+ }
+
+ private Set assignResourceIds(String resourceIds) throws Exception {
+ if (StringUtils.isBlank(resourceIds)) {
+ return null;
+ }
+
+ String[] arr = org.springframework.util.StringUtils.tokenizeToStringArray(resourceIds, ",");
+ Set resourceIdSet = new HashSet();
+ for (String resourceId : arr) {
+ resourceIdSet.add(resourceId);
+ }
+
+ return resourceIdSet;
+ }
+
+ private void veryfyGrantType(String clientId, String grantType) throws JwtAuthException {
+ ClientDetails details = OAuth2Manager.getInstance().getClientDeatilsStore().get(clientId);
+ if (details == null) {
+ throw new JwtAuthException("invalid_client", "Bad client credentials(not found)");
+ }
+
+ if (!details.getAuthorizedGrantTypes().contains(grantType)) {
+ throw new JwtAuthException("unsupported_grant_type", "Unsupported grant type for ClientID");
+ }
+ }
+
+ private void veryfyClientSecret(String clientId, String clientSecret) throws JwtAuthException {
+ ClientDetails details = OAuth2Manager.getInstance().getClientDeatilsStore().get(clientId);
+ if (details == null) {
+ throw new JwtAuthException("invalid_client", "Bad client credentials(not found)");
+ }
+
+ if (!StringUtils.equals(details.getClientSecret(), clientSecret)) {
+ throw new JwtAuthException("invalid_client", "Bad client credentials");
+ }
+ }
+
+ private Long assignDefaultExpiresIn(String clientId, String flag) throws JwtAuthException {
+ ClientDetails details = OAuth2Manager.getInstance().getClientDeatilsStore().get(clientId);
+ Long retLong = null;
+ if (details == null) {
+ throw new JwtAuthException("invalid_client", "Bad client credentials(not found)");
+ }
+
+ if (StringUtils.equals(flag, "expires_in") && StringUtils.isNotBlank(details.getAccessTokenValiditySeconds().toString())) {
+ retLong = new Long(details.getAccessTokenValiditySeconds());
+ } else if (StringUtils.equals(flag, "refresh_token_expires_in") && StringUtils.isNotBlank(details.getRefreshTokenValiditySeconds().toString())) {
+ retLong = new Long(details.getRefreshTokenValiditySeconds());
+ } else {
+ throw new JwtAuthException("invalid_client", "Bad expires_in/refresh_token_expires_in(not found)");
+ }
+ return retLong;
+ }
+
+ private String assignDefaultStringValue(String clientId, String flag) throws Exception {
+ ClientVO client = (ClientVO) OAuth2Manager.getInstance().getClientDeatilsStore().get(clientId);
+ String retStr = "";
+ if (client == null) {
+ throw new JwtAuthException("invalid_client", "Bad client credentials(not found)");
+ }
+
+ if (StringUtils.equals(flag, "iss") && StringUtils.isNotBlank(client.getIssuer())) {
+ retStr = client.getIssuer();
+ } else if (StringUtils.equals(flag, "aud") && StringUtils.isNotBlank(client.getAudience())) {
+ retStr = client.getAudience();
+ } else {
+ throw new Exception("iss/aud is null.");
+ }
+ logger.info("===================>"+flag+" : ["+retStr+"]");
+ return retStr;
+ }
+
+ private Set assignScope(String scopes) throws Exception {
+ if (StringUtils.isBlank(scopes)) {
+ return new HashSet();
+ }
+
+ String[] arr = org.springframework.util.StringUtils.tokenizeToStringArray(scopes, " ");
+ Set scopeSet = new HashSet();
+ for (String scope : arr) {
+ scopeSet.add(scope);
+ }
+
+ return scopeSet;
+ }
+
+ private Set assignAuthorities(String authorities) throws Exception {
+ if (StringUtils.isBlank(authorities)) {
+ return new HashSet();
+ }
+
+ String[] arr = org.springframework.util.StringUtils.tokenizeToStringArray(authorities, ",");
+ Set authoritiesSet = new HashSet();
+ for (String authority : arr) {
+ authoritiesSet.add(new SimpleGrantedAuthority(authority));
+ }
+
+ return authoritiesSet;
+ }
+
+ private String createToken(String grantType, String clientId, Set scopeSet, Set resourceIdSet,
+ Set authoritiesSet, String userName, Long expiresIn, boolean supportRefreshToken,
+ Long refreshTokenExpiresIn, String refreshToken, String issuer, String audience) throws Exception {
+ HashMap authorizationParameters = new HashMap();
+ authorizationParameters.put(OAuth2Utils.GRANT_TYPE, grantType);
+ authorizationParameters.put(OAuth2Utils.CLIENT_ID, clientId);
+// authorizationParameters.put("iss", issuer);
+// authorizationParameters.put("aud", audience);
+ if (StringUtils.equals(grantType, "password") || StringUtils.equals(grantType, "authorization_code")) {
+ authorizationParameters.put("user_name", userName);
+ }
+
+ Set responseType = new HashSet();
+ responseType.add(grantType);
+
+ OAuth2Request authorizationRequest = new OAuth2Request(authorizationParameters, clientId, authoritiesSet, true,
+ scopeSet, resourceIdSet, "", responseType, null);
+
+ Authentication authentication = null;
+ if (StringUtils.equals(grantType, "password") || StringUtils.equals(grantType, "authorization_code")) {
+ User userPrincipal = new User(userName, "", true, true, true, true, authoritiesSet);
+ authentication = new UsernamePasswordAuthenticationToken(userPrincipal, null, authoritiesSet);
+ }
+
+ OAuth2Authentication authenticationRequest = new OAuth2Authentication(authorizationRequest, authentication);
+ authenticationRequest.setAuthenticated(true);
+
+ DefaultTokenServices tokenServices = createDefaultTokenServices(supportRefreshToken, expiresIn,
+ refreshTokenExpiresIn);
+ OAuth2AccessToken accessToken = null;
+ if (StringUtils.equals(grantType, "refresh_token")) {
+ tokenServices.setReuseRefreshToken(true);
+ TokenRequest tokenRequest = new TokenRequest(authorizationParameters, clientId, scopeSet, grantType);
+ accessToken = tokenServices.refreshAccessToken(refreshToken, tokenRequest);
+ } else {
+ accessToken = tokenServices.createAccessToken(authenticationRequest);
+ }
+
+ logger.debug("accessToken=" + accessToken.toString());
+
+ return new ObjectMapper().writeValueAsString(accessToken);
+ }
+
+ private DefaultTokenServices createDefaultTokenServices(boolean supportRefreshToken, Long expiresIn,
+ Long refreshTokenExpiresIn) throws Exception {
+ TokenEnhancerChain tokenEnhancerChain = new TokenEnhancerChain();
+ tokenEnhancerChain.setTokenEnhancers(Arrays.asList(tokenEnhancer(), accessTokenConverter()));
+
+ DefaultTokenServices tokenServices = new DefaultTokenServices();
+ tokenServices.setTokenStore(tokenStore());
+ tokenServices.setSupportRefreshToken(supportRefreshToken);
+ tokenServices.setTokenEnhancer(tokenEnhancerChain);
+ if (expiresIn != null) {
+ tokenServices.setAccessTokenValiditySeconds(expiresIn.intValue());
+ }
+ if (supportRefreshToken && refreshTokenExpiresIn != null) {
+ tokenServices.setRefreshTokenValiditySeconds(refreshTokenExpiresIn.intValue());
+ }
+ return tokenServices;
+ }
+
+ private TokenEnhancer tokenEnhancer() {
+// return BeanUtils.getBean("tokenEnhancer", TokenEnhancer.class);
+ return (TokenEnhancer) accessTokenConverter();
+ }
+
+ private JwtAccessTokenConverter accessTokenConverter() {
+ return BeanUtils.getBean("jwtAccessTokenConverter", JwtAccessTokenConverter.class);
+ }
+
+ private TokenStore tokenStore() {
+ return new JwtTokenStore((JwtAccessTokenConverter) accessTokenConverter());
+ }
+
+ public static void main(String args[]){
+
+
+
+// String token = "Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImtpZCI6ImRlZmF1bHRfc3NsX2tleSJ9.ew0KICAiaXNzIjogIkExQUFFUjAwMDAiLA0KICAiYXVkIjoiWlZBQUVNMDAwMCIsDQogICJqdGkiOiJlYmI4NmUyMi03YzZmLTQzZDItOTZiMy05NjU0MTAyZTE1M2MiLA0KICAiZXhwIjoiMTYzNjk2ODcwOSIsDQogICJzY29wZSI6ImJhbmsubGlzdCINCn0.nF0JeCHJHn7yBzhjEnge_Eqi0aAeD_WTt0iUB2V2VPJV9zWgMW-Npr3fCXlmYP5HoTjeQES5ftrxWLlLMaxRPHDKWwafgwLm3eQt9r_x_j0PRn-KpoZ9xTWy3oKCQvP0DN0IQepLZfM214nCrjdSPCV17oUS03cBW0lIDmXeROSR2auAMZvkSQqF74E_QLEKF3XLk0MM3Jz4nZp1bBj3PfJyCxjy2ibp12TN0vHccGmSItqANsbeVn0sQybdIraNzb9bptLwWe8WYyn3XugEA9-bavPOSPwrGgLENBnHnzWj1L8yS0rXuEjydCwf6HMAbpNVHQpicM0Q3xdl5W1PBA";
+// String[] components = token.split("\\s");
+
+ //String r "refresh_token_expires_in":"604800","refresh_token":"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImtpZCI6ImRlZmF1bHRfc3NsX2tleSJ9.ew0KICAiaXNzIjogIkExQUFFUjAwMDAiLA0KICAiYXVkIjoiWlZBQUVNMDAwMCIsDQogICJqdGkiOiIwMzI5Y2M3Zi04Y2U2LTQxNzQtYTc5Ny1mMWRjNjg1ZmM5NDAiLA0KICAiZXhwIjoiMTYzNjk2ODcwOSINCn0.dQx6kWm1JCEgueZjUsQJYNDBu2i4P1-jVLKgUH6aX2aBFunlUBtk_zMMFIJb3OvQpz8qPc9xhs1MkM2YHdpJlNleHY3GhhjiQMfYeiCU9yOzv-zuyvOY1pCO0McmHJNdFcxoQfHHFNm4yFay3dOAFE0Z3FQ74nwxrgnzKSucrHCKyGz0pHdLWnWxHNrJMZ4NmaSyPRxU3qxdWFe1soxqgTqpW_SQkTl3D5SWXgevc6zihPPpFhCSOJ39RrJlIVSH1IY5NRAm71AoaZ6ooLsLvPNED3Z7rG-g9coKEU_DASeCNslRZrP0D3azqswFeu-np3zFZUTrgP_TNT6FFReEnA";
+ try {
+ JwtTokenCreator jtc = new JwtTokenCreator();
+// String me="\"d\"";
+ String message= "{\"refresh_token_expires_in\":\"86400\",\"refresh_token\":null,\"grant_type\":\"authorization_code\",\"support_refresh_token_in\":\"Y\",\"user_name\":\"aaa\",\"scope\":\"bank.list\",\"expires_in\":\"3600\",\"client_id\":\"ZZAAAAPacQmv3ZVhtPISDSA9jb9AWjak\"}";
+ JSONObject jsonObject = (JSONObject) JSONValue.parse(message);
+ String grantType = (String) jsonObject.get(OAuth2Utils.GRANT_TYPE);
+ String clientId = (String) jsonObject.get(OAuth2Utils.CLIENT_ID);
+// String clientSecret = (String) jsonObject.get("client_secret");
+ Set scopeSet;
+
+ Properties prop = null;
+ byte[] msgBytes = null;
+ msgBytes = message.getBytes();
+ jtc.executeApplication(prop, msgBytes, prop);
+
+// scopeSet = jtc.assignScope((String) jsonObject.get(OAuth2Utils.SCOPE));
+//
+//
+// Set resourceIdSet = jtc.assignResourceIds((String) jsonObject.get("resource_ids"));
+// Set authoritiesSet = jtc.assignAuthorities((String) jsonObject.get("authorities"));
+//
+// String userName = (String) jsonObject.get("user_name");
+//
+//
+// Long expiresIn = Long.parseLong(jsonObject.get(OAuth2AccessToken.EXPIRES_IN).toString());
+// Long refreshTokenExpiresIn = Long.parseLong(jsonObject.get("refresh_token_expires_in").toString());
+//// Long expiresIn = (Long) jsonObject.get(OAuth2AccessToken.EXPIRES_IN);
+//// Long refreshTokenExpiresIn = (Long) jsonObject.get("refresh_token_expires_in");
+// boolean supportRefreshToken = BooleanUtils
+// .toBoolean((String) jsonObject.getOrDefault("support_refresh_token_yn", "Y"));
+//
+// String refreshToken = (String) jsonObject.get("refresh_token");
+//
+// jtc.createToken( grantType, clientId, scopeSet, resourceIdSet,authoritiesSet, userName, expiresIn, supportRefreshToken,
+// refreshTokenExpiresIn, refreshToken);
+
+ } catch (ParseException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (Exception e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/eactive/eai/custom/adapter/http/dynamic/filter/SnapHmacSha512VerifyFilter.java b/src/main/java/com/eactive/eai/custom/adapter/http/dynamic/filter/SnapHmacSha512VerifyFilter.java
index 79ed101..970d564 100644
--- a/src/main/java/com/eactive/eai/custom/adapter/http/dynamic/filter/SnapHmacSha512VerifyFilter.java
+++ b/src/main/java/com/eactive/eai/custom/adapter/http/dynamic/filter/SnapHmacSha512VerifyFilter.java
@@ -200,6 +200,6 @@ public class SnapHmacSha512VerifyFilter implements HttpAdapterFilter {
"o3Hre3voTrHbLueDrHC0LYM5effHQZILI8t23htbD12TKD5QJUMONqFqv4494iQS46bzHS0xW1fBC5LHo3D0SzhZvQcPUaJZw0iQ79NnzYFUCTrEsoFJRL300dp3Ql4y")
.hmacHex(str);
- System.out.println(hmac);
+ // System.out.println(hmac);
}
}
diff --git a/src/main/java/com/eactive/eai/custom/adapter/http/dynamic/impl/HttpAdapterServiceVirtualAccount.java b/src/main/java/com/eactive/eai/custom/adapter/http/dynamic/impl/HttpAdapterServiceVirtualAccount.java
index bc09fd7..d5f1db1 100644
--- a/src/main/java/com/eactive/eai/custom/adapter/http/dynamic/impl/HttpAdapterServiceVirtualAccount.java
+++ b/src/main/java/com/eactive/eai/custom/adapter/http/dynamic/impl/HttpAdapterServiceVirtualAccount.java
@@ -312,6 +312,7 @@ public class HttpAdapterServiceVirtualAccount extends HttpAdapterServiceSupport
prop.put(INBOUND_METHOD, request.getMethod());
prop.put(INBOUND_URI, request.getRequestURI());
prop.put(INBOUND_HEADER, getHeaders(request));
+ prop.put(INBOUND_EXTPARAMS, StringUtils.defaultString(request.getQueryString()));
if (StringUtils.equals(adptVO.getAdapterGroupVO().getType(), Keys.TYPE_REST)
|| StringUtils.equals(adptVO.getAdapterGroupVO().getType(), Keys.TYPE_HTTP_CUSTOM)) {
// /api/v1/public/getUserInfo.svc
diff --git a/src/main/java/com/eactive/eai/custom/adapter/http/util/GzipBase64Util.java b/src/main/java/com/eactive/eai/custom/adapter/http/util/GzipBase64Util.java
index e6bb864..ca48392 100644
--- a/src/main/java/com/eactive/eai/custom/adapter/http/util/GzipBase64Util.java
+++ b/src/main/java/com/eactive/eai/custom/adapter/http/util/GzipBase64Util.java
@@ -17,13 +17,13 @@ public class GzipBase64Util {
try {
String base64EncodedData = compress(originalString);
- System.out.println("Original String: " + originalString);
- System.out.println("Base64 Encoded String: " + base64EncodedData);
+ // System.out.println("Original String: " + originalString);
+ // System.out.println("Base64 Encoded String: " + base64EncodedData);
// Base64 디코딩 후 gzip 압축 해제
String decodedString = decompress(base64EncodedData);
- System.out.println("Decoded String: " + decodedString);
+ // System.out.println("Decoded String: " + decodedString);
} catch (IOException e) {
e.printStackTrace();
}
diff --git a/src/main/java/com/eactive/eai/custom/adapter/http/util/VirtualAccountBatchUtil.java b/src/main/java/com/eactive/eai/custom/adapter/http/util/VirtualAccountBatchUtil.java
index cab8a87..8f51a13 100644
--- a/src/main/java/com/eactive/eai/custom/adapter/http/util/VirtualAccountBatchUtil.java
+++ b/src/main/java/com/eactive/eai/custom/adapter/http/util/VirtualAccountBatchUtil.java
@@ -54,7 +54,7 @@ public class VirtualAccountBatchUtil {
public String unzipAndSave(String aesKey, String jsonString, String rootFilePath, String fileNamePattern) throws Exception {
// gzippedValue 추출
String gzippedValue = getGzipValue(jsonString, "encData");
- System.out.println("gzippedValue[" + gzippedValue + "]");
+ // System.out.println("gzippedValue[" + gzippedValue + "]");
// 압축 해제
String unziped = GzipBase64Util.decompress(gzippedValue);
diff --git a/src/main/java/com/eactive/eai/custom/adapter/http/util/VirtualAccountTransform.java b/src/main/java/com/eactive/eai/custom/adapter/http/util/VirtualAccountTransform.java
index 321d35f..4abcc23 100644
--- a/src/main/java/com/eactive/eai/custom/adapter/http/util/VirtualAccountTransform.java
+++ b/src/main/java/com/eactive/eai/custom/adapter/http/util/VirtualAccountTransform.java
@@ -64,8 +64,8 @@ public class VirtualAccountTransform {
list.add(" $.encAccount ");
list.add(" $.accounts$.encAccount ");
String cubeOneJson = toCubeOne(aesKey, list, json);
- System.out.println(cubeOneJson);
- System.out.println(toAES(aesKey, list, cubeOneJson));
+ // System.out.println(cubeOneJson);
+ // System.out.println(toAES(aesKey, list, cubeOneJson));
}
}
\ No newline at end of file
diff --git a/src/main/java/com/eactive/eai/custom/inflow/InflowControlManagerSBI.java b/src/main/java/com/eactive/eai/custom/inflow/InflowControlManagerSBI.java
deleted file mode 100644
index 2b3f635..0000000
--- a/src/main/java/com/eactive/eai/custom/inflow/InflowControlManagerSBI.java
+++ /dev/null
@@ -1,425 +0,0 @@
-package com.eactive.eai.custom.inflow;
-
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.eactive.eai.common.dao.DAOFactory;
-import com.eactive.eai.common.exception.ExceptionUtil;
-import com.eactive.eai.common.inflow.CustomBucket;
-import com.eactive.eai.common.inflow.InflowControlDAO;
-import com.eactive.eai.common.inflow.InflowControlManager;
-import com.eactive.eai.common.inflow.InflowTargetVO;
-import com.eactive.eai.common.lifecycle.Lifecycle;
-import com.eactive.eai.common.lifecycle.LifecycleException;
-import com.eactive.eai.common.lifecycle.LifecycleListener;
-import com.eactive.eai.common.lifecycle.LifecycleSupport;
-import com.eactive.eai.common.message.EAIMessage;
-import com.eactive.eai.common.property.PropManager;
-import com.eactive.eai.common.server.EAIServerManager;
-import com.eactive.eai.common.util.Logger;
-import com.eactive.eai.common.util.MessageUtil;
-import com.eactive.eai.message.service.InterfaceMapper;
-import com.ext.eai.common.stdmessage.STDMessageKeys;
-
-import io.github.bucket4j.Bandwidth;
-import io.github.bucket4j.Bucket4j;
-import io.github.bucket4j.local.LocalBucketBuilder;
-
-public class InflowControlManagerSBI implements Lifecycle, com.eactive.eai.common.inflow.Bucket
-{
- static Logger logger = Logger.getLogger(Logger.LOGGER_DEFAULT);
-
- private static InflowControlManagerSBI manager;
-
- private HashMap adapterBucketList;
- private HashMap interfaceBucketList;
- private boolean started;
- private LifecycleSupport lifecycle = new LifecycleSupport(this);
-
- /**
- * 1. 기능 : Default Constructor
- * 2. 처리 개요 : C2RServiceVO Rule 정보를 저장하기 위한 HashMap을 초기화한다.
- * 3. 주의사항
- *
- **/
- private InflowControlManagerSBI() {
- adapterBucketList = new HashMap();
- interfaceBucketList = new HashMap();
- }
-
- /**
- * 1. 기능 : InflowControlManagerSBI Singleton Object를 반환하는 getter method
- * 2. 처리 개요 : C2RServiceManager Singleton Object를 반환한다.
- * 3. 주의사항
- *
- * @return InflowControlManagerSBI Singleton object
- **/
- public static InflowControlManagerSBI getInstance() {
- if(manager == null) {
- synchronized(InflowControlManagerSBI.class) {
- if(manager == null) {
- manager = new InflowControlManagerSBI();
- }
- }
- }
-
- return manager;
- }
-
- public static com.eactive.eai.common.inflow.Bucket getBucket() {
- if(manager == null) {
- synchronized(InflowControlManagerSBI.class) {
- if(manager == null) {
- manager = new InflowControlManagerSBI();
- }
- }
- }
-
- return manager;
- }
-
- /**
- * 유량제어 대상인 거래인지 체크한다.(사이트에 맞게 구성)
- * @param eaiServerManager
- * @param eaiMessage
- * @return
- */
- public static Boolean isTargetOfInflowControl(EAIServerManager eaiServerManager, EAIMessage eaiMessage) {
- // 1. 모든 요청거래
- InterfaceMapper mapper = eaiMessage.getMapper();
- String returnType = mapper.getSendRecvDivision(eaiMessage.getStandardMessage()); // S|R
-
- if (STDMessageKeys.SEND_RECV_CD_SEND.equals(returnType)) {
- return new Boolean(true);
- }
-
- return new Boolean(false);
- }
-
- public void start() throws LifecycleException {
- if (started)
- throw new LifecycleException("RECEAICMM201");
-
- // Notify our interested LifecycleListeners
- lifecycle.fireLifecycleEvent(STARTING_EVENT, this);
-
- // C2RServiceVO Table Initializing ....
-
- try {
- init();
- } catch(Exception e) {
- //throw new LifecycleException("RECEAICMM202");
- throw new LifecycleException(ExceptionUtil.getErrorCode(e,"RECEAICMM202"));
- }
-
- started = true;
- // Notify our interested LifecycleListeners
- lifecycle.fireLifecycleEvent(STARTED_EVENT, this);
- }
-
- private void init() throws Exception {
- initAdapter();
- initInterface();
- }
-
- private void initAdapter() throws Exception {
- // Initializing ....
- adapterBucketList = new HashMap();
- InflowControlDAO dao = null;
- dao = (InflowControlDAO) DAOFactory.newInstance().create(InflowControlDAO.class);
- List inflowAdapterVoList = dao.getInflowAdapterList();
-
- for (InflowTargetVO inflowVo : inflowAdapterVoList) {
- if (InflowControlManagerSBI.isInflowTarget(inflowVo)) {
- CustomBucket bucket = makeBucketUsingInflowVO(inflowVo);
- if (bucket != null) {
- adapterBucketList.put(inflowVo.getName(), bucket);
- }
- }
- }
- }
-
- private void initInterface() throws Exception {
- // Initializing ....
- interfaceBucketList = new HashMap();
- InflowControlDAO dao = null;
- dao = (InflowControlDAO) DAOFactory.newInstance().create(InflowControlDAO.class);
- List inflowInterfaceVoList = dao.getInflowInterfaceList();
-
- for (InflowTargetVO inflowVo : inflowInterfaceVoList) {
- if (InflowControlManagerSBI.isInflowTarget(inflowVo)) {
- CustomBucket bucket = makeBucketUsingInflowVO(inflowVo);
- if (bucket != null) {
- interfaceBucketList.put(inflowVo.getName(), bucket);
- }
- }
- }
- }
-
- public synchronized void reloadAdapter() throws Exception {
- if(logger.isWarn()) {
- logger.warn("InflowControlManagerSBI] reload all Started ...");
- }
- initAdapter();
- if(logger.isWarn()) {
- logger.warn("InflowControlManagerSBI] reload all finished ...");
- }
- }
- public synchronized void reloadInterface() throws Exception {
- if(logger.isWarn()) {
- logger.warn("InflowControlManagerSBI] reload all Started ...");
- }
- initInterface();
- if(logger.isWarn()) {
- logger.warn("InflowControlManagerSBI] reload all finished ...");
- }
- }
-
- public synchronized void reloadAdapter(String adapter) throws Exception {
- if (logger.isWarn()) {
- logger.warn("InflowControlManagerSBI] reload Started ...");
- }
- InflowControlDAO dao = null;
- dao = (InflowControlDAO) DAOFactory.newInstance().create(InflowControlDAO.class);
- Map map = dao.getInflowTargetByAdater(adapter);
- if (map != null) {
- Iterator it = map.keySet().iterator();
- String key = "";
- for (int i = 0; it.hasNext(); i++) {
- key = (String) it.next();
-
- InflowTargetVO inflowTarget = map.get(key);
- if (InflowControlManagerSBI.isInflowTarget(inflowTarget)) {
- CustomBucket bucket = makeBucketUsingInflowVO(inflowTarget);
- if (bucket != null) {
- adapterBucketList.put(inflowTarget.getName(), bucket);
- } else {
- adapterBucketList.remove(inflowTarget.getName());
- }
- } else {
- adapterBucketList.remove(inflowTarget.getName());
- }
- }
- }
- if (logger.isWarn()) {
- logger.warn("InflowControlManagerSBI] reload finished ...");
- }
- }
- public synchronized void reloadInterface(String inter) throws Exception {
- if (logger.isWarn()) {
- logger.warn("InflowControlManagerSBI] reload Started ...");
- }
- InflowControlDAO dao = null;
- dao = (InflowControlDAO) DAOFactory.newInstance().create(InflowControlDAO.class);
- Map map = dao.getInflowTargetByInterface(inter);
- if (map != null) {
- Iterator it = map.keySet().iterator();
- String key = "";
- for (int i = 0; it.hasNext(); i++) {
- key = (String) it.next();
-
- InflowTargetVO inflowTarget = map.get(key);
- if (InflowControlManagerSBI.isInflowTarget(inflowTarget)) {
- CustomBucket bucket = makeBucketUsingInflowVO(inflowTarget);
- if (bucket != null) {
- interfaceBucketList.put(inflowTarget.getName(), bucket);
- } else {
- interfaceBucketList.remove(inflowTarget.getName());
- }
- } else {
- interfaceBucketList.remove(inflowTarget.getName());
- }
- }
- }
-
- if (logger.isWarn()) {
- logger.warn("InflowControlManagerSBI] reload finished ...");
- }
- }
-
- /**
- * 1. 기능 : Lifecycle의 stop 메서드로 C2RServiceManager를 종료하는 메서드
- * 2. 처리 개요 : 멤버에 캐싱한 C2RServiceVO Rule 정보를 clear한다.
- * 3. 주의사항
- *
- * @exception LifecycleException 이미 종료된 경우 발생(RECEAICMM203)
- **/
- public void stop() throws LifecycleException {
- // Validate and update our current component state
- if (!started)
- throw new LifecycleException("RECEAICMM203");
-
- // Notify our interested LifecycleListeners
- lifecycle.fireLifecycleEvent(STOPING_EVENT, this);
-
- adapterBucketList.clear();
- interfaceBucketList.clear();
-
- started = false;
- // Notify our interested LifecycleListeners
- lifecycle.fireLifecycleEvent(STOPPED_EVENT, this);
- }
-
- /**
- * 1. 기능 : LifecycleListener를 등록하는 메서드
- * 2. 처리 개요 : LifecycleListener를 등록한다.
- * 3. 주의사항
- *
- * @param listener LifecycleEvent를 수신한 LifecycleListener
- **/
- public void addLifecycleListener(LifecycleListener listener)
- {
- lifecycle.addLifecycleListener(listener);
- }
-
- public LifecycleListener[] findLifecycleListeners()
- {
- return lifecycle.findLifecycleListeners();
- }
-
- public void removeLifecycleListener(LifecycleListener listener)
- {
- lifecycle.removeLifecycleListener(listener);
- }
-
- public boolean isStarted() {
- return this.started;
- }
-
- public String[] getAdapterAllKeys() {
- Iterator it = this.adapterBucketList.keySet().iterator();
- String[] svcCd = new String[this.adapterBucketList.size()];
- for(int i = 0; it.hasNext(); i++){
- svcCd[i] = (String)it.next();
- }
- Arrays.sort(svcCd);
- return svcCd;
- }
- public String[] getInterfaceAllKeys() {
- Iterator it = this.interfaceBucketList.keySet().iterator();
- String[] svcCd = new String[this.interfaceBucketList.size()];
- for(int i = 0; it.hasNext(); i++){
- svcCd[i] = (String)it.next();
- }
- Arrays.sort(svcCd);
- return svcCd;
- }
-
- public void removeAdapter(String adapter) {
- adapterBucketList.remove(adapter);
- }
- public void removeInterface(String inter) {
- interfaceBucketList.remove(inter);
- }
-
- private CustomBucket makeBucketUsingInflowVO(InflowTargetVO inflowTarget) {
- if (InflowControlManagerSBI.isInflowTarget(inflowTarget)) {
- LocalBucketBuilder builder = Bucket4j.builder();
- if (inflowTarget.getThresholdPerSecond() > 0) { // TPS
- builder.addLimit(Bandwidth.simple(inflowTarget.getThresholdPerSecond(), Duration.ofSeconds(1)));
- }
-
- if (inflowTarget.getThreshold() > 0 && StringUtils.isNotBlank(inflowTarget.getThresholdTimeUnit())) {
- builder.addLimit(Bandwidth.simple(inflowTarget.getThreshold(),
- InflowControlManagerSBI.getPeriod(inflowTarget.getThresholdTimeUnit())));
- }
-
- return new CustomBucket(builder.build(), inflowTarget);
- }
-
- return null;
- }
-
- @Override
- public boolean isAdapterPass(String adapter) {
- CustomBucket b = adapterBucketList.get(adapter);
-
- if ( b == null ) return true;
-
- return b.getLocalBucket().tryConsume(1);
- }
-
- @Override
- public boolean isInterfacePass(String inter) {
- CustomBucket b = interfaceBucketList.get(inter);
-
- if ( b == null ) return true;
-
- return b.getLocalBucket().tryConsume(1);
- }
-
- @Override
- public InflowTargetVO getAdapterInflowThreashold(String adapter) {
- CustomBucket b = adapterBucketList.get(adapter);
- if (b == null) return null;
- return b.getInflowTargetVo();
- }
-
- @Override
- public InflowTargetVO getInterfaceInflowThreashold(String inter) {
- CustomBucket b = interfaceBucketList.get(inter);
- if (b == null) return null;
- return b.getInflowTargetVo();
- }
-
- @Override
- public InflowTargetVO getInflowThreashold(String inter) {
- return null;
- }
-
- public InflowTargetVO getAdapterInflow(String adapter) {
- CustomBucket b = adapterBucketList.get(adapter);
- if (b == null) return null;
- return b.getInflowTargetVo();
- }
-
- public InflowTargetVO getInterfaceInflow(String inter) {
- CustomBucket b = interfaceBucketList.get(inter);
- if (b == null) return null;
- return b.getInflowTargetVo();
- }
-
- public static boolean isInflowTarget(InflowTargetVO inflowTarget) {
- if (inflowTarget == null || !inflowTarget.isActivate()) {
- return false;
- }
-
- if (inflowTarget.getThresholdPerSecond() > 0) {
- return true;
- }
-
- if (inflowTarget.getThreshold() > 0 && StringUtils.equalsAnyIgnoreCase(inflowTarget.getThresholdTimeUnit(),
- InflowControlManager.QUOTA_TIMEUNIT_DAY, InflowControlManager.QUOTA_TIMEUNIT_SECOND,
- InflowControlManager.QUOTA_TIMEUNIT_MINUTE, InflowControlManager.QUOTA_TIMEUNIT_HOUR,
- InflowControlManager.QUOTA_TIMEUNIT_DAY, InflowControlManager.QUOTA_TIMEUNIT_MONTH)) {
- return true;
- }
-
- return false;
- }
-
- public static Duration getPeriod(String timeUnit) {
- if (StringUtils.equalsIgnoreCase(timeUnit, InflowControlManager.QUOTA_TIMEUNIT_SECOND)) {
- return Duration.ofSeconds(1);
- } else if (StringUtils.equalsIgnoreCase(timeUnit, InflowControlManager.QUOTA_TIMEUNIT_MINUTE)) {
- return Duration.ofMinutes(1);
- } else if (StringUtils.equalsIgnoreCase(timeUnit, InflowControlManager.QUOTA_TIMEUNIT_HOUR)) {
- return Duration.ofHours(1);
- } else if (StringUtils.equalsIgnoreCase(timeUnit, InflowControlManager.QUOTA_TIMEUNIT_DAY)) {
- return Duration.ofDays(1);
- } else if (StringUtils.equalsIgnoreCase(timeUnit, InflowControlManager.QUOTA_TIMEUNIT_MONTH)) {
- Calendar calendar = Calendar.getInstance();
- return Duration.ofDays(calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
- } else {
- return null;
- }
- }
-}
diff --git a/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/AllHeaderFilter.java b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/AllHeaderFilter.java
new file mode 100644
index 0000000..7663bda
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/AllHeaderFilter.java
@@ -0,0 +1,123 @@
+package com.eactive.eai.custom.kjb.adapter.http.client.filter;
+
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Properties;
+import java.util.TreeMap;
+import java.util.stream.Stream;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.eactive.eai.adapter.http.dynamic.HttpAdapterServiceKey;
+import com.eactive.eai.adapter.http.dynamic.HttpAdapterServiceSupport;
+import com.eactive.eai.common.TransactionContextKeys;
+import com.eactive.eai.common.property.PropManager;
+import com.eactive.eai.common.util.Logger;
+
+public class AllHeaderFilter implements HttpClientAdapterFilter, HttpAdapterServiceKey {
+ protected static Logger logger = Logger.getLogger(Logger.LOGGER_ADAPTER);
+
+ public static final String PROPERTIES_GROUP_NAME = "HttpHeaderFilter";
+ public static final String HEADER_KEY_NAMES = "AllHeaderFilter.blackList";
+
+
+ String[] HttpHeaderRelayBlackList = {
+ "Content-Length",
+ "Transfer-Encoding",
+ "Host",
+ "Authorization",
+ "Accept",
+ "Host",
+ "Cookie",
+ "Connection",
+ "Keep-Alive",
+ "Proxy-Authenticate",
+ "Proxy-Authorization",
+ "TE",
+ "Trailer",
+ "Transfer-Encoding",
+ "Upgrade",
+ "Content-Type",
+ "Content-Encoding",
+ "Content-Language",
+ "Content-Location",
+ "Content-MD5",
+ "Expect",
+ };
+
+ @Override
+ public Object doPreFilter(String adptGrpName, String adptName, Properties prop, Object message, Properties tempProp)
+ throws Exception {
+
+ logger.debug("doPreFilter Processing Start.");
+
+ Properties filterHeaders = (Properties) tempProp.get("FILTERHEADER");
+ if (filterHeaders == null) {
+ filterHeaders = new Properties();
+ tempProp.put("FILTERHEADER", filterHeaders);
+ }
+
+ Map inboundHeaderMap = getInboundHeaderProp(tempProp);
+
+ String propValue = PropManager.getInstance().getProperty(PROPERTIES_GROUP_NAME, HEADER_KEY_NAMES, "").trim();
+
+ String[] userSettingBlackList = propValue.split(",");
+
+ if( userSettingBlackList.length > 0 ) {
+ HttpHeaderRelayBlackList = Stream
+ .concat(Arrays.stream(HttpHeaderRelayBlackList), Arrays.stream(userSettingBlackList))
+ .toArray(String[]::new);
+ }
+
+
+ for(String keyName : inboundHeaderMap.keySet() ) {
+
+ if( StringUtils.equalsAnyIgnoreCase( keyName, HttpHeaderRelayBlackList ) ) {
+ logger.debug("Skip Processing Key ["+keyName+"], value ["+inboundHeaderMap.get(keyName)+"] in HttpHeaderRelayBlackList");
+ continue;
+ }
+
+ filterHeaders.put(keyName, inboundHeaderMap.get(keyName));
+ logger.debug("Processing Key ["+keyName+"], value ["+inboundHeaderMap.get(keyName)+"]");
+ }
+
+ logger.debug("doPreFilter Processing End.");
+
+ return message;
+ }
+
+ public Map getInboundHeaderProp(Properties prop) {
+ Properties header = new Properties();
+ Map inboundHeaderMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+ try {
+ Object headerObj = prop.get(HttpAdapterServiceKey.INBOUND_HEADER);
+ if (headerObj instanceof Properties) { //tomcat
+ header = (Properties) headerObj;
+ for (String name : header.stringPropertyNames()) {
+ inboundHeaderMap.put(name, header.getProperty(name));
+ }
+ } else if (headerObj instanceof String) { //weblogic
+ String str = (String) headerObj;
+ str = str.substring(1, str.length() - 1);
+ // key=value 쌍 분리
+ String[] entries = str.split(",");
+ for (String entry : entries) {
+ String[] kv = entry.split("=", 2);
+ if (kv.length == 2) {
+ inboundHeaderMap.put(kv[0].trim(), kv[1].trim());
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return inboundHeaderMap;
+ }
+
+ @Override
+ public Object doPostFilter(String adptGrpName, String adptName, Properties prop, Object message,
+ Properties tempProp) throws Exception {
+ return message;
+ }
+
+}
diff --git a/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/AsyncReponseFilter.java b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/AsyncReponseFilter.java
new file mode 100644
index 0000000..5fe0988
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/AsyncReponseFilter.java
@@ -0,0 +1,118 @@
+package com.eactive.eai.custom.kjb.adapter.http.client.filter;
+
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Properties;
+import java.util.TreeMap;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.eactive.eai.adapter.http.dynamic.HttpAdapterServiceKey;
+import com.eactive.eai.common.TransactionContextKeys;
+import com.eactive.eai.common.property.PropManager;
+import com.eactive.eai.common.util.Logger;
+
+
+public class AsyncReponseFilter implements HttpClientAdapterFilter, HttpAdapterServiceKey {
+ protected static Logger logger = Logger.getLogger(Logger.LOGGER_ADAPTER);
+
+ public static final String X_TRACE_ID = "partnerTraceId";
+ public static final String TRACE_ID = "traceId";
+
+ public static final String PROPERTIES_GROUP_NAME = "HttpHeaderFilter";
+ public static final String HEADER_KEY_NAMES = "AsyncReponseFilter";
+
+
+ @Override
+ public Object doPreFilter(String adptGrpName, String adptName, Properties prop, Object message, Properties tempProp)
+ throws Exception {
+
+ logger.debug("AsyncReponseFilter] PreFilter Processing Start!!");
+ String traceId = tempProp.getProperty(TransactionContextKeys.TRANSACTION_UUID, "");
+
+ Properties filterHeaders = (Properties) tempProp.get("FILTERHEADER");
+ if (filterHeaders == null) {
+ filterHeaders = new Properties();
+ tempProp.put("FILTERHEADER", filterHeaders);
+ }
+
+ String propValue = PropManager.getInstance().getProperty(PROPERTIES_GROUP_NAME, HEADER_KEY_NAMES, "").trim();
+
+ String[] headerKeyNames = propValue.split(",");
+
+
+ headerKeyNames = Arrays.stream(headerKeyNames)
+ .map(String::trim)
+ .toArray(String[]::new);
+
+ try {
+ Map inboundHeaderMap = getInboundHeaderProp(tempProp);
+
+ if (!inboundHeaderMap.isEmpty()) {
+ if (inboundHeaderMap.containsKey(X_TRACE_ID)) {
+ filterHeaders.put(X_TRACE_ID, inboundHeaderMap.get(X_TRACE_ID));
+ logger.debug("AsyncReponseFilter] Processing Key ["+X_TRACE_ID+"], value ["+inboundHeaderMap.get(X_TRACE_ID)+"]");
+ }
+
+ if (inboundHeaderMap.containsKey(TransactionContextKeys.X_LOAN_TOKEN)) {
+ filterHeaders.put(TransactionContextKeys.X_LOAN_TOKEN, inboundHeaderMap.get(TransactionContextKeys.X_LOAN_TOKEN));
+ logger.debug("AsyncReponseFilter] Processing Key ["+TransactionContextKeys.X_LOAN_TOKEN+"], value ["+inboundHeaderMap.get(TransactionContextKeys.X_LOAN_TOKEN)+"]");
+ }
+ }
+
+ filterHeaders.setProperty(TRACE_ID, traceId);
+ logger.debug("AsyncReponseFilter] Processing Key ["+TRACE_ID+"], value ["+traceId+"]");
+
+ for (String keyName : inboundHeaderMap.keySet()) {
+
+ if (StringUtils.equalsAnyIgnoreCase(keyName, headerKeyNames)) {
+ String value = inboundHeaderMap.get(keyName);
+ filterHeaders.put(keyName, value);
+ logger.debug("AsyncReponseFilter] Processing Key [" + keyName + "], value [" + value + "]");
+ }
+
+ }
+
+ } catch (Exception e) {
+ logger.error(e.getMessage());
+ }
+
+ return message;
+ }
+
+ public Map getInboundHeaderProp(Properties prop) {
+ Properties header = new Properties();
+ Map inboundHeaderMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+ try {
+ Object headerObj = prop.get(HttpAdapterServiceKey.INBOUND_HEADER);
+ if (headerObj instanceof Properties) { //tomcat
+ header = (Properties) headerObj;
+ for (String name : header.stringPropertyNames()) {
+ inboundHeaderMap.put(name, header.getProperty(name));
+ }
+ } else if (headerObj instanceof String) { //weblogic
+ String str = (String) headerObj;
+ str = str.substring(1, str.length() - 1);
+ // key=value 쌍 분리
+ String[] entries = str.split(",");
+ for (String entry : entries) {
+ String[] kv = entry.split("=", 2);
+ if (kv.length == 2) {
+ inboundHeaderMap.put(kv[0].trim(), kv[1].trim());
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return inboundHeaderMap;
+ }
+
+ @Override
+ public Object doPostFilter(String adptGrpName, String adptName, Properties prop, Object message,
+ Properties tempProp) throws Exception {
+ return message;
+ }
+
+}
+
diff --git a/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/HttpClient5AdapterFilterFactory.java b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/HttpClient5AdapterFilterFactory.java
new file mode 100644
index 0000000..93cdc7c
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/HttpClient5AdapterFilterFactory.java
@@ -0,0 +1,115 @@
+package com.eactive.eai.custom.kjb.adapter.http.client.filter;
+
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.eactive.eai.common.util.Logger;
+
+public class HttpClient5AdapterFilterFactory {
+ static Logger logger = Logger.getLogger(Logger.LOGGER_ADAPTER);
+ static String basePackage = "com.eactive.eai.custom.kjb.adapter.http.client.filter";
+ private static ConcurrentHashMap h = new ConcurrentHashMap<>();
+ private static ConcurrentHashMap eh = new ConcurrentHashMap<>();
+
+ private HttpClient5AdapterFilterFactory() {
+ throw new IllegalStateException("Utility class");
+ }
+
+ public static HttpClientAdapterFilter createFilter(String type) {
+ if (h.containsKey(type)) {
+ return h.get(type);
+ }
+
+ HttpClientAdapterFilter filter = null;
+ switch (HttpClient5AdapterFilterType.getValue(type)) {
+ case SIMPLEFRAMEWORK:
+ filter = new SimpleFrameworkFilter();
+ break;
+ case SIMPLEFRAMEWORKBODY:
+ filter = new SimpleframeworkBodyFilter();
+ break;
+ case JBOBP:
+ filter = new JBOBPFilter();
+ break;
+ case KFTCFACE:
+ filter = new KFTCFaceFilter();
+ break;
+ case KFTCP2P:
+ filter = new KFTCP2PFilter();
+ break;
+ case KAKAOBANK:
+ filter = new KAKAOBankFilter();
+ break;
+ case NAVERFIN:
+ filter = new NAVERFinFilter();
+ break;
+ case NICECREDIT:
+ filter = new NICECreditFilter();
+ break;
+ case TRACEBODY:
+ filter = new TraceBodyFilter();
+ break;
+ case TOSSBANK:
+ filter = new TOSSBankFilter();
+ break;
+ case ASYNCRESPONSE:
+ filter = new AsyncReponseFilter();
+ break;
+ case ALLHEADER:
+ filter = new AllHeaderFilter();
+ break;
+ default:
+ filter = classForName(type);
+ if (filter == null) {
+ filter = classForName(basePackage + "." + type);
+ }
+ break;
+ }
+
+ if (filter != null) {
+ h.put(type, filter);
+ return filter;
+ } else {
+ return null;
+ }
+ }
+
+ private static HttpClientAdapterFilter classForName(String type) {
+ try {
+ Class cl = Class.forName(type);
+ return (HttpClientAdapterFilter) cl.newInstance();
+ } catch (ClassNotFoundException | IllegalAccessException | InstantiationException e) {
+ logger.error("Cannot create a HttpClientAdapterFilter. - {}", type);
+ return null;
+ }
+ }
+
+ public static HttpClientAdapterExceptionFilter createExceptionFilter(String type) {
+ if (eh.containsKey(type)) {
+ return eh.get(type);
+ }
+
+ HttpClientAdapterExceptionFilter filter = classForExceptionFilterName(type);
+ if (filter == null) {
+ filter = classForExceptionFilterName(basePackage + "." + type);
+ }
+
+ if (filter != null) {
+ eh.put(type, filter);
+ return filter;
+ } else {
+ return null;
+ }
+ }
+
+ private static HttpClientAdapterExceptionFilter classForExceptionFilterName(String type) {
+ try {
+ Class cl = Class.forName(type);
+ return (HttpClientAdapterExceptionFilter) cl.newInstance();
+ } catch (ClassNotFoundException | IllegalAccessException | InstantiationException e) {
+ logger.error("Cannot create a HttpClientAdapterExceptionFilter. - {}", type);
+ return null;
+ }
+ }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/HttpClient5AdapterFilterType.java b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/HttpClient5AdapterFilterType.java
new file mode 100644
index 0000000..71af1f4
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/HttpClient5AdapterFilterType.java
@@ -0,0 +1,27 @@
+package com.eactive.eai.custom.kjb.adapter.http.client.filter;
+
+public enum HttpClient5AdapterFilterType {
+ SIMPLEFRAMEWORK,
+ SIMPLEFRAMEWORKBODY,
+ JBOBP,
+ KFTCFACE,
+ KFTCP2P,
+ KAKAOBANK,
+ NAVERFIN,
+ NICECREDIT,
+ TOSSBANK,
+ TRACEBODY,
+ ASYNCRESPONSE,
+ ALLHEADER,
+ UNKNOWN;
+
+ public static HttpClient5AdapterFilterType getValue(String type) {
+ try {
+ return valueOf(type.toUpperCase());
+ } catch (NullPointerException e) {
+ return UNKNOWN;
+ } catch (Exception e) {
+ return UNKNOWN;
+ }
+ }
+}
diff --git a/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/HttpClientAdapterBaseFilter.java b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/HttpClientAdapterBaseFilter.java
new file mode 100644
index 0000000..25f710a
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/HttpClientAdapterBaseFilter.java
@@ -0,0 +1,62 @@
+package com.eactive.eai.custom.kjb.adapter.http.client.filter;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+import com.eactive.eai.common.util.Logger;
+
+public abstract class HttpClientAdapterBaseFilter implements HttpClientAdapterFilter {
+ protected static Logger logger = Logger.getLogger(Logger.LOGGER_ADAPTER);
+ protected String filterName = "";
+ protected List filters;
+
+ protected HttpClientAdapterBaseFilter(String filterName) {
+ this.filterName = filterName;
+ filters = new ArrayList<>();
+ logger.info("{}] filter created.", filterName);
+ }
+
+ protected void addFilter(HttpClientAdapterFilter filter) {
+ filters.add(filter);
+ logger.info("{}] sub filter({}) added. filters= {}", filterName, filter, filters);
+ }
+
+ @Override
+ public Object doPreFilter(String adptGrpName, String adptName, Properties prop, Object message, Properties tempProp)
+ throws Exception {
+ try {
+ Object filteredMessage = message;
+ for(HttpClientAdapterFilter subFilter : filters) {
+ logger.debug("{}] sub filter({}) doPreFilter start.", filterName, subFilter);
+ filteredMessage = subFilter.doPreFilter(adptGrpName, adptName, prop, filteredMessage, tempProp);
+ logger.debug("{}] sub filter({}) doPreFilter end.", filterName, subFilter);
+ }
+
+ return filteredMessage;
+ } catch (Exception e) {
+ logger.error(this.filterName + "] doPreFilter error.", e);
+ throw e;
+ }
+ }
+
+ @Override
+ public Object doPostFilter(String adptGrpName, String adptName, Properties prop, Object message,
+ Properties tempProp) throws Exception {
+ try {
+ Object filteredMessage = message;
+ for(HttpClientAdapterFilter subFilter : filters) {
+ logger.debug("{}] sub filter({}) doPostFilter start.", filterName, subFilter);
+ filteredMessage = subFilter.doPostFilter(adptGrpName, adptName, prop, filteredMessage, tempProp);
+ logger.debug("{}] sub filter({}) doPostFilter end.", filterName, subFilter);
+ }
+ return filteredMessage;
+ } catch (Exception e) {
+ logger.error(this.filterName + "] doPostFilter error.", e);
+ throw e;
+ }
+ }
+
+
+
+}
diff --git a/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/HttpClientAdapterExceptionFilter.java b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/HttpClientAdapterExceptionFilter.java
new file mode 100644
index 0000000..6c809f3
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/HttpClientAdapterExceptionFilter.java
@@ -0,0 +1,10 @@
+package com.eactive.eai.custom.kjb.adapter.http.client.filter;
+
+import java.util.Properties;
+
+public interface HttpClientAdapterExceptionFilter {
+
+ public Object doExceptionFilter(String adptGrpName, String adptName, Properties prop, Object message,
+ Properties tempProp, Exception e) throws Exception;
+
+}
diff --git a/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/HttpClientAdapterFilter.java b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/HttpClientAdapterFilter.java
new file mode 100644
index 0000000..47c5682
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/HttpClientAdapterFilter.java
@@ -0,0 +1,12 @@
+package com.eactive.eai.custom.kjb.adapter.http.client.filter;
+
+import java.util.Properties;
+
+public interface HttpClientAdapterFilter {
+
+ public Object doPreFilter(String adptGrpName, String adptName, Properties prop, Object message, Properties tempProp)
+ throws Exception;
+
+ public Object doPostFilter(String adptGrpName, String adptName, Properties prop, Object message,
+ Properties tempProp) throws Exception;
+}
diff --git a/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/HttpClientAdapterFilterException.java b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/HttpClientAdapterFilterException.java
new file mode 100644
index 0000000..691f050
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/HttpClientAdapterFilterException.java
@@ -0,0 +1,35 @@
+package com.eactive.eai.custom.kjb.adapter.http.client.filter;
+
+import java.util.Properties;
+
+import lombok.Getter;
+
+public class HttpClientAdapterFilterException extends RuntimeException {
+ private static final long serialVersionUID = -1208983360831093751L;
+ @Getter
+ private final String code;
+ @Getter
+ private final Properties prop;
+ @Getter
+ private final Properties tempProp;
+
+ public HttpClientAdapterFilterException(String code, String msg, Properties prop, Properties tmepProp) {
+ super(msg);
+ this.code = code;
+ this.prop = prop;
+ this.tempProp = tmepProp;
+ }
+
+ public HttpClientAdapterFilterException(String code, String msg, Properties prop, Properties tempProp, Throwable cause) {
+ super(msg, cause);
+ this.code = code;
+ this.prop = prop;
+ this.tempProp = tempProp;
+ }
+
+ @Override
+ public String toString() {
+ return "HttpClientAdapterFilterException [code=" + code + ", prop=" + prop + ", tempProp=" + tempProp + ", parent=" + super.toString() + "]";
+ }
+
+}
diff --git a/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/JBOBPFilter.java b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/JBOBPFilter.java
new file mode 100644
index 0000000..792e0cc
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/JBOBPFilter.java
@@ -0,0 +1,106 @@
+package com.eactive.eai.custom.kjb.adapter.http.client.filter;
+
+import java.util.Map;
+import java.util.Properties;
+import java.util.TreeMap;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.eactive.eai.adapter.http.dynamic.HttpAdapterServiceKey;
+import com.eactive.eai.common.TransactionContextKeys;
+import com.eactive.eai.common.property.PropGroupVO;
+import com.eactive.eai.common.property.PropManager;
+import com.eactive.eai.common.util.Logger;
+
+
+public class JBOBPFilter implements HttpClientAdapterFilter, HttpAdapterServiceKey {
+ protected static Logger logger = Logger.getLogger(Logger.LOGGER_ADAPTER);
+
+ public static final String KJB_HEADER = "KJB_Header";
+ public static final String X_OBP_PARTNERCODE = "x-obp-partnercode";
+ public static final String X_OBP_TXID = "x-obp-txid";
+ public static final String X_OBP_TRUST_SYSTEM = "x-obp-trust-system";
+ String systemTrustKey = "APIMGW-0001-QVBJTUdXLTAwMDE=";
+
+ @Override
+ public Object doPreFilter(String adptGrpName, String adptName, Properties prop, Object message, Properties tempProp)
+ throws Exception {
+
+ logger.debug("JBOBPFilter] PreFilter Processing Start!!");
+ PropGroupVO propGroupVo = PropManager.getInstance().getPropGroupVO(KJB_HEADER);
+ if (propGroupVo != null) systemTrustKey = propGroupVo.getProperty(X_OBP_TRUST_SYSTEM, systemTrustKey);
+
+ Properties filterHeaders = (Properties) tempProp.get("FILTERHEADER");
+ if (filterHeaders == null) {
+ filterHeaders = new Properties();
+ tempProp.put("FILTERHEADER", filterHeaders);
+ }
+ try {
+ String obpPartnerCode = "000000-00";
+ Map inboundHeaderMap = getInboundHeaderProp(tempProp);
+
+ if (!inboundHeaderMap.isEmpty()) {
+ if (inboundHeaderMap.containsKey(X_OBP_PARTNERCODE)) {
+ filterHeaders.put(X_OBP_PARTNERCODE, inboundHeaderMap.get(X_OBP_PARTNERCODE));
+ logger.debug("JBOBPFilter] Processing Key ["+X_OBP_PARTNERCODE+"], value ["+inboundHeaderMap.get(X_OBP_PARTNERCODE)+"]");
+ } else {
+ filterHeaders.put(X_OBP_PARTNERCODE, obpPartnerCode);
+ logger.debug("JBOBPFilter] Processing Key ["+X_OBP_PARTNERCODE+"], value ["+obpPartnerCode+"]");
+ }
+ } else {
+ filterHeaders.put(X_OBP_PARTNERCODE, obpPartnerCode);
+ logger.debug("JBOBPFilter] Processing Key ["+X_OBP_PARTNERCODE+"], value ["+obpPartnerCode+"]");
+ }
+
+ String uuid = tempProp.getProperty(TransactionContextKeys.TRANSACTION_UUID, "");
+ if (StringUtils.isNotBlank(uuid)) {
+ filterHeaders.setProperty(X_OBP_TXID, uuid); // JB OBP Framework용
+ logger.debug("JBOBPFilter] Processing Key ["+X_OBP_TXID+"], value ["+uuid+"]");
+ }
+ if (StringUtils.isNotBlank(systemTrustKey)) {
+ filterHeaders.setProperty(X_OBP_TRUST_SYSTEM, systemTrustKey); // JB OBP Framework용
+ logger.debug("JBOBPFilter] Processing Key ["+X_OBP_TRUST_SYSTEM+"], value ["+systemTrustKey+"]");
+ }
+ } catch (Exception e) {
+ logger.error(e.getMessage());
+ }
+
+ return message;
+ }
+
+ public Map getInboundHeaderProp(Properties prop) {
+ Properties header = new Properties();
+ Map inboundHeaderMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+ try {
+ Object headerObj = prop.get(HttpAdapterServiceKey.INBOUND_HEADER);
+ if (headerObj instanceof Properties) { //tomcat
+ header = (Properties) headerObj;
+ for (String name : header.stringPropertyNames()) {
+ inboundHeaderMap.put(name, header.getProperty(name));
+ }
+ } else if (headerObj instanceof String) { //weblogic
+ String str = (String) headerObj;
+ str = str.substring(1, str.length() - 1);
+ // key=value 쌍 분리
+ String[] entries = str.split(",");
+ for (String entry : entries) {
+ String[] kv = entry.split("=", 2);
+ if (kv.length == 2) {
+ inboundHeaderMap.put(kv[0].trim(), kv[1].trim());
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return inboundHeaderMap;
+ }
+
+ @Override
+ public Object doPostFilter(String adptGrpName, String adptName, Properties prop, Object message,
+ Properties tempProp) throws Exception {
+ return message;
+ }
+
+}
+
diff --git a/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/KAKAOBankFilter.java b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/KAKAOBankFilter.java
new file mode 100644
index 0000000..f1bf44b
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/KAKAOBankFilter.java
@@ -0,0 +1,135 @@
+package com.eactive.eai.custom.kjb.adapter.http.client.filter;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
+import java.util.Properties;
+import java.util.TreeMap;
+
+import com.eactive.eai.adapter.http.dynamic.HttpAdapterServiceKey;
+import com.eactive.eai.common.property.PropGroupVO;
+import com.eactive.eai.common.property.PropManager;
+import com.eactive.eai.common.util.Logger;
+
+
+public class KAKAOBankFilter implements HttpClientAdapterFilter, HttpAdapterServiceKey {
+ protected static Logger logger = Logger.getLogger(Logger.LOGGER_ADAPTER);
+
+ public static final String KJB_HEADER = "KJB_Header";
+ public static final String PROP_PREFIX = "kakaobank";
+ public static final String X_KKB_PARTNER_CODE = "X-KKB-PARTNER-CODE";
+ public static final String X_KKB_API_NAME = "X-KKB-API-NAME";
+ public static final String X_KKB_API_TX_ID = "X-KKB-API-TX-ID";
+ public static final String X_KKB_TX_TIME = "X-KKB-TX-TIME";
+ public static final String X_KKB_CMPR_MGMT_NO = "X-KKB-CMPR-MGMT-NO";
+
+ @Override
+ public Object doPreFilter(String adptGrpName, String adptName, Properties prop, Object message, Properties tempProp)
+ throws Exception {
+
+ logger.debug("KAKAOBankFilter] PreFilter Processing Start!!");
+ Object returnMessage = message;
+ String partnerCode = "KJB";
+ String apiName = "status_change";
+ String apiTxId = "0";
+ String txTime = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
+ String cmprMgmtNo = "0";
+
+ PropGroupVO propGroupVo = PropManager.getInstance().getPropGroupVO(KJB_HEADER);
+ if (propGroupVo != null) {
+ partnerCode = propGroupVo.getProperty(PROP_PREFIX + "." + X_KKB_PARTNER_CODE);
+ apiName = propGroupVo.getProperty(PROP_PREFIX + "." + X_KKB_API_NAME);
+ apiTxId = propGroupVo.getProperty(PROP_PREFIX + "." + X_KKB_API_TX_ID);
+ cmprMgmtNo = propGroupVo.getProperty(PROP_PREFIX + "." + X_KKB_CMPR_MGMT_NO);
+ }
+
+ Properties filterHeaders = (Properties) tempProp.get("FILTERHEADER");
+ if (filterHeaders == null) {
+ filterHeaders = new Properties();
+ tempProp.put("FILTERHEADER", filterHeaders);
+ }
+ try {
+ Map inboundHeaderMap = getInboundHeaderProp(tempProp);
+
+ if (!inboundHeaderMap.isEmpty()) {
+ if (inboundHeaderMap.containsKey(X_KKB_PARTNER_CODE)) {
+ filterHeaders.put(X_KKB_PARTNER_CODE, inboundHeaderMap.get(X_KKB_PARTNER_CODE));
+ } else {
+ filterHeaders.put(X_KKB_PARTNER_CODE, partnerCode);
+ }
+ if (inboundHeaderMap.containsKey(X_KKB_API_NAME)) {
+ filterHeaders.put(X_KKB_API_NAME, inboundHeaderMap.get(X_KKB_API_NAME));
+ } else {
+ filterHeaders.put(X_KKB_API_NAME, apiName);
+ }
+ if (inboundHeaderMap.containsKey(X_KKB_API_TX_ID)) {
+ filterHeaders.put(X_KKB_API_TX_ID, inboundHeaderMap.get(X_KKB_API_TX_ID));
+ } else {
+ filterHeaders.put(X_KKB_API_TX_ID, apiTxId);
+ }
+ if (inboundHeaderMap.containsKey(X_KKB_TX_TIME)) {
+ filterHeaders.put(X_KKB_TX_TIME, inboundHeaderMap.get(X_KKB_TX_TIME));
+ } else {
+ filterHeaders.put(X_KKB_TX_TIME, txTime);
+ }
+ if (inboundHeaderMap.containsKey(X_KKB_CMPR_MGMT_NO)) {
+ filterHeaders.put(X_KKB_CMPR_MGMT_NO, inboundHeaderMap.get(X_KKB_CMPR_MGMT_NO));
+ } else {
+ filterHeaders.put(X_KKB_CMPR_MGMT_NO, cmprMgmtNo);
+ }
+ } else {
+ filterHeaders.put(X_KKB_PARTNER_CODE, partnerCode);
+ filterHeaders.put(X_KKB_API_NAME, apiName);
+ filterHeaders.put(X_KKB_API_TX_ID, apiTxId);
+ filterHeaders.put(X_KKB_TX_TIME, txTime);
+ filterHeaders.put(X_KKB_CMPR_MGMT_NO, cmprMgmtNo);
+ }
+ logger.debug("KAKAOBankFilter] Processing Key ["+X_KKB_PARTNER_CODE+"], value ["+filterHeaders.getProperty(X_KKB_PARTNER_CODE)+"]");
+ logger.debug("KAKAOBankFilter] Processing Key ["+X_KKB_API_NAME+"], value ["+filterHeaders.getProperty(X_KKB_API_NAME)+"]");
+ logger.debug("KAKAOBankFilter] Processing Key ["+X_KKB_API_TX_ID+"], value ["+filterHeaders.getProperty(X_KKB_API_TX_ID)+"]");
+ logger.debug("KAKAOBankFilter] Processing Key ["+X_KKB_TX_TIME+"], value ["+filterHeaders.getProperty(X_KKB_TX_TIME)+"]");
+ logger.debug("KAKAOBankFilter] Processing Key ["+X_KKB_CMPR_MGMT_NO+"], value ["+filterHeaders.getProperty(X_KKB_CMPR_MGMT_NO)+"]");
+
+ } catch (Exception e) {
+ logger.error(e.getMessage());
+ }
+
+ return returnMessage;
+ }
+
+ public Map getInboundHeaderProp(Properties prop) {
+ Properties header = new Properties();
+ Map inboundHeaderMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+ try {
+ Object headerObj = prop.get(HttpAdapterServiceKey.INBOUND_HEADER);
+ if (headerObj instanceof Properties) { //tomcat
+ header = (Properties) headerObj;
+ for (String name : header.stringPropertyNames()) {
+ inboundHeaderMap.put(name, header.getProperty(name));
+ }
+ } else if (headerObj instanceof String) { //weblogic
+ String str = (String) headerObj;
+ str = str.substring(1, str.length() - 1);
+ // key=value 쌍 분리
+ String[] entries = str.split(",");
+ for (String entry : entries) {
+ String[] kv = entry.split("=", 2);
+ if (kv.length == 2) {
+ inboundHeaderMap.put(kv[0].trim(), kv[1].trim());
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return inboundHeaderMap;
+ }
+
+ @Override
+ public Object doPostFilter(String adptGrpName, String adptName, Properties prop, Object message,
+ Properties tempProp) throws Exception {
+ return message;
+ }
+
+}
+
diff --git a/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/KFTCFaceFilter.java b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/KFTCFaceFilter.java
new file mode 100644
index 0000000..78e3c70
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/KFTCFaceFilter.java
@@ -0,0 +1,154 @@
+package com.eactive.eai.custom.kjb.adapter.http.client.filter;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
+import java.util.Properties;
+import java.util.TreeMap;
+
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+
+import com.eactive.eai.adapter.AdapterGroupVO;
+import com.eactive.eai.adapter.AdapterManager;
+import com.eactive.eai.adapter.http.dynamic.HttpAdapterServiceKey;
+import com.eactive.eai.common.property.PropGroupVO;
+import com.eactive.eai.common.property.PropManager;
+import com.eactive.eai.common.server.EAIServerManager;
+import com.eactive.eai.common.util.Logger;
+
+
+public class KFTCFaceFilter implements HttpClientAdapterFilter, HttpAdapterServiceKey {
+ protected static Logger logger = Logger.getLogger(Logger.LOGGER_ADAPTER);
+
+ public static final String KJB_HEADER = "KJB_Header";
+ public static final String PROP_PREFIX = "kftcface";
+ public static final String H_CLIENT_ID = "Client-Id";
+ public static final String B_ORG_CODE = "org_code";
+ public static final String B_TRANSACTION_ID = "transaction_id";
+ public static final String B_REQUEST_DATETIME = "request_datetime";
+ public static String instId = null;
+
+ static {
+ EAIServerManager eaiServerManager = EAIServerManager.getInstance();
+ instId = eaiServerManager.getInstId();
+ }
+
+ @SuppressWarnings({ "unchecked" })
+ @Override
+ public Object doPreFilter(String adptGrpName, String adptName, Properties prop, Object message, Properties tempProp)
+ throws Exception {
+
+ logger.debug("KFTCFaceFilter] PreFilter Processing Start!!");
+ JSONObject returnMessage = null;
+ String clientId = "";
+ String orgCode = "034"; // 광주은행 행코드
+
+ PropGroupVO propGroupVo = PropManager.getInstance().getPropGroupVO(KJB_HEADER);
+ if (propGroupVo != null) {
+ if (StringUtils.isEmpty(clientId))
+ clientId = propGroupVo.getProperty(PROP_PREFIX + "." + H_CLIENT_ID);
+ orgCode = propGroupVo.getProperty(PROP_PREFIX + "." + B_ORG_CODE);
+ }
+
+ String request_datetime = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
+ String reqDate = new SimpleDateFormat("yyMMdd").format(new Date());
+ String reqTime = new SimpleDateFormat("HHmmss").format(new Date());
+ // 기관코드(3) + 요청일자(6) -- 금결원 표준화 항목, 고정 9자리.
+ // 요청시간(6) + 인스턴스ID(2) + RandomString(3) -- 기관별 생성 거래고유번호(11자리)
+ // 기관코드(3) + 요청일자(6) + 요청시간(6) + 인스턴스ID(2) + RandomString(3) -- 20자리.
+ String transaction_id = orgCode + reqDate + reqTime + instId + RandomStringUtils.random(3, true, true).toUpperCase();
+
+ Properties filterHeaders = (Properties) tempProp.get("FILTERHEADER");
+ if (filterHeaders == null) {
+ filterHeaders = new Properties();
+ tempProp.put("FILTERHEADER", filterHeaders);
+ }
+ try {
+ Map inboundHeaderMap = getInboundHeaderProp(tempProp);
+
+ if (!inboundHeaderMap.isEmpty()) {
+ if (inboundHeaderMap.containsKey(H_CLIENT_ID)) {
+ filterHeaders.put(H_CLIENT_ID, inboundHeaderMap.get(H_CLIENT_ID));
+ logger.debug("KFTCFaceFilter] Processing Key ["+H_CLIENT_ID+"], value ["+inboundHeaderMap.get(H_CLIENT_ID)+"]");
+ } else {
+ filterHeaders.put(H_CLIENT_ID, clientId);
+ logger.debug("KFTCFaceFilter] Processing Key ["+H_CLIENT_ID+"], value ["+clientId+"]");
+ }
+ } else {
+ filterHeaders.setProperty(H_CLIENT_ID, clientId);
+ logger.debug("KFTCFaceFilter] Processing Key ["+H_CLIENT_ID+"], value ["+clientId+"]");
+ }
+
+ } catch (Exception e) {
+ logger.error(e.getMessage());
+ }
+
+ AdapterManager adapterManager = AdapterManager.getInstance();
+ AdapterGroupVO adptGrpVO = adapterManager.getAdapterGroupVO(adptGrpName);
+ String encode = adptGrpVO.getMessageEncode();
+ if (message == null) {
+ returnMessage = new JSONObject();
+ } else {
+ if (message instanceof JSONObject) {
+ returnMessage = (JSONObject) message;
+ } else if (message instanceof String) {
+ returnMessage = parseJson((String) message);
+ } else if (message instanceof byte[]) {
+ returnMessage = parseJson(new String((byte[]) message, encode));
+ }
+ }
+
+ returnMessage.put(B_ORG_CODE, orgCode);
+ returnMessage.put(B_TRANSACTION_ID, transaction_id);
+ returnMessage.put(B_REQUEST_DATETIME, request_datetime);
+
+ return returnMessage.toJSONString();
+ }
+
+ private JSONObject parseJson(String message) throws Exception {
+ if (message == null) {
+ return null;
+ }
+
+ return (JSONObject) JSONValue.parse(message);
+ }
+
+ public Map getInboundHeaderProp(Properties prop) {
+ Properties header = new Properties();
+ Map inboundHeaderMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+ try {
+ Object headerObj = prop.get(HttpAdapterServiceKey.INBOUND_HEADER);
+ if (headerObj instanceof Properties) { //tomcat
+ header = (Properties) headerObj;
+ for (String name : header.stringPropertyNames()) {
+ inboundHeaderMap.put(name, header.getProperty(name));
+ }
+ } else if (headerObj instanceof String) { //weblogic
+ String str = (String) headerObj;
+ str = str.substring(1, str.length() - 1);
+ // key=value 쌍 분리
+ String[] entries = str.split(",");
+ for (String entry : entries) {
+ String[] kv = entry.split("=", 2);
+ if (kv.length == 2) {
+ inboundHeaderMap.put(kv[0].trim(), kv[1].trim());
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return inboundHeaderMap;
+ }
+
+ @Override
+ public Object doPostFilter(String adptGrpName, String adptName, Properties prop, Object message,
+ Properties tempProp) throws Exception {
+ return message;
+ }
+
+}
+
diff --git a/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/KFTCP2PFilter.java b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/KFTCP2PFilter.java
new file mode 100644
index 0000000..270b2e6
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/KFTCP2PFilter.java
@@ -0,0 +1,122 @@
+package com.eactive.eai.custom.kjb.adapter.http.client.filter;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
+import java.util.Properties;
+import java.util.TreeMap;
+
+import org.apache.commons.lang3.RandomStringUtils;
+
+import com.eactive.eai.adapter.http.dynamic.HttpAdapterServiceKey;
+import com.eactive.eai.common.property.PropGroupVO;
+import com.eactive.eai.common.property.PropManager;
+import com.eactive.eai.common.server.EAIServerManager;
+import com.eactive.eai.common.util.Logger;
+
+
+public class KFTCP2PFilter implements HttpClientAdapterFilter, HttpAdapterServiceKey {
+ protected static Logger logger = Logger.getLogger(Logger.LOGGER_ADAPTER);
+
+ public static final String KJB_HEADER = "KJB_Header";
+ public static final String PROP_PREFIX = "kftcp2p";
+ public static final String H_ORG_CODE = "org_code";
+ public static final String H_TRX_NO = "api_trx_no";
+ public static final String H_TRX_DTM = "api_trx_dtm";
+ public static String instId = null;
+
+ static {
+ EAIServerManager eaiServerManager = EAIServerManager.getInstance();
+ instId = eaiServerManager.getInstId();
+ }
+
+ @Override
+ public Object doPreFilter(String adptGrpName, String adptName, Properties prop, Object message, Properties tempProp)
+ throws Exception {
+
+ logger.debug("KFTCP2PFilter] PreFilter Processing Start!!");
+ String orgCode = "D210400012"; // 광주은행 개발 기관코드(운영: K210800020)
+
+ PropGroupVO propGroupVo = PropManager.getInstance().getPropGroupVO(KJB_HEADER);
+ if (propGroupVo != null) {
+ orgCode = propGroupVo.getProperty(PROP_PREFIX + "." + H_ORG_CODE);
+ }
+
+ String apiTrxDtm = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date());
+ String apiTrxTm = new SimpleDateFormat("HHmmss").format(new Date());
+ // 기관코드(10) + 인스턴스ID(2) + 일시(6) + RandomString(2) -- 총 20자리
+ String apiTrxNo = orgCode + instId + apiTrxTm + RandomStringUtils.random(2, true, true).toUpperCase();
+
+ Properties filterHeaders = (Properties) tempProp.get("FILTERHEADER");
+ if (filterHeaders == null) {
+ filterHeaders = new Properties();
+ tempProp.put("FILTERHEADER", filterHeaders);
+ }
+ try {
+ Map inboundHeaderMap = getInboundHeaderProp(tempProp);
+
+ if (!inboundHeaderMap.isEmpty()) {
+ if (inboundHeaderMap.containsKey(H_TRX_NO)) {
+ filterHeaders.put(H_TRX_NO, inboundHeaderMap.get(H_TRX_NO));
+ logger.debug("KFTCP2PFilter] Processing Key ["+H_TRX_NO+"], value ["+inboundHeaderMap.get(H_TRX_NO)+"]");
+ } else {
+ filterHeaders.put(H_TRX_NO, apiTrxNo);
+ logger.debug("KFTCP2PFilter] Processing Key ["+H_TRX_NO+"], value ["+apiTrxNo+"]");
+ }
+ if (inboundHeaderMap.containsKey(H_TRX_DTM)) {
+ filterHeaders.put(H_TRX_DTM, inboundHeaderMap.get(H_TRX_DTM));
+ logger.debug("KFTCP2PFilter] Processing Key ["+H_TRX_DTM+"], value ["+inboundHeaderMap.get(H_TRX_DTM)+"]");
+ } else {
+ filterHeaders.put(H_TRX_DTM, apiTrxDtm);
+ logger.debug("KFTCP2PFilter] Processing Key ["+H_TRX_DTM+"], value ["+apiTrxDtm+"]");
+ }
+ } else {
+ filterHeaders.put(H_TRX_NO, apiTrxNo);
+ filterHeaders.put(H_TRX_DTM, apiTrxDtm);
+ }
+ logger.debug("KFTCP2PFilter] Processing Key ["+H_TRX_NO+"], value ["+filterHeaders.getProperty(H_TRX_NO)+"]");
+ logger.debug("KFTCP2PFilter] Processing Key ["+H_TRX_DTM+"], value ["+filterHeaders.getProperty(H_TRX_DTM)+"]");
+
+ } catch (Exception e) {
+ logger.error(e.getMessage());
+ }
+
+ return message;
+ }
+
+ public Map getInboundHeaderProp(Properties prop) {
+ Properties header = new Properties();
+ Map inboundHeaderMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+ try {
+ Object headerObj = prop.get(HttpAdapterServiceKey.INBOUND_HEADER);
+ if (headerObj instanceof Properties) { //tomcat
+ header = (Properties) headerObj;
+ for (String name : header.stringPropertyNames()) {
+ inboundHeaderMap.put(name, header.getProperty(name));
+ }
+ } else if (headerObj instanceof String) { //weblogic
+ String str = (String) headerObj;
+ str = str.substring(1, str.length() - 1);
+ // key=value 쌍 분리
+ String[] entries = str.split(",");
+ for (String entry : entries) {
+ String[] kv = entry.split("=", 2);
+ if (kv.length == 2) {
+ inboundHeaderMap.put(kv[0].trim(), kv[1].trim());
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return inboundHeaderMap;
+ }
+
+ @Override
+ public Object doPostFilter(String adptGrpName, String adptName, Properties prop, Object message,
+ Properties tempProp) throws Exception {
+ return message;
+ }
+
+}
+
diff --git a/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/NAVERFinFilter.java b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/NAVERFinFilter.java
new file mode 100644
index 0000000..b420a32
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/NAVERFinFilter.java
@@ -0,0 +1,107 @@
+package com.eactive.eai.custom.kjb.adapter.http.client.filter;
+
+import java.util.Map;
+import java.util.Properties;
+import java.util.TreeMap;
+
+import com.eactive.eai.adapter.http.dynamic.HttpAdapterServiceKey;
+import com.eactive.eai.common.property.PropGroupVO;
+import com.eactive.eai.common.property.PropManager;
+import com.eactive.eai.common.util.Logger;
+
+
+public class NAVERFinFilter implements HttpClientAdapterFilter, HttpAdapterServiceKey {
+ protected static Logger logger = Logger.getLogger(Logger.LOGGER_ADAPTER);
+
+ public static final String KJB_HEADER = "KJB_Header";
+ public static final String PROP_PREFIX = "naverfin";
+ public static final String X_PARTNER_ID = "X-Partner-Id";
+ public static final String X_FINTECH_ID = "X-Fintech-Id";
+
+ @Override
+ public Object doPreFilter(String adptGrpName, String adptName, Properties prop, Object message, Properties tempProp)
+ throws Exception {
+
+ logger.debug("NAVERFinFilter] PreFilter Processing Start!!");
+ String partnerID = "r0jtqwC9gAW5";
+ String fintechId = "NF";
+
+ PropGroupVO propGroupVo = PropManager.getInstance().getPropGroupVO(KJB_HEADER);
+ if (propGroupVo != null) {
+ partnerID = propGroupVo.getProperty(PROP_PREFIX + "." + X_PARTNER_ID);
+ fintechId = propGroupVo.getProperty(PROP_PREFIX + "." + X_FINTECH_ID);
+ }
+
+ Properties filterHeaders = (Properties) tempProp.get("FILTERHEADER");
+ if (filterHeaders == null) {
+ filterHeaders = new Properties();
+ tempProp.put("FILTERHEADER", filterHeaders);
+ }
+ try {
+ Map inboundHeaderMap = getInboundHeaderProp(tempProp);
+
+ if (!inboundHeaderMap.isEmpty()) {
+ if (inboundHeaderMap.containsKey(X_PARTNER_ID)) {
+ filterHeaders.put(X_PARTNER_ID, inboundHeaderMap.get(X_PARTNER_ID));
+ logger.debug("NAVERFinFilter] Processing Key ["+X_PARTNER_ID+"], value ["+inboundHeaderMap.get(X_PARTNER_ID)+"]");
+ } else {
+ filterHeaders.put(X_PARTNER_ID, partnerID);
+ logger.debug("NAVERFinFilter] Processing Key ["+X_PARTNER_ID+"], value ["+partnerID+"]");
+ }
+ if (inboundHeaderMap.containsKey(X_FINTECH_ID)) {
+ filterHeaders.put(X_FINTECH_ID, inboundHeaderMap.get(X_FINTECH_ID));
+ logger.debug("NAVERFinFilter] Processing Key ["+X_FINTECH_ID+"], value ["+inboundHeaderMap.get(X_FINTECH_ID)+"]");
+ } else {
+ filterHeaders.put(X_FINTECH_ID, fintechId);
+ logger.debug("NAVERFinFilter] Processing Key ["+X_FINTECH_ID+"], value ["+fintechId+"]");
+ }
+ } else {
+ filterHeaders.put(X_PARTNER_ID, partnerID);
+ filterHeaders.put(X_FINTECH_ID, fintechId);
+ }
+ logger.debug("NAVERFinFilter] Processing Key ["+X_PARTNER_ID+"], value ["+filterHeaders.getProperty(X_PARTNER_ID)+"]");
+ logger.debug("NAVERFinFilter] Processing Key ["+X_FINTECH_ID+"], value ["+filterHeaders.getProperty(X_FINTECH_ID)+"]");
+
+ } catch (Exception e) {
+ logger.error(e.getMessage());
+ }
+
+ return message;
+ }
+
+ public Map getInboundHeaderProp(Properties prop) {
+ Properties header = new Properties();
+ Map inboundHeaderMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+ try {
+ Object headerObj = prop.get(HttpAdapterServiceKey.INBOUND_HEADER);
+ if (headerObj instanceof Properties) { //tomcat
+ header = (Properties) headerObj;
+ for (String name : header.stringPropertyNames()) {
+ inboundHeaderMap.put(name, header.getProperty(name));
+ }
+ } else if (headerObj instanceof String) { //weblogic
+ String str = (String) headerObj;
+ str = str.substring(1, str.length() - 1);
+ // key=value 쌍 분리
+ String[] entries = str.split(",");
+ for (String entry : entries) {
+ String[] kv = entry.split("=", 2);
+ if (kv.length == 2) {
+ inboundHeaderMap.put(kv[0].trim(), kv[1].trim());
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return inboundHeaderMap;
+ }
+
+ @Override
+ public Object doPostFilter(String adptGrpName, String adptName, Properties prop, Object message,
+ Properties tempProp) throws Exception {
+ return message;
+ }
+
+}
+
diff --git a/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/NICECreditFilter.java b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/NICECreditFilter.java
new file mode 100644
index 0000000..54a8753
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/NICECreditFilter.java
@@ -0,0 +1,138 @@
+package com.eactive.eai.custom.kjb.adapter.http.client.filter;
+
+import java.util.Map.Entry;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
+import java.util.Properties;
+import java.util.TreeMap;
+
+import org.apache.commons.lang3.StringUtils;
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+
+import com.eactive.eai.adapter.AdapterGroupVO;
+import com.eactive.eai.adapter.AdapterManager;
+import com.eactive.eai.adapter.http.dynamic.HttpAdapterServiceKey;
+import com.eactive.eai.common.property.PropGroupVO;
+import com.eactive.eai.common.property.PropManager;
+import com.eactive.eai.common.util.Logger;
+
+
+public class NICECreditFilter implements HttpClientAdapterFilter, HttpAdapterServiceKey {
+ protected static Logger logger = Logger.getLogger(Logger.LOGGER_ADAPTER);
+
+ public static final String KJB_HEADER = "KJB_Header";
+ public static final String PROP_PREFIX = "nicecredit";
+ public static final String H_PRODUCTID = "ProductID";
+ public static final String B_REQ_DTM = "req_dtm";
+ public static final String B_GOODS_CLS = "goods_cls";
+
+ @SuppressWarnings({ "unchecked" })
+ @Override
+ public Object doPreFilter(String adptGrpName, String adptName, Properties prop, Object message, Properties tempProp)
+ throws Exception {
+
+ JSONObject returnMessage = null;
+ String productId = "2303102120";
+ String reqDtm = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
+ String goodsCls = "KJBAPI0001";
+
+ PropGroupVO propGroupVo = PropManager.getInstance().getPropGroupVO(KJB_HEADER);
+ if (propGroupVo != null) {
+ productId = propGroupVo.getProperty(PROP_PREFIX + "." + H_PRODUCTID);
+ goodsCls = propGroupVo.getProperty(PROP_PREFIX + "." + B_GOODS_CLS);
+ }
+
+ Properties filterHeaders = (Properties) tempProp.get("FILTERHEADER");
+ if (filterHeaders == null) {
+ filterHeaders = new Properties();
+ tempProp.put("FILTERHEADER", filterHeaders);
+ }
+ try {
+ Map inboundHeaderMap = getInboundHeaderProp(tempProp);
+ if (inboundHeaderMap != null && inboundHeaderMap.containsKey(H_PRODUCTID)) {
+ for (Entry e : inboundHeaderMap.entrySet()) {
+ String key = (String) e.getKey();
+ String value = (String) e.getValue();
+
+ if (StringUtils.equalsIgnoreCase(key, H_PRODUCTID)) {
+ filterHeaders.setProperty(key, value);
+ }
+ if (logger.isDebugEnabled()) {
+ logger.debug("Request Header :" + key + "=[" + value + "]");
+ }
+ }
+ } else {
+ filterHeaders.setProperty(H_PRODUCTID, productId);
+ }
+
+ } catch (Exception e) {
+ logger.error(e.getMessage());
+ }
+
+ AdapterManager adapterManager = AdapterManager.getInstance();
+ AdapterGroupVO adptGrpVO = adapterManager.getAdapterGroupVO(adptGrpName);
+ String encode = adptGrpVO.getMessageEncode();
+ if (message == null) {
+ returnMessage = new JSONObject();
+ } else {
+ if (message instanceof JSONObject) {
+ returnMessage = (JSONObject) message;
+ } else if (message instanceof String) {
+ returnMessage = parseJson((String) message);
+ } else if (message instanceof byte[]) {
+ returnMessage = parseJson(new String((byte[]) message, encode));
+ }
+ }
+
+ returnMessage.put(B_REQ_DTM, reqDtm);
+ returnMessage.put(B_GOODS_CLS, goodsCls);
+
+ return returnMessage.toJSONString();
+ }
+
+ private JSONObject parseJson(String message) throws Exception {
+ if (message == null) {
+ return null;
+ }
+
+ return (JSONObject) JSONValue.parse(message);
+ }
+
+ public Map getInboundHeaderProp(Properties prop) {
+ Properties header = new Properties();
+ Map inboundHeaderMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+ try {
+ Object headerObj = prop.get(HttpAdapterServiceKey.INBOUND_HEADER);
+ if (headerObj instanceof Properties) { //tomcat
+ header = (Properties) headerObj;
+ for (String name : header.stringPropertyNames()) {
+ inboundHeaderMap.put(name, header.getProperty(name));
+ }
+ } else if (headerObj instanceof String) { //weblogic
+ String str = (String) headerObj;
+ str = str.substring(1, str.length() - 1);
+ // key=value 쌍 분리
+ String[] entries = str.split(",");
+ for (String entry : entries) {
+ String[] kv = entry.split("=", 2);
+ if (kv.length == 2) {
+ inboundHeaderMap.put(kv[0].trim(), kv[1].trim());
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return inboundHeaderMap;
+ }
+
+ @Override
+ public Object doPostFilter(String adptGrpName, String adptName, Properties prop, Object message,
+ Properties tempProp) throws Exception {
+ return message;
+ }
+
+}
+
diff --git a/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/SimpleFrameworkFilter.java b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/SimpleFrameworkFilter.java
new file mode 100644
index 0000000..6af88ac
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/SimpleFrameworkFilter.java
@@ -0,0 +1,109 @@
+package com.eactive.eai.custom.kjb.adapter.http.client.filter;
+
+import java.util.Map;
+import java.util.Properties;
+import java.util.TreeMap;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.eactive.eai.adapter.http.dynamic.HttpAdapterServiceKey;
+import com.eactive.eai.adapter.http.dynamic.HttpAdapterServiceSupport;
+import com.eactive.eai.common.TransactionContextKeys;
+import com.eactive.eai.common.util.Logger;
+
+public class SimpleFrameworkFilter implements HttpClientAdapterFilter, HttpAdapterServiceKey {
+ protected static Logger logger = Logger.getLogger(Logger.LOGGER_ADAPTER);
+
+ public static final String CLIENTID = "clientId";
+ public static final String TRACEID = "traceId";
+ public static final String GUID = "guid";
+ public static final String RECEIVEDTIMESTAMP = "receivedTimestamp";
+ public static final String PARTNER_TRACE_ID = "partnerTraceId";
+
+ @Override
+ public Object doPreFilter(String adptGrpName, String adptName, Properties prop, Object message, Properties tempProp)
+ throws Exception {
+
+ logger.debug("SimpleFrameworkFilter] PreFilter Processing Start!!");
+
+ Properties filterHeaders = (Properties) tempProp.get("FILTERHEADER");
+ if (filterHeaders == null) {
+ filterHeaders = new Properties();
+ tempProp.put("FILTERHEADER", filterHeaders);
+ }
+
+ Map inboundHeaderMap = getInboundHeaderProp(tempProp);
+
+ try {
+ /* 업체정보 */
+ String clientId = tempProp.getProperty(HttpAdapterServiceSupport.PROPERTIES_NAME_CLIENT_ID);
+ if (StringUtils.isEmpty(clientId)) clientId = "";
+ filterHeaders.put(CLIENTID, clientId);
+ logger.debug("SimpleFrameworkFilter] Processing Key ["+CLIENTID+"], value ["+clientId+"]");
+
+ /* APIM 거래추적자 */
+ String uuid = tempProp.getProperty(TransactionContextKeys.TRANSACTION_UUID, "");
+ filterHeaders.put(TRACEID, uuid);
+ logger.debug("SimpleFrameworkFilter] Processing Key ["+TRACEID+"], value ["+uuid+"]");
+
+ /* GUID */
+ String guid = tempProp.getProperty(TransactionContextKeys.GUID, "");
+ filterHeaders.put(GUID, guid);
+ logger.debug("SimpleFrameworkFilter] Processing Key ["+GUID+"], value ["+guid+"]");
+
+ /* 최초요청시간 */
+ String receivedTimestamp = tempProp.getProperty(HttpAdapterServiceKey.INBOUND_REQUESTED_TIME, "");
+ filterHeaders.put(RECEIVEDTIMESTAMP, receivedTimestamp);
+ logger.debug("SimpleFrameworkFilter] Processing Key ["+RECEIVEDTIMESTAMP+"], value ["+receivedTimestamp+"]");
+
+ String partnerTraceId = inboundHeaderMap.getOrDefault(PARTNER_TRACE_ID, "");
+ filterHeaders.put(PARTNER_TRACE_ID, partnerTraceId);
+ logger.debug("SimpleFrameworkFilter] Processing Key ["+PARTNER_TRACE_ID+"], value ["+partnerTraceId+"]");
+
+ String x_loan_token = inboundHeaderMap.getOrDefault(TransactionContextKeys.X_LOAN_TOKEN, "");
+ filterHeaders.put(TransactionContextKeys.X_LOAN_TOKEN, x_loan_token);
+ logger.debug("SimpleFrameworkFilter] Processing Key ["+TransactionContextKeys.X_LOAN_TOKEN+"], value ["+x_loan_token+"]");
+
+
+ } catch (Exception e) {
+ logger.error(e.getMessage());
+ }
+
+ return message;
+ }
+
+ public Map getInboundHeaderProp(Properties prop) {
+ Properties header = new Properties();
+ Map inboundHeaderMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+ try {
+ Object headerObj = prop.get(HttpAdapterServiceKey.INBOUND_HEADER);
+ if (headerObj instanceof Properties) { //tomcat
+ header = (Properties) headerObj;
+ for (String name : header.stringPropertyNames()) {
+ inboundHeaderMap.put(name, header.getProperty(name));
+ }
+ } else if (headerObj instanceof String) { //weblogic
+ String str = (String) headerObj;
+ str = str.substring(1, str.length() - 1);
+ // key=value 쌍 분리
+ String[] entries = str.split(",");
+ for (String entry : entries) {
+ String[] kv = entry.split("=", 2);
+ if (kv.length == 2) {
+ inboundHeaderMap.put(kv[0].trim(), kv[1].trim());
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return inboundHeaderMap;
+ }
+
+ @Override
+ public Object doPostFilter(String adptGrpName, String adptName, Properties prop, Object message,
+ Properties tempProp) throws Exception {
+ return message;
+ }
+
+}
diff --git a/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/SimpleframeworkBodyFilter.java b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/SimpleframeworkBodyFilter.java
new file mode 100644
index 0000000..3515035
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/SimpleframeworkBodyFilter.java
@@ -0,0 +1,28 @@
+package com.eactive.eai.custom.kjb.adapter.http.client.filter;
+
+import java.util.Properties;
+
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+
+import com.eactive.eai.common.TransactionContextKeys;
+
+public class SimpleframeworkBodyFilter extends SimpleFrameworkFilter {
+ @Override
+ public Object doPreFilter(String adptGrpName, String adptName, Properties prop, Object message, Properties tempProp)
+ throws Exception {
+
+ Object returnMessage = super.doPreFilter(adptGrpName, adptName, prop, message, tempProp);
+
+ JSONObject bizJsonStr = null;
+
+ if ( returnMessage instanceof String ) {
+ bizJsonStr = (JSONObject) JSONValue.parse( (String)returnMessage);
+ if( bizJsonStr != null ) {
+ bizJsonStr.put("GUID", tempProp.getOrDefault(TransactionContextKeys.GUID, "") );
+ }
+ }
+
+ return bizJsonStr != null ? bizJsonStr.toJSONString() : returnMessage;
+ }
+}
diff --git a/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/TOSSBankFilter.java b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/TOSSBankFilter.java
new file mode 100644
index 0000000..c4b9125
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/TOSSBankFilter.java
@@ -0,0 +1,97 @@
+package com.eactive.eai.custom.kjb.adapter.http.client.filter;
+
+import java.util.Map;
+import java.util.Properties;
+import java.util.TreeMap;
+
+import com.eactive.eai.adapter.http.dynamic.HttpAdapterServiceKey;
+import com.eactive.eai.common.TransactionContextKeys;
+import com.eactive.eai.common.property.PropGroupVO;
+import com.eactive.eai.common.property.PropManager;
+import com.eactive.eai.common.util.Logger;
+
+
+public class TOSSBankFilter implements HttpClientAdapterFilter, HttpAdapterServiceKey {
+ protected static Logger logger = Logger.getLogger(Logger.LOGGER_ADAPTER);
+
+ public static final String KJB_HEADER = "KJB_Header";
+ public static final String PROP_PREFIX = "tossbank";
+ public static final String X_TOSSBANK_LOAN_TRACE_ID = "X-TOSSBANK-LOAN-TRACE-ID";
+
+ @Override
+ public Object doPreFilter(String adptGrpName, String adptName, Properties prop, Object message, Properties tempProp)
+ throws Exception {
+
+ logger.debug("TOSSBankFilter] PreFilter Processing Start!!");
+ String traceId = tempProp.getProperty(TransactionContextKeys.TRANSACTION_UUID, "");
+
+ PropGroupVO propGroupVo = PropManager.getInstance().getPropGroupVO(KJB_HEADER);
+ if (propGroupVo != null) {
+ }
+
+ Properties filterHeaders = (Properties) tempProp.get("FILTERHEADER");
+ if (filterHeaders == null) {
+ filterHeaders = new Properties();
+ tempProp.put("FILTERHEADER", filterHeaders);
+ }
+ try {
+ Map inboundHeaderMap = getInboundHeaderProp(tempProp);
+
+ if (!inboundHeaderMap.isEmpty()) {
+ if (inboundHeaderMap.containsKey(X_TOSSBANK_LOAN_TRACE_ID)) {
+ filterHeaders.put(X_TOSSBANK_LOAN_TRACE_ID, inboundHeaderMap.get(X_TOSSBANK_LOAN_TRACE_ID));
+ logger.debug("TOSSBankFilter] Processing Key ["+X_TOSSBANK_LOAN_TRACE_ID+"], value ["+inboundHeaderMap.get(X_TOSSBANK_LOAN_TRACE_ID)+"]");
+ } else {
+ filterHeaders.put(X_TOSSBANK_LOAN_TRACE_ID, traceId);
+ logger.debug("TOSSBankFilter] Processing Key ["+X_TOSSBANK_LOAN_TRACE_ID+"], value ["+traceId+"]");
+ }
+ } else {
+ /* APIM 거래추적자 */
+ filterHeaders.setProperty(X_TOSSBANK_LOAN_TRACE_ID, traceId);
+ logger.debug("TOSSBankFilter] Processing Key ["+X_TOSSBANK_LOAN_TRACE_ID+"], value ["+traceId+"]");
+ }
+ logger.debug("TOSSBankFilter] Processing Key ["+X_TOSSBANK_LOAN_TRACE_ID+"], value ["+filterHeaders.getProperty(X_TOSSBANK_LOAN_TRACE_ID)+"]");
+
+ } catch (Exception e) {
+ logger.error(e.getMessage());
+ }
+
+ return message;
+ }
+
+ public Map getInboundHeaderProp(Properties prop) {
+ Properties header = new Properties();
+ Map inboundHeaderMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+ try {
+ Object headerObj = prop.get(HttpAdapterServiceKey.INBOUND_HEADER);
+ if (headerObj instanceof Properties) { //tomcat
+ header = (Properties) headerObj;
+ for (String name : header.stringPropertyNames()) {
+ inboundHeaderMap.put(name, header.getProperty(name));
+ }
+ } else if (headerObj instanceof String) { //weblogic
+ String str = (String) headerObj;
+ str = str.substring(1, str.length() - 1);
+ // key=value 쌍 분리
+ String[] entries = str.split(",");
+ for (String entry : entries) {
+ String[] kv = entry.split("=", 2);
+ if (kv.length == 2) {
+ inboundHeaderMap.put(kv[0].trim(), kv[1].trim());
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return inboundHeaderMap;
+ }
+
+ @Override
+ public Object doPostFilter(String adptGrpName, String adptName, Properties prop, Object message,
+ Properties tempProp) throws Exception {
+ return message;
+ }
+
+}
+
diff --git a/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/TraceBodyFilter.java b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/TraceBodyFilter.java
new file mode 100644
index 0000000..3d69c94
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/filter/TraceBodyFilter.java
@@ -0,0 +1,71 @@
+package com.eactive.eai.custom.kjb.adapter.http.client.filter;
+
+import java.util.Properties;
+
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+
+import com.eactive.eai.adapter.http.dynamic.HttpAdapterServiceKey;
+import com.eactive.eai.common.TransactionContextKeys;
+import com.eactive.eai.common.util.Logger;
+import com.nimbusds.jose.shaded.gson.JsonObject;
+
+public class TraceBodyFilter implements HttpClientAdapterFilter, HttpAdapterServiceKey {
+
+ protected static Logger logger = Logger.getLogger(Logger.LOGGER_ADAPTER);
+
+ public static final String BIZ_HEADER = "header";
+ public static final String GUID = "guid";
+ public static final String TRACEID = "traceId";
+
+ @Override
+ public Object doPreFilter(String adptGrpName, String adptName, Properties prop, Object message, Properties tempProp)
+ throws Exception {
+
+ JSONObject bizJsonStr = null;
+
+ if (message instanceof String) {
+
+ bizJsonStr = (JSONObject) JSONValue.parse((String) message);
+
+ if ( bizJsonStr == null ) return message; //json string이 아님.
+
+ if (bizJsonStr.containsKey(BIZ_HEADER)) {
+ JSONObject bizHeader = (JSONObject) bizJsonStr.get(BIZ_HEADER);
+
+ putBizHeaderData(bizHeader, tempProp);
+
+ }else {
+
+ JSONObject bizHeader = new JSONObject();
+ bizJsonStr.put(BIZ_HEADER, bizHeader);
+ putBizHeaderData(bizHeader, tempProp);
+
+ }
+
+ }
+
+ return bizJsonStr != null ? bizJsonStr.toJSONString() : message;
+ }
+
+ static private void putBizHeaderData(JSONObject bizHeader, Properties tempProp) {
+
+ String traceId = tempProp.getProperty(TransactionContextKeys.TRANSACTION_UUID, "");
+
+ String guid = tempProp.getProperty(TransactionContextKeys.GUID, "");
+
+ bizHeader.put(GUID, guid);
+ logger.debug("Processing Key [" + GUID + "], value [" + guid + "]");
+
+ bizHeader.put(TRACEID, traceId);
+ logger.debug("Processing Key [" + TRACEID + "], value [" + traceId + "]");
+ }
+
+ @Override
+ public Object doPostFilter(String adptGrpName, String adptName, Properties prop, Object message,
+ Properties tempProp) throws Exception {
+ // TODO Auto-generated method stub
+ return message;
+ }
+
+}
diff --git a/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/impl/HttpClient5AdapterServiceRestAddFilter.java b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/impl/HttpClient5AdapterServiceRestAddFilter.java
new file mode 100644
index 0000000..30fbca3
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/client/impl/HttpClient5AdapterServiceRestAddFilter.java
@@ -0,0 +1,222 @@
+package com.eactive.eai.custom.kjb.adapter.http.client.impl;
+
+import java.util.Properties;
+//import java.util.concurrent.Callable;
+
+import org.apache.commons.lang3.StringUtils;
+import org.dom4j.Node;
+import org.json.simple.JSONObject;
+
+import com.eactive.eai.adapter.http.client.HttpClientAdapterServiceKey;
+import com.eactive.eai.adapter.http.client.impl.HttpClient5AdapterServiceRest;
+import com.eactive.eai.custom.kjb.adapter.http.client.filter.HttpClient5AdapterFilterFactory;
+//import com.eactive.eai.custom.kjb.adapter.http.client.filter.HttpClientAdapterExceptionFilter;
+import com.eactive.eai.custom.kjb.adapter.http.client.filter.HttpClientAdapterFilter;
+//import com.eactive.eai.custom.kjb.adapter.http.client.filter.IBKOutCommonFilter;
+//import com.eactive.eai.custom.kjb.adapter.http.client.filter.IBKOutExceptionFilter;
+//import com.fasterxml.jackson.databind.ObjectMapper;
+//import com.fasterxml.jackson.databind.node.ObjectNode;
+//import com.ibk.eai.common.circuitbreaker.url.UrlCircuitBreakerManager;
+
+//import io.github.resilience4j.circuitbreaker.CircuitBreaker;
+
+/**
+ * 1. 기능 : HttpClient5AdapterServiceRest 호출 전후 Filter 적용할 수 있는 기능을 제공한다. {
+// Properties prop;
+// Object data;
+// Properties tempProp;
+// HttpClient5AdapterServiceRestAddFilter clientService;
+//
+// public HttpClientAdapterCallable(Properties prop, Object data, Properties tempProp,
+// HttpClient5AdapterServiceRestAddFilter clientService) {
+// this.prop = prop;
+// this.data = data;
+// this.tempProp = tempProp;
+// this.clientService = clientService;
+// }
+//
+// @Override
+// public Object call() throws Exception {
+// return clientService.callSuper(prop, data, tempProp);
+// }
+//
+// }
+
+ protected Object doPreFilters(String adptGrpName, String adptName, Properties prop, Object message,
+ Properties tempProp) throws Exception {
+
+// boolean isSetCommonFilterInAdapterProp = false;
+ // 1. adapter에 설정된 필터 수행
+ String preFiltersStr = prop.getProperty(PRE_FILTERS);
+ if (StringUtils.isNotEmpty(preFiltersStr)) {
+ String[] preFilters = StringUtils.split(preFiltersStr, ",");
+ for (String filterName : preFilters) {
+ if (StringUtils.isBlank(filterName)) {
+ continue;
+ }
+
+ logger.debug("HttpClient5AdapterServiceRestAddFilter] Processing Start [" + filterName + "]");
+ HttpClientAdapterFilter adapterFilter = HttpClient5AdapterFilterFactory.createFilter(filterName.trim());
+
+ if (adapterFilter != null) {
+// if (adapterFilter instanceof IBKOutCommonFilter)
+// isSetCommonFilterInAdapterProp = true;
+
+ message = adapterFilter.doPreFilter(adptGrpName, adptName, prop, message, tempProp);
+ } else {
+ throw new Exception("Failed get Filter Class: " + filterName);
+ }
+ }
+ }
+
+// // 2. IBKOutCommonFilter 필터 수행(adapter 필터에서 수행하지 않을 때만)
+// if (!isSetCommonFilterInAdapterProp) {
+// HttpClientAdapterFilter ibkFilter = HttpClient5AdapterFilterFactory
+// .createFilter(IBKOutCommonFilter.class.getName());
+// if (ibkFilter != null) {
+// message = ibkFilter.doPreFilter(adptGrpName, adptName, prop, message, tempProp);
+// }
+// } else {
+// logger.debug("IBKOutCommonFilter isSetCommonFilterInAdapterProp 'POST_FILTERS'. already in adapter filters");
+// }
+
+ return message;
+ }
+
+ protected Object doPostFilters(String adptGrpName, String adptName, Properties prop, Object message,
+ Properties tempProp) throws Exception {
+
+// boolean isSetCommonFilterInAdapterProp = false;
+ // 1. adapter에 설정된 필터 수행
+ String postFiltersStr = prop.getProperty(POST_FILTERS);
+ if (StringUtils.isNotEmpty(postFiltersStr)) {
+ String[] postFilters = StringUtils.split(postFiltersStr, ",");
+ for (String filterName : postFilters) {
+ if (StringUtils.isBlank(filterName)) {
+ continue;
+ }
+
+ HttpClientAdapterFilter adapterFilter = HttpClient5AdapterFilterFactory.createFilter(filterName.trim());
+ if (adapterFilter != null) {
+// if (adapterFilter instanceof IBKOutCommonFilter)
+// isSetCommonFilterInAdapterProp = true;
+ message = adapterFilter.doPostFilter(adptGrpName, adptName, prop, message, tempProp);
+ } else {
+ throw new Exception("Failed get Filter Class: " + filterName);
+ }
+ }
+ }
+
+// // 2. IBKOutCommonFilter 필터 수행
+// if (!isSetCommonFilterInAdapterProp) {
+// HttpClientAdapterFilter ibkFilter = HttpClient5AdapterFilterFactory
+// .createFilter(IBKOutCommonFilter.class.getName());
+// if (ibkFilter != null) {
+// message = ibkFilter.doPostFilter(adptGrpName, adptName, prop, message, tempProp);
+// }
+// } else {
+// logger.debug("IBKOutCommonFilter isSetCommonFilterInAdapterProp 'PRE_FILTERS'. already in adapter filters");
+// }
+ return message;
+ }
+
+// protected Object doExceptionFilters(String adptGrpName, String adptName, Properties prop, Object message,
+// Properties tempProp, Exception e) throws Exception {
+// String exceptionFilterName = prop.getProperty(EXCEPTION_FILTER);
+// if (StringUtils.isEmpty(exceptionFilterName))
+// exceptionFilterName = IBKOutExceptionFilter.class.getSimpleName();
+//
+// HttpClientAdapterExceptionFilter exceptionFilter = HttpClient5AdapterFilterFactory.createExceptionFilter(exceptionFilterName.trim());
+// return exceptionFilter.doExceptionFilter(adptGrpName, adptName, prop, message, tempProp, e);
+//
+// }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/eactive/eai/custom/kjb/adapter/http/dynamic/filter/KjbHmacSha256VerifyFilter.java b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/dynamic/filter/KjbHmacSha256VerifyFilter.java
new file mode 100644
index 0000000..9b911de
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/kjb/adapter/http/dynamic/filter/KjbHmacSha256VerifyFilter.java
@@ -0,0 +1,152 @@
+package com.eactive.eai.custom.kjb.adapter.http.dynamic.filter;
+
+import java.io.UnsupportedEncodingException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.Properties;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.net.util.Base64;
+import org.springframework.http.HttpStatus;
+import org.apache.commons.lang3.StringUtils;
+
+import com.eactive.eai.adapter.http.dynamic.HttpAdapterServiceKey;
+import com.eactive.eai.adapter.http.dynamic.HttpAdapterServiceSupport;
+import com.eactive.eai.adapter.http.dynamic.filter.HttpAdapterFilter;
+import com.eactive.eai.adapter.http.dynamic.filter.JwtAuthException;
+import com.eactive.eai.authserver.service.OAuth2Manager;
+import com.eactive.eai.authserver.vo.ClientVO;
+import com.eactive.eai.common.util.Logger;
+
+public class KjbHmacSha256VerifyFilter implements HttpAdapterFilter, HttpAdapterServiceKey {
+
+ static Logger logger = Logger.getLogger(Logger.LOGGER_ADAPTER);
+
+ private static final String SERVICE_CODE_UNKNOWN = "00";
+
+ public KjbHmacSha256VerifyFilter() {
+ super();
+ }
+
+ @Override
+ public Object doPreFilter(String adptGrpName, String adptName, Object message, Properties prop,
+ HttpServletRequest request, HttpServletResponse response) throws Exception {
+
+ String inboundMethod = prop.getProperty(INBOUND_METHOD);
+ String inboundUri = prop.getProperty(INBOUND_URI);
+ String inboundBody = prop.getProperty(INBOUND_REQUEST_MESSAGE);
+
+ try {
+ String xObpPartnercode = request.getHeader("x-obp-partnercode");
+ String xObpSignatureUrl = request.getHeader("x-obp-signature-url");
+ String xObpSignatureBody = request.getHeader("x-obp-signature-body");
+ if (StringUtils.isBlank(xObpPartnercode)
+ || StringUtils.isBlank(xObpSignatureUrl)
+ || StringUtils.isBlank(xObpSignatureBody)) {
+ throw new JwtAuthException(
+ String.valueOf(HttpStatus.UNAUTHORIZED.value()),
+ "Can not find mandatory Http Header");
+ }
+
+ if (StringUtils.isNotBlank(prop.getProperty(INBOUND_QUERY_STRING))) {
+ inboundUri = inboundUri + "?" + prop.getProperty(INBOUND_QUERY_STRING);
+ inboundBody = "";
+ }
+ String chkUrl = inboundMethod + "&" + inboundUri;
+ String chkBody = inboundBody;
+ String clientSecret = assignClientSecret(prop, request);
+
+ String macUrl = calculateHMAC(chkUrl, clientSecret);
+ String macBody = calculateHMAC(chkBody, clientSecret);
+
+ if (!StringUtils.equals(xObpSignatureUrl, macUrl)) {
+ throw new JwtAuthException(
+ String.valueOf(HttpStatus.UNAUTHORIZED.value()),
+ "Signature verifying failed : x-obp-signature-url");
+ }
+
+ if (!StringUtils.equals(xObpSignatureBody, macBody)) {
+ throw new JwtAuthException(
+ String.valueOf(HttpStatus.UNAUTHORIZED.value()),
+ "Signature verifying failed : x-obp-signature-body");
+ }
+
+ } catch (JwtAuthException e) {
+ logger.debug(e.getMessage());
+ throw e;
+ } catch (Exception e) {
+ logger.error(e.getMessage());
+ throw new JwtAuthException(
+ String.valueOf(HttpStatus.UNAUTHORIZED.value()),
+ "Signature verifying failed(unkown)");
+ }
+
+ return message;
+ }
+
+ public static String calculateHMAC(String data, String key)
+ throws NoSuchAlgorithmException, InvalidKeyException, UnsupportedEncodingException {
+
+ Mac mac = Mac.getInstance("HmacSHA256");
+ mac.init(new SecretKeySpec(key.getBytes(), "HmacSHA256"));
+ return Base64.encodeBase64String(mac.doFinal(data.getBytes("UTF-8")));
+ }
+
+ private String assignClientSecret(Properties prop, HttpServletRequest request) throws Exception {
+ String clientId = assignClientId(prop, request);
+ if (StringUtils.isBlank(clientId)) {
+ throw new JwtAuthException(
+ String.valueOf(HttpStatus.UNAUTHORIZED.value()),
+ "Can not find clientId info");
+ }
+
+ ClientVO client = (ClientVO) OAuth2Manager.getInstance().getClientDeatilsStore().get(clientId);
+ if (client == null) {
+ throw new JwtAuthException(
+ String.valueOf(HttpStatus.UNAUTHORIZED.value()),
+ "Can not find client info");
+ }
+
+ return client.getClientSecret();
+ }
+
+ private String assignClientId(Properties prop, HttpServletRequest request) {
+ String clientId = null;
+ try {
+ // 이전 filter에서 셋팅한 clientId 확보
+ clientId = prop.getProperty(HttpAdapterServiceSupport.PROPERTIES_NAME_CLIENT_ID);
+
+ // 이전 filter에서 셋팅한 값이 없다면 header 정보에서 확보
+ if (StringUtils.isBlank(clientId)) {
+ clientId = request.getHeader(HttpAdapterServiceSupport.HEADER_NAME_CLIENT_ID);
+ }
+ } catch (Exception e) {
+ logger.error(e.getMessage());
+ }
+
+ return clientId;
+ }
+
+ @Override
+ public Object doPostFilter(String adptGrpName, String adptName, Object resultMessage, Properties prop,
+ HttpServletRequest request, HttpServletResponse response) throws Exception {
+
+ String outboundBody = (String) resultMessage;
+
+ try {
+ String clientSecret = assignClientSecret(prop, request);
+ String macBody = calculateHMAC(outboundBody, clientSecret);
+
+ response.addHeader("x-obp-signature-body", macBody);
+ } catch (Exception e) {
+ logger.error(e.getMessage());
+ }
+
+ return resultMessage;
+ }
+
+}
diff --git a/src/main/java/com/eactive/eai/custom/message/GUIDGeneratorKAKAOCARD.java b/src/main/java/com/eactive/eai/custom/message/GUIDGeneratorKAKAOCARD.java
index 254dc70..13b717d 100644
--- a/src/main/java/com/eactive/eai/custom/message/GUIDGeneratorKAKAOCARD.java
+++ b/src/main/java/com/eactive/eai/custom/message/GUIDGeneratorKAKAOCARD.java
@@ -76,6 +76,6 @@ public final class GUIDGeneratorKAKAOCARD {
public static void main(String[] args) {
String guid = getGUID("FEP");
- System.out.println("[" + guid.length() + "]" + guid);
+ // System.out.println("[" + guid.length() + "]" + guid);
}
}
\ No newline at end of file
diff --git a/src/main/java/com/eactive/eai/custom/message/GUIDGeneratorKJB.java b/src/main/java/com/eactive/eai/custom/message/GUIDGeneratorKJB.java
new file mode 100644
index 0000000..3066b50
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/message/GUIDGeneratorKJB.java
@@ -0,0 +1,98 @@
+package com.eactive.eai.custom.message;
+
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+
+import com.eactive.eai.common.util.DatetimeUtil;
+import org.apache.commons.lang3.StringUtils;
+
+import com.eactive.eai.common.server.Keys;
+import com.eactive.eai.common.util.StringUtil;
+import com.eactive.eai.common.util.UUID;
+
+/**
+ * 1. 기능 : UUID Generation Class 2. 처리 개요 : * - 3. 주의사항
+ *
+ * @author :
+ * @version : v 1.0.0
+ * @see : 관련 기능을 참조
+ * @since : :
+ */
+public final class GUIDGeneratorKJB {
+
+ /*
+ * 그룹사코드(3) + 호스트명(8) + 서버구분번호(2) + 일자(8) + 전문생성시간(6) + 일련번호(6) + 시스템경로번호(3, '001')
+ */
+
+ public static final int GUID_LENGTH = 33; // 시스템경로번호 제외부분
+
+ /**
+ * 1. 기능 : Private 생성자 2. 처리 개요 : - 3. 주의사항 - Instance 생성하지 못함
+ **/
+ private GUIDGeneratorKJB() {
+ }
+
+ public synchronized static String getGUID(String groupCmpCd) {
+ String guid = groupCmpCd + UNIQUE_NUM;
+ guid = guid + DatetimeUtil.getCurrentDateTime();
+
+ if(seq < 10) {
+ guid = guid + "00000" + seq;
+ }
+ else if(seq < 100) {
+ guid = guid + "0000" + seq;
+ }
+ else if(seq < 1000) {
+ guid = guid + "000" + seq;
+ }
+ else if(seq < 10000) {
+ guid = guid + "00" + seq;
+ }
+ else if(seq < 100000) {
+ guid = guid + "0" + seq;
+ }
+ else {
+ guid = guid + seq;
+ }
+
+ seq ++;
+ if(seq > 999999) {
+ seq = 1;
+ }
+
+ return guid + "001";
+ }
+
+ private static String UNIQUE_NUM;
+ private static int seq = 1;
+ static {
+ String hostname = "";
+ try {
+ hostname = java.net.InetAddress.getLocalHost().getHostName();
+ }
+ catch(Exception e) {
+ hostname = "________";
+ }
+
+ if(hostname.getBytes().length != 8) {
+ if(hostname.getBytes().length < 8) {
+ hostname = StringUtils.leftPad(hostname, 8, '_');
+ } else if(hostname.getBytes().length > 8) {
+ hostname = StringUtils.substring(hostname, 0, 8);
+ }
+ }
+
+ String serverName = System.getProperty(Keys.SERVER_KEY);
+ String instid = "00";
+ if(serverName != null && serverName.length() > 2) {
+ instid = serverName.substring(serverName.length()-2, serverName.length());
+ }
+
+ UNIQUE_NUM = hostname.toUpperCase() + instid;
+ }
+
+ public static void main(String[] args) {
+ String guid = getGUID("051");
+ // System.out.println("[" + guid.length() + "]" + guid);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/eactive/eai/custom/message/InterfaceMapperKBANK.java b/src/main/java/com/eactive/eai/custom/message/InterfaceMapperKBANK.java
index 6980326..39c2972 100644
--- a/src/main/java/com/eactive/eai/custom/message/InterfaceMapperKBANK.java
+++ b/src/main/java/com/eactive/eai/custom/message/InterfaceMapperKBANK.java
@@ -19,7 +19,7 @@ public class InterfaceMapperKBANK extends DefaultInterfaceMapper {
@Override
public String getInExDivision(StandardMessage standardMessage) {
- return "1";
+ return "2";
}
@Override
diff --git a/src/main/java/com/eactive/eai/custom/message/InterfaceMapperKJB.java b/src/main/java/com/eactive/eai/custom/message/InterfaceMapperKJB.java
new file mode 100644
index 0000000..cf252b2
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/message/InterfaceMapperKJB.java
@@ -0,0 +1,202 @@
+package com.eactive.eai.custom.message;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.eactive.eai.common.server.EAIServerManager;
+import com.eactive.eai.common.util.StringUtil;
+import com.eactive.eai.message.StandardMessage;
+import com.eactive.eai.message.service.DefaultInterfaceMapper;
+import com.ext.eai.common.stdmessage.STDMessageKeys;
+
+@SuppressWarnings("serial")
+public class InterfaceMapperKJB extends DefaultInterfaceMapper {
+ private static String SESSION_ID = "INTERFACE_COMMON.MCI_SESN_ID";
+ private static String INSTANCE_ID = "INTERFACE_COMMON.MCI_INSTNC_ID";
+
+ @Override
+ public String getEaiSvcCode(StandardMessage standardMessage) {
+ String eaiSvcCode = null;
+ String interfaceId = getInterfaceId(standardMessage);
+ String returnType = getSendRecvDivision(standardMessage); // S | R
+ String inExDivision = getInExDivision(standardMessage); // 1 | 2
+ if (interfaceId == null)
+ interfaceId = "";
+ interfaceId = interfaceId.trim();
+
+ // TODO : site에 맞게 조합해야 함.
+ eaiSvcCode = interfaceId + returnType + StringUtils.defaultString(inExDivision);
+ return eaiSvcCode;
+ }
+
+ @Override
+ public void setGuid(StandardMessage standardMessage, String guid) {
+ if (guid == null)
+ throw new RuntimeException("guid is null");
+ if (guid.length() != 36)
+ throw new RuntimeException("The length of guid is not 36");
+ setItemValue(standardMessage, getPath(GUID), guid);
+ }
+
+ @Override
+ public String getGuid(StandardMessage standardMessage) {
+ String guid = getItemValue(standardMessage, getPath(GUID));
+ if (guid.length() == 36) {
+ guid = guid.substring(0, 33);
+ }
+ return guid;
+ }
+
+ @Override
+ public String getGuidSeq(StandardMessage standardMessage) {
+ String guidseq = null;
+ String guid = getItemValue(standardMessage, getPath(GUID));
+ if (guid.length() == 36) {
+ guidseq = guid.substring(33);
+ } else {
+ guidseq = "000";
+ }
+ return guidseq;
+ }
+
+ @Override
+ public void setGuidSeq(StandardMessage standardMessage, String guidSeq) {
+ setItemValue(standardMessage, getPath(GUID), getGuid(standardMessage) + guidSeq);
+ }
+
+ @Override
+ public String getOrgGuid(StandardMessage standardMessage) {
+ String orgGuid = getItemValue(standardMessage, getPath(GUID));
+ if (orgGuid.length() == 36) {
+ orgGuid = orgGuid.substring(0, 33);
+ }
+ return orgGuid;
+ }
+
+ @Override
+ public void setOrgGuid(StandardMessage standardMessage, String orgGuid) {
+ if (orgGuid.length() == 36) {
+ orgGuid = orgGuid.substring(0, 33);
+ }
+ setItemValue(standardMessage, getPath(GUID_ORG), orgGuid);
+ }
+
+ @Override
+ public String nextGuidSeq(StandardMessage standardMessage) {
+ String guidSeq = getGuidSeq(standardMessage);
+ if (guidSeq == null)
+ return "";
+ int seq = 0;
+ try {
+ seq = Integer.parseInt(guidSeq) + 1;
+ } catch (NumberFormatException e) {
+ seq = 1;
+ }
+ guidSeq = StringUtil.stringFormat(Integer.toString(seq), true, '0', 3);
+ setGuidSeq(standardMessage, guidSeq);
+ return guidSeq;
+ }
+
+ /**
+ * 표준전문의 복원은 COMMON.ORTR_RESTR_YN 의 value는 (Y/N) 엔진에서 복원여부 의 value는 (1/0)
+ */
+ @Override
+ public String getRecoverYn(StandardMessage standardMessage) {
+ String data = getItemValue(standardMessage, getPath(RECOVER_YN));
+ if ("Y".equals(data)) {
+ return "1";
+ } else {
+ return "0";
+ }
+ }
+
+ @Override
+ public void setRecoverYn(StandardMessage standardMessage, String recoverYn) {
+ if ("1".equals(recoverYn)) {
+ setItemValue(standardMessage, getPath(RECOVER_YN), "Y");
+ } else {
+ setItemValue(standardMessage, getPath(RECOVER_YN), "N");
+ }
+ }
+
+ @Override
+ public String getInstCode(StandardMessage standardMessage) {
+ EAIServerManager server = EAIServerManager.getInstance();
+ if (server != null && server.isMCI()) {
+ return getItemValue(standardMessage, INSTANCE_ID);
+ } else {
+ return "";
+ }
+ }
+
+ @Override
+ public void setInstCode(StandardMessage standardMessage, String instCode) {
+ EAIServerManager server = EAIServerManager.getInstance();
+ if (server != null && server.isMCI()) {
+ setItemValue(standardMessage, INSTANCE_ID, instCode);
+ }
+ }
+
+ @Override
+ public String getSessionId(StandardMessage standardMessage) {
+ EAIServerManager server = EAIServerManager.getInstance();
+ if (server != null && server.isMCI()) {
+ return getItemValue(standardMessage, SESSION_ID);
+ } else {
+ return "";
+ }
+ }
+
+ @Override
+ public void setSessionId(StandardMessage standardMessage, String sessionId) {
+ EAIServerManager server = EAIServerManager.getInstance();
+ if (server != null && server.isMCI()) {
+ setItemValue(standardMessage, SESSION_ID, sessionId);
+ }
+ }
+
+
+ /*
+ * 엔진 에서는 public static final String RESPONSE_TYPE_CODE_N = "0";//정상(normal)
+ * public static final String RESPONSE_TYPE_CODE_E = "1";//오류(error)
+ */
+ @Override
+ public void setResponseType(StandardMessage standardMessage, String responseType) {
+ if (responseType != null && (STDMessageKeys.RESPONSE_TYPE_CODE_N.equals(responseType)
+ || STDMessageKeys.RESPONSE_TYPE_CODE_E.equals(responseType))) {
+ if (STDMessageKeys.RESPONSE_TYPE_CODE_N.equals(responseType)) {
+ setItemValue(standardMessage, getPath(RESPONSE_TYPE), "NR");
+ } else {
+ setItemValue(standardMessage, getPath(RESPONSE_TYPE), "ER");
+ }
+ } else {
+ setItemValue(standardMessage, getPath(RESPONSE_TYPE), responseType);
+ }
+
+ }
+
+ @Override
+ public String getInterfaceId(StandardMessage standardMessage) {
+ String interfaceId = getItemValue(standardMessage, getPath(INTERFACE_ID));
+ if (interfaceId == null)
+ return "";
+ interfaceId = interfaceId.trim();
+ return interfaceId;
+ }
+
+ @Override
+ public String getReqSysCode(StandardMessage standardMessage) {
+ // apiPath의 값에서 추출할 예정 : serviceId = api_path
+ String apiPath = getItemValue(standardMessage, getPath(SERVICE_ID));
+ if (apiPath != null) {
+ String[] split = apiPath.split("/");
+ if (split.length > 2) {
+ String route = split[1].toUpperCase();
+ if (route.length() > 3) {
+ route = route.substring(0, 3);
+ }
+ return route;
+ }
+ }
+ return null;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/eactive/eai/custom/message/StandardMessageCoordinatorKJB.java b/src/main/java/com/eactive/eai/custom/message/StandardMessageCoordinatorKJB.java
new file mode 100644
index 0000000..f0bb6fc
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/message/StandardMessageCoordinatorKJB.java
@@ -0,0 +1,198 @@
+package com.eactive.eai.custom.message;
+
+import com.eactive.eai.adapter.AdapterGroupVO;
+import com.eactive.eai.adapter.AdapterManager;
+import com.eactive.eai.common.dao.Keys;
+import com.eactive.eai.common.server.EAIServerManager;
+import com.eactive.eai.common.util.DatetimeUtil;
+import com.eactive.eai.common.util.Logger;
+import com.eactive.eai.common.util.MessageUtil;
+import com.eactive.eai.common.util.StringUtil;
+import com.eactive.eai.inbound.processor.ProcessVO;
+import com.eactive.eai.inbound.processor.Processor;
+import com.eactive.eai.message.StandardItem;
+import com.eactive.eai.message.StandardMessage;
+import com.eactive.eai.message.manager.StandardMessageManager;
+import com.eactive.eai.message.service.DefaultStandardMessageCoordinator;
+import com.eactive.eai.message.service.InterfaceMapper;
+import com.ext.eai.common.stdmessage.STDMessageKeys;
+import org.apache.commons.lang.StringUtils;
+
+import java.net.UnknownHostException;
+import java.util.LinkedHashMap;
+import java.util.Properties;
+
+public class StandardMessageCoordinatorKJB extends DefaultStandardMessageCoordinator {
+ private static Logger logger = Logger.getLogger(Logger.LOGGER_DEFAULT);
+
+ private static final String MESSAGE_PART = "Message";
+ private static final String MESSAGE_PART_HEADER_PART = "Message.Msg_Header";
+ private static final String MESSAGE_PART_MSG_HEDR_KNCD = "Message.Msg_Header.MSG_HEDR_KNCD";
+ private static final String MESSAGE_PART_MSG_HEDR_LEN = "Message.Msg_Header.MSG_HEDR_LEN";
+ private static final String MESSAGE_PART_BODY_PART = "Message.Msg_Body";
+ private static final String MESSAGE_PART_OUTPUT_MSG_CD = "Message.Msg_Body.OUTPUT_MSG_CD";
+ private static final String MESSAGE_PART_OUTPUT_MSG_CTNT = "Message.Msg_Body.OUTPUT_MSG_CTNT";
+ private static final String MESSAGE_PART_OUTPUT_MSG_GRID = "Message.Msg_Body.Output_Msg_Grid";
+ private static final String COMMON_PART_GROUP_CMD_CD = "Common.Service_info.GROUP_CMP_CD";
+ private static final String COMMON_PART_OTSD_CHNL_INST_CD = "Common.Service_info.OTSD_CHNL_INST_CD";
+ private static final String DATA_HEADER_DATA_HEDR_LEN = "Data_Part.Data_Header.DATA_HEDR_LEN";
+
+ @Override
+ public void coordinateAfterParsing(StandardMessage standardMessage, Object paramObject, Properties prop) {
+ }
+
+ @Override
+ public void coordinateBeforeStandardMessageSend(StandardMessage standardMessage, String msgType, String charset) {
+ makeupDataHeaderLength(standardMessage, charset);
+ }
+
+ @Override
+ public void coordinateBeforeResponse(StandardMessage standardMessage, ProcessVO processVO, Properties prop, String charset) {
+ makeupDataHeaderLength(standardMessage, charset);
+ }
+
+ @Override
+ public void coordinateAfterCreateMessageByRule(StandardMessage standardMessage, Object paramObject, Properties prop) {
+ // guid 설정
+ StandardMessageManager standardManager = StandardMessageManager.getInstance();
+ InterfaceMapper mapper = standardManager.getMapper();
+
+ //GUID 설정
+ String groupCmdCd = standardMessage.findItemValue(COMMON_PART_GROUP_CMD_CD);
+
+ String guid = GUIDGeneratorKJB.getGUID(groupCmdCd);
+
+ mapper.setGuid(standardMessage, guid);
+
+ StandardItem dataHeaderEtc = standardMessage.findItem("Data_Part.Data_Header_Etc");
+ dataHeaderEtc.setHidden(true);
+
+ //기관코드, 텔러번호 설정
+ //Adapter에 셋팅된 기관코드를 셋팅한다.
+ String adapterGroupName = prop.getProperty(Processor.ADAPTER_GROUP_NAME);
+ AdapterManager adapterManager = AdapterManager.getInstance();
+ AdapterGroupVO adptGrpVO = adapterManager.getAdapterGroupVO(adapterGroupName);
+
+ // Adapter의 기관코드를 얻어온다.
+ //TODO: 기관코드의 경우 현재 EAPIM 시스템에 컬럼은 있으나 설정을 사용하지 않고있으므로 불필요 할 경우 사용하지 않는다, 필요 할 경우 추가한다.
+ String inAdapterOsidInstiNo = adptGrpVO.getOsidInstiNo();
+ if(inAdapterOsidInstiNo != null && inAdapterOsidInstiNo.trim().length() > 0) {
+ standardMessage.setData(COMMON_PART_OTSD_CHNL_INST_CD, inAdapterOsidInstiNo);
+ if (logger.isDebug()) {
+ logger.debug("FIELD SET " + COMMON_PART_OTSD_CHNL_INST_CD + " << "+inAdapterOsidInstiNo);
+ }
+ }
+
+ //2012-12-17 나영채 차장 타발요청에만 셋팅해달라고 요청
+ //전문요청일자
+ standardMessage.setData("Common.BizProc_Info.MESG_DMAN_DT", DatetimeUtil.getCurrentDate());
+ //전문요청시간
+ standardMessage.setData("Common.BizProc_Info.MESG_DMAN_TKTM", DatetimeUtil.getFormattedDate("HHmmssSSS"));
+
+
+ //2012-07-24 임의 로 영업일자에 system시간 설정
+ standardMessage.setData("Common.BizProc_Info.BZOP_DT", DatetimeUtil.getCurrentDate());
+
+ EAIServerManager eaiServerManager = EAIServerManager.getInstance();
+ //비표준일경우 시스템 운영환경 구분코드를 셋팅한다.
+ standardMessage.setData("Common.Service_info.SYS_OPRT_ENV_DVCD", getSysOprtEnvDvcd(eaiServerManager));
+
+ //헤더부 최초전송IP주소 FRST_TRNM_IPAD
+ try {
+ standardMessage.setData("Header.Src_System.FRST_TRNM_IPAD", java.net.InetAddress.getLocalHost().getHostAddress());
+ } catch (UnknownHostException e) {
+ }
+ }
+
+ @Override
+ public boolean coordinateSetStandardMessageError(StandardMessage standardMessage, InterfaceMapper mapper,
+ String errCode, String errMsg) {
+
+ mapper.setResponseType(standardMessage, STDMessageKeys.RESPONSE_TYPE_CODE_E);
+ mapper.setSendRecvDivision(standardMessage, STDMessageKeys.SEND_RECV_CD_RECV);
+
+ StandardItem messagePart = standardMessage.findItem(MESSAGE_PART);
+ messagePart.setHidden(false);
+ messagePart.setSize(1);
+
+ StandardItem messageHeaderPart = standardMessage.findItem(MESSAGE_PART_HEADER_PART);
+ messageHeaderPart.setSize(1);
+ StandardItem messageBodyPart = standardMessage.findItem(MESSAGE_PART_BODY_PART);
+ messageBodyPart.setSize(1);
+
+ errCode = StringUtils.defaultString(errCode);
+ String siteErrCode = MessageUtil.getTobeCode(errCode);
+ String siteErrMessage;
+ switch(errCode) {
+ case("RECEAIIRP070"):
+ siteErrMessage = "거래 통제 되었습니다.";
+ break;
+ default:
+ siteErrMessage = MessageUtil.getTobeMessage(errCode);
+ break;
+ }
+
+ mapper.setErrorCode(standardMessage, siteErrCode);
+
+ standardMessage.setData(MESSAGE_PART_MSG_HEDR_KNCD, "EM");
+ standardMessage.setData(MESSAGE_PART_OUTPUT_MSG_CD, siteErrCode);
+ StandardItem msgGrid = standardMessage.findItem(MESSAGE_PART_OUTPUT_MSG_GRID);
+ LinkedHashMap msgGridFirstChilds = msgGrid.getArrayChilds(0, true);
+ msgGridFirstChilds.get("OUTPUT_MSG_CD").setValue(siteErrCode);
+ msgGridFirstChilds.get("OUTPUT_MSG_CTNT").setValue(siteErrMessage);
+ //Message.Msg_Body.OUTPUT_MSG_CTNT
+ mapper.setErrorMsg(standardMessage, siteErrMessage);
+ int len = standardMessage.getBytesDataLengthForPath(MESSAGE_PART_BODY_PART);
+ String lenStr = StringUtils.leftPad(String.valueOf(len), 8, '0');
+ standardMessage.setData(MESSAGE_PART_MSG_HEDR_LEN, lenStr);
+
+ return false;
+ }
+
+
+ @Override
+ public void coordinateAfterRecvNonStdSyncResponse(StandardMessage responseMessage) {
+ StandardItem messagePart = responseMessage.findItem(MESSAGE_PART);
+ messagePart.setHidden(false);
+ messagePart.setSize(1);
+
+ StandardItem messageHeaderPart = responseMessage.findItem(MESSAGE_PART_HEADER_PART);
+ messageHeaderPart.setSize(1);
+ StandardItem messageBodyPart = responseMessage.findItem(MESSAGE_PART_BODY_PART);
+ messageBodyPart.setSize(1);
+
+ responseMessage.setData(MESSAGE_PART_MSG_HEDR_KNCD, "NM");
+ responseMessage.setData(MESSAGE_PART_OUTPUT_MSG_CD, "100000 ");
+ responseMessage.setData(MESSAGE_PART_OUTPUT_MSG_CTNT, "정상처리");
+ StandardItem msgGrid = responseMessage.findItem(MESSAGE_PART_OUTPUT_MSG_GRID);
+ LinkedHashMap msgGridFirstChilds = msgGrid.getArrayChilds(0, true);
+ msgGridFirstChilds.get("OUTPUT_MSG_CD").setValue("100000 ");
+ msgGridFirstChilds.get("OUTPUT_MSG_CTNT").setValue("정상처리");
+ int len = responseMessage.getBytesDataLengthForPath(MESSAGE_PART_BODY_PART);
+ String lenStr = StringUtils.leftPad(String.valueOf(len), 8, '0');
+ responseMessage.setData(MESSAGE_PART_MSG_HEDR_LEN, lenStr);
+ }
+
+ public String getSysOprtEnvDvcd(EAIServerManager eaiServerManager) {
+ String result = "";
+ if (eaiServerManager.isPEAIServer()){ //운영
+ result = STDMessageKeys.SYS_OPRT_ENV_DVCD_ONLINE;
+ }else if (eaiServerManager.isDEAIServer()){ //개발
+ result = STDMessageKeys.SYS_OPRT_ENV_DVCD_DEV;
+ }else if (eaiServerManager.isSEAIServer()){ //테스트/검증
+ result = STDMessageKeys.SYS_OPRT_ENV_DVCD_TESTSTAGE;
+ }
+ return result;
+ }
+
+ private static void makeupDataHeaderLength(StandardMessage standardMessage, String charset) {
+ String dataBytesLengthStr = null;
+ try {
+ dataBytesLengthStr = String.valueOf(standardMessage.getBizDataBytes(charset).length);
+ String dataHeaderLength = StringUtils.leftPad(dataBytesLengthStr, 8, '0');
+ standardMessage.setData(DATA_HEADER_DATA_HEDR_LEN, dataHeaderLength);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+}
diff --git a/src/main/java/com/eactive/eai/custom/pretty/PrettyPrintController.java b/src/main/java/com/eactive/eai/custom/pretty/PrettyPrintController.java
new file mode 100644
index 0000000..56c86e9
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/pretty/PrettyPrintController.java
@@ -0,0 +1,130 @@
+package com.eactive.eai.custom.pretty;
+
+import java.util.List;
+import java.util.Optional;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.eactive.eai.common.message.EAIMessage;
+import com.eactive.eai.common.message.EAIMessageManager;
+import com.eactive.eai.common.message.ServiceMessage;
+import com.eactive.eai.common.util.Logger;
+import com.eactive.eai.transformer.layout.Layout;
+import com.eactive.eai.transformer.message.MessageFactory;
+import com.eactive.eai.transformer.transform.Transform;
+import com.eactive.eai.transformer.transform.TransformManager;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@Controller
+public class PrettyPrintController {
+ public static Logger logger = Logger.getLogger(Logger.LOGGER_DEFAULT);
+
+ private static final String FALLBACK_ERROR_JSON = "{ \"error\": true, \"result\": \"occur error building responseMessage.\" }";
+
+ @RequestMapping(value = "/PrettyPrint", method = RequestMethod.POST, consumes = "application/json", produces = "application/json; charset=UTF-8")
+ @ResponseBody
+ public ResponseEntity tokenJson(@RequestBody PrettyPrintRequest transFormRequest,
+ HttpServletRequest request, HttpServletResponse response) {
+
+ PrettyPrintResponse prettyPrintResponse = new PrettyPrintResponse();
+
+ try {
+
+ String layoutName = getLayoutName(transFormRequest);
+
+ String result = Optional.ofNullable(MessageFactory.getFactory().getMessage(layoutName)).map(message -> {
+
+ message.setData(transFormRequest.getBizData());
+
+ return message.toXMLString();
+ }).orElseThrow(() -> new IllegalArgumentException("업무 메세지 파싱중 오류"));
+
+ prettyPrintResponse.setResult(result);
+ String successJson = buildResponseMessage(prettyPrintResponse);
+ return ResponseEntity.ok(successJson);
+ } catch (IllegalArgumentException e) {
+ logger.error("Pretty print 실패", e);
+ prettyPrintResponse.setError(true);
+ prettyPrintResponse.setResult("잘못된 업무데이터 전문 파싱 중 에러");
+ String errorJson = buildResponseMessage(prettyPrintResponse);
+ return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(errorJson);
+ } catch (Exception e) {
+ logger.error("Pretty print 실패", e);
+ prettyPrintResponse.setError(true);
+ prettyPrintResponse.setResult("업무전문 파싱에 필요한 layout정보 가져오는 중 실패");
+ String errorJson = buildResponseMessage(prettyPrintResponse);
+ return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(errorJson);
+ }
+
+ }
+
+ String buildResponseMessage(PrettyPrintResponse prettyPrintResponse) {
+ try {
+ ObjectMapper mapper = new ObjectMapper();
+ return mapper.writeValueAsString(prettyPrintResponse);
+ } catch (Exception e) {
+ logger.error("occur error building responseMessage.", e);
+ return FALLBACK_ERROR_JSON;
+ }
+
+ }
+
+ private String getLayoutName(PrettyPrintRequest request) throws Exception {
+
+ EAIMessageManager eaiMessageManager = EAIMessageManager.getInstance();
+
+ EAIMessage eaiMessage = eaiMessageManager.getEAIMessage(request.getIntrefaceId());
+
+ TransformManager transformManager = TransformManager.getManager();
+
+ if (eaiMessage == null) {
+
+ throw new IllegalArgumentException("Invalid interfaceId=" + request.getIntrefaceId());
+
+ }
+
+ List serviceMessageList = eaiMessage.getSvcMsgs();
+
+ ServiceMessage serviceMessage = serviceMessageList.get(0);
+
+ String transformId;
+ Transform transformInfo;
+ Layout layout;
+
+ switch (request.getLogProcessNo()) {
+ case "100":
+ transformId = serviceMessage.getCnvMsgID();
+ transformInfo = transformManager.getTransform(transformId);
+ layout = transformInfo.getSourceLayout(0);
+ return layout.getName();
+ case "200":
+ transformId = serviceMessage.getCnvMsgID();
+ transformInfo = transformManager.getTransform(transformId);
+ layout = transformInfo.getTargetLayout();
+ return layout.getName();
+ case "300":
+ transformId = request.isError() ? serviceMessage.getErrRspCnvMsgID() : serviceMessage.getBsRspCnvMsgID();
+ transformInfo = transformManager.getTransform(transformId);
+ layout = transformInfo.getSourceLayout(0);
+ return layout.getName();
+ case "400":
+ transformId = request.isError() ? serviceMessage.getErrRspCnvMsgID() : serviceMessage.getBsRspCnvMsgID();
+ transformInfo = transformManager.getTransform(transformId);
+ layout = transformInfo.getTargetLayout();
+ return layout.getName();
+ default:
+ throw new IllegalArgumentException("Invalid logProcessNo: " + request.getLogProcessNo());
+ }
+
+ }
+
+}
diff --git a/src/main/java/com/eactive/eai/custom/pretty/PrettyPrintRequest.java b/src/main/java/com/eactive/eai/custom/pretty/PrettyPrintRequest.java
new file mode 100644
index 0000000..89a5a4a
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/pretty/PrettyPrintRequest.java
@@ -0,0 +1,20 @@
+package com.eactive.eai.custom.pretty;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.fasterxml.jackson.annotation.Nulls;
+
+import lombok.Getter;
+import lombok.ToString;
+
+@SuppressWarnings("serial")
+@ToString
+@Getter
+public class PrettyPrintRequest implements Serializable {
+ private String logProcessNo;
+ private String intrefaceId;
+ private String bizData;
+ @JsonSetter(nulls = Nulls.SKIP)
+ private boolean error = false;
+}
diff --git a/src/main/java/com/eactive/eai/custom/pretty/PrettyPrintResponse.java b/src/main/java/com/eactive/eai/custom/pretty/PrettyPrintResponse.java
new file mode 100644
index 0000000..aacf827
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/pretty/PrettyPrintResponse.java
@@ -0,0 +1,16 @@
+package com.eactive.eai.custom.pretty;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.fasterxml.jackson.annotation.Nulls;
+
+import lombok.Data;
+
+@SuppressWarnings("serial")
+@Data
+public class PrettyPrintResponse implements Serializable {
+ private String result;
+ @JsonSetter(nulls = Nulls.SKIP)
+ private boolean error = false;
+}
diff --git a/src/main/java/com/eactive/eai/custom/statistics/ApiStatsMonitorImpl.java b/src/main/java/com/eactive/eai/custom/statistics/ApiStatsMonitorImpl.java
new file mode 100644
index 0000000..6eb2929
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/statistics/ApiStatsMonitorImpl.java
@@ -0,0 +1,167 @@
+package com.eactive.eai.custom.statistics;
+
+import java.time.LocalDateTime;
+
+import org.springframework.stereotype.Component;
+
+import com.eactive.eai.common.message.EAIMessage;
+import com.eactive.eai.common.monitor.StatisticsMonitor;
+import com.eactive.eai.common.util.Logger;
+import com.eactive.eai.custom.statistics.collector.ApiStatsCollector;
+import com.eactive.eai.custom.statistics.dto.TransactionEvent;
+
+import lombok.RequiredArgsConstructor;
+
+/**
+ * StatisticsMonitor 구현체 - EAIServiceMonitor에서 호출되어 API 통계 수집 - EAIMessage에서 필요한
+ * 정보를 추출하여 ApiStatsCollector에 전달
+ */
+@Component
+@RequiredArgsConstructor
+public class ApiStatsMonitorImpl implements StatisticsMonitor {
+
+ private static final Logger logger = Logger.getLogger(Logger.LOGGER_DEFAULT);
+
+ private final ApiStatsCollector apiStatsCollector;
+
+ @Override
+ public void recordStatistics(EAIMessage requestEaiMessage) {
+ try {
+ // 로그 시퀀스 100, 400, 900만 처리
+ int logSequence = requestEaiMessage.getLogPssSno();
+
+ // 디버깅: 모든 logSequence 로깅
+ logger.info("API Stats - logSeq: {}, API: {}, errorCode: {}",
+ logSequence, requestEaiMessage.getEAISvcCd(), requestEaiMessage.getStatErrorCode());
+
+ if (logSequence != 100 && logSequence != 400 && logSequence != 900) {
+ return;
+ }
+
+ String apiName = extractApiName(requestEaiMessage);
+ String gwInstanceId = extractGwInstanceId(requestEaiMessage);
+ String bizDivCode = extractBizDivCode(requestEaiMessage);
+ String clientId = extractClientId(requestEaiMessage);
+ String inboundAdapter = extractInboundAdapter(requestEaiMessage);
+ String outboundAdapter = extractOutboundAdapter(requestEaiMessage);
+ long responseTimeMs = extractResponseTime(requestEaiMessage);
+ boolean success = extractSuccess(requestEaiMessage);
+ TransactionEvent.ErrorType errorType = extractErrorType(requestEaiMessage, success);
+
+ // TransactionEvent 생성
+ TransactionEvent event = TransactionEvent.builder().apiName(apiName).gwInstanceId(gwInstanceId)
+ .bizDivCode(TransactionEvent.normalizeValue(bizDivCode))
+ .clientId(TransactionEvent.normalizeValue(clientId))
+ .inboundAdapter(TransactionEvent.normalizeValue(inboundAdapter))
+ .outboundAdapter(TransactionEvent.normalizeValue(outboundAdapter)).responseTimeMs(responseTimeMs)
+ .logSequence(logSequence).success(success).errorType(errorType).build();
+
+ // 통계 수집
+ apiStatsCollector.recordEvent(event);
+
+ if (logger.isDebug()) {
+ logger.debug("API statistics recorded: " + apiName);
+ }
+
+ } catch (Exception e) {
+ logger.error("Failed to record API statistics", e);
+ }
+ }
+
+ /**
+ * API 명 추출
+ */
+ private String extractApiName(EAIMessage msg) {
+ String apiName = msg.getEAISvcCd();
+ return apiName != null ? apiName : "UNKNOWN";
+ }
+
+ /**
+ * Gateway 인스턴스 ID 추출
+ */
+ private String extractGwInstanceId(EAIMessage msg) {
+ String instanceId = msg.getEAISvrInstNm();
+ return instanceId != null ? instanceId : "UNKNOWN";
+ }
+
+ /**
+ * 업무구분코드 추출
+ */
+ private String extractBizDivCode(EAIMessage msg) {
+ return msg.getBwkCls();
+ }
+
+ /**
+ * 클라이언트 ID 추출
+ */
+ private String extractClientId(EAIMessage msg) {
+ return msg.getClientId();
+ }
+
+ /**
+ * Inbound Adapter 추출
+ */
+ private String extractInboundAdapter(EAIMessage msg) {
+ return msg.getSngSysItfTp();
+ }
+
+ /**
+ * Outbound Adapter 추출
+ */
+ private String extractOutboundAdapter(EAIMessage msg) {
+ if (msg.getCurrentSvcMsg() != null) {
+ // TODO 실제 값이 맞는 지 확인 필요
+ return msg.getCurrentSvcMsg().getPsvSysItfTp();
+ }
+ return null;
+ }
+
+ /**
+ * 응답시간 추출 (ms)
+ */
+ private long extractResponseTime(EAIMessage msg) {
+ long msgPssTm = msg.getMsgPssTm(); // 메시지 처리시각
+ long msgRcvTm = msg.getMsgRcvTm(); // 메시지 수신시각
+
+ if (msgPssTm == 0) {
+ msgPssTm = System.currentTimeMillis();
+ }
+
+ if (msgPssTm > 0 && msgRcvTm > 0) {
+ return msgPssTm - msgRcvTm;
+ }
+
+ return 0L;
+ }
+
+ /**
+ * 성공 여부 추출
+ */
+ private boolean extractSuccess(EAIMessage msg) {
+ // logPssSno가 900이면 에러로 처리
+ if (msg.getLogPssSno() == 900) {
+ return false;
+ }
+ return msg.getStatErrorCode() == 0;
+ }
+
+ /**
+ * 에러 유형 추출
+ */
+ private TransactionEvent.ErrorType extractErrorType(EAIMessage msg, boolean success) {
+ int errorCode = msg.getStatErrorCode();
+
+ switch (errorCode) {
+ case 0:
+ return success ? null : TransactionEvent.ErrorType.SYSTEM_ERROR;
+ case 1:
+ return TransactionEvent.ErrorType.BUSINESS_ERROR;
+ case 2:
+ return TransactionEvent.ErrorType.TIMEOUT;
+ case 3:
+ return TransactionEvent.ErrorType.SYSTEM_ERROR;
+ default:
+ return success ? null : TransactionEvent.ErrorType.SYSTEM_ERROR;
+ }
+ }
+}
diff --git a/src/main/java/com/eactive/eai/custom/statistics/README.md b/src/main/java/com/eactive/eai/custom/statistics/README.md
new file mode 100644
index 0000000..e5dd844
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/statistics/README.md
@@ -0,0 +1,387 @@
+# API Gateway 통계 수집 모듈
+
+분단위로 API 거래 통계를 수집하고 DB에 저장하는 모듈입니다.
+
+## 아키텍처
+
+```
+거래 발생
+ ↓
+TransactionEvent 생성
+ ↓
+ApiStatsCollector.recordEvent() ← 거래마다 호출
+ ↓
+MinuteStatsAggregator (메모리 집계)
+ ↓
+ApiStatsScheduler (매 분 5초 실행)
+ ↓
+DB 저장 (API_STATS_MINUTE 테이블)
+```
+
+## 패키지 구조
+
+```
+com.eactive.eai.custom.statistics/
+├── dto/
+│ ├── TransactionEvent.java - 거래 이벤트 DTO
+│ └── MinuteStatsKey.java - 집계 키 (시간 + 차원)
+├── collector/
+│ ├── MinuteStatsAggregator.java - HdrHistogram 기반 집계
+│ └── ApiStatsCollector.java - 메인 수집기 (ConcurrentHashMap)
+├── scheduler/
+│ └── ApiStatsScheduler.java - 스케줄러 (매 분 실행)
+├── ApiStatsMinuteRepository.java - JPA Repository
+└── ApiStatsMinuteLogger.java - DB 저장 Logger
+```
+
+## 사용법
+
+### 1. 거래 처리 시 통계 수집
+
+거래가 발생할 때마다 `ApiStatsCollector.recordEvent()` 호출:
+
+```java
+@Service
+public class ApiGatewayService {
+
+ @Autowired
+ private ApiStatsCollector statsCollector;
+
+ public void processTransaction(ApiRequest request) {
+ long startTime = System.currentTimeMillis();
+
+ try {
+ // 거래 처리
+ ApiResponse response = executeApi(request);
+
+ // 통계 수집 (성공)
+ recordStats(request, startTime, true, null);
+
+ return response;
+
+ } catch (TimeoutException e) {
+ // 통계 수집 (Timeout)
+ recordStats(request, startTime, false, ErrorType.TIMEOUT);
+ throw e;
+
+ } catch (SystemException e) {
+ // 통계 수집 (System Error)
+ recordStats(request, startTime, false, ErrorType.SYSTEM_ERROR);
+ throw e;
+
+ } catch (BusinessException e) {
+ // 통계 수집 (Business Error)
+ recordStats(request, startTime, false, ErrorType.BUSINESS_ERROR);
+ throw e;
+ }
+ }
+
+ private void recordStats(ApiRequest request, long startTime,
+ boolean success, ErrorType errorType) {
+ long responseTime = System.currentTimeMillis() - startTime;
+
+ TransactionEvent event = TransactionEvent.builder()
+ .apiName(request.getApiName())
+ .gwInstanceId(getInstanceId())
+ .bizDivCode(TransactionEvent.normalizeValue(request.getBizDivCode()))
+ .clientId(TransactionEvent.normalizeValue(request.getClientId()))
+ .inboundAdapter(TransactionEvent.normalizeValue(request.getInboundAdapter()))
+ .outboundAdapter(TransactionEvent.normalizeValue(request.getOutboundAdapter()))
+ .responseTimeMs(responseTime)
+ .success(success)
+ .errorType(errorType)
+ .build();
+
+ statsCollector.recordEvent(event);
+ }
+}
+```
+
+### 2. 스케줄러 자동 실행
+
+`ApiStatsScheduler`가 자동으로 매 분 5초에 실행되어 DB에 저장합니다.
+
+```
+매 분 5초 (예: 10:00:05, 10:01:05, ...)
+ ↓
+완료된 분의 통계를 flush (예: 10:00:00 분 데이터)
+ ↓
+DB 저장
+```
+
+### 3. 스케줄러 활성화
+
+Spring Boot 애플리케이션에 `@EnableScheduling` 추가:
+
+```java
+@SpringBootApplication
+@EnableScheduling // ← 스케줄러 활성화
+public class EapimOnlineApplication {
+ public static void main(String[] args) {
+ SpringApplication.run(EapimOnlineApplication.class, args);
+ }
+}
+```
+
+## 주요 클래스 설명
+
+### TransactionEvent
+
+거래 1건의 정보를 담는 DTO:
+- API명, Instance ID, 업무구분코드, Client ID
+- Inbound/Outbound Adapter
+- 응답시간, 성공 여부, 오류 유형
+
+### MinuteStatsAggregator
+
+분단위 집계를 수행:
+- **HdrHistogram**: P50, P95 백분위 계산
+- **AtomicLong**: 건수 카운터 (Thread-safe)
+- **snapshot()**: 집계 결과를 Entity로 변환
+
+### ApiStatsCollector
+
+메모리에서 통계 수집:
+- **ConcurrentHashMap**: 멀티스레드 안전
+- **computeIfAbsent()**: Lock-free 집계
+- **flushCompletedMinutes()**: 완료된 분의 데이터 반환
+
+### ApiStatsScheduler
+
+매 분마다 DB 저장:
+- **@Scheduled(cron = "5 * * * * ?")**: 매 분 5초 실행
+- **@PreDestroy**: 종료 시 남은 데이터 저장
+
+## 성능 특징
+
+### 메모리 효율
+
+- **HdrHistogram**: 수만 건을 2~4KB로 압축
+- **ConcurrentHashMap**: 차원별로 독립적인 집계
+- **분 단위 flush**: 메모리 누적 방지
+
+### Thread-safe
+
+- **ConcurrentHashMap**: Lock-free read
+- **AtomicLong**: Lock-free increment
+- **synchronized**: HdrHistogram 기록 시만 사용
+
+### 성능 영향 최소화
+
+- 거래당 오버헤드: < 1ms (메모리 연산만)
+- DB 저장: 비동기 (스케줄러)
+- Lock contention: 최소화
+
+## 설정
+
+### PropManager를 통한 동적 설정 (권장)
+
+운영 중에 변경 가능한 설정값을 PropManager로 관리합니다.
+
+#### 1. DB에 설정값 등록
+
+PropManager 그룹명: **`ApiStats`**
+
+| 키 | 설명 | 기본값 | 예시 |
+|---|---|---|---|
+| `enabled` | 통계 수집 활성화 여부 | true | true: 활성화, false: 비활성화 |
+| `histogram.min.ms` | 히스토그램 최소값 (ms) | 1 | 응답시간 최소 기록값 |
+| `histogram.max.ms` | 히스토그램 최대값 (ms) | 60000 | 60초 초과 시 클리핑 |
+| `histogram.precision` | 히스토그램 정밀도 (유효숫자) | 3 | 3자리 정밀도 |
+
+**DB 설정 예시:**
+```sql
+-- TSEAIRM24 테이블에 설정값 추가
+INSERT INTO TSEAIRM24 (GROUP_NAME, PROP_KEY, PROP_VALUE, DESCRIPTION)
+VALUES ('ApiStats', 'enabled', 'true', '통계 수집 활성화 여부');
+
+INSERT INTO TSEAIRM24 (GROUP_NAME, PROP_KEY, PROP_VALUE, DESCRIPTION)
+VALUES ('ApiStats', 'histogram.min.ms', '1', '히스토그램 최소값(ms)');
+
+INSERT INTO TSEAIRM24 (GROUP_NAME, PROP_KEY, PROP_VALUE, DESCRIPTION)
+VALUES ('ApiStats', 'histogram.max.ms', '60000', '히스토그램 최대값(ms)');
+
+INSERT INTO TSEAIRM24 (GROUP_NAME, PROP_KEY, PROP_VALUE, DESCRIPTION)
+VALUES ('ApiStats', 'histogram.precision', '3', '히스토그램 정밀도');
+```
+
+#### 2. 설정 변경 방법
+
+**통계 수집 OFF (긴급 상황 시)**
+```sql
+-- 통계 수집 비활성화
+UPDATE TSEAIRM24
+SET PROP_VALUE = 'false'
+WHERE GROUP_NAME = 'ApiStats' AND PROP_KEY = 'enabled';
+```
+
+```java
+// PropManager 리로드 (즉시 적용)
+PropManager.getInstance().reload("ApiStats");
+```
+
+**통계 수집 ON (다시 활성화)**
+```sql
+-- 통계 수집 재활성화
+UPDATE TSEAIRM24
+SET PROP_VALUE = 'true'
+WHERE GROUP_NAME = 'ApiStats' AND PROP_KEY = 'enabled';
+```
+
+```java
+// PropManager 리로드
+PropManager.getInstance().reload("ApiStats");
+```
+
+**히스토그램 범위 변경**
+```sql
+-- 최대값을 300초로 변경
+UPDATE TSEAIRM24
+SET PROP_VALUE = '300000'
+WHERE GROUP_NAME = 'ApiStats' AND PROP_KEY = 'histogram.max.ms';
+```
+
+```java
+// PropManager 리로드
+PropManager.getInstance().reload("ApiStats");
+```
+
+**방법 2: 관리 화면을 통한 수정**
+- EMS 관리 화면에서 PropManager 설정 수정
+- 저장 시 자동으로 메모리에 반영
+
+#### 3. 설정값 확인
+
+애플리케이션 시작 시 로그에서 확인:
+```
+ApiStatsScheduler initialized
+ApiStatsConfig] enabled = true
+ApiStatsConfig] histogram.min.ms = 1
+ApiStatsConfig] histogram.max.ms = 60000
+ApiStatsConfig] histogram.precision = 3
+```
+
+**비활성화 시 로그:**
+```
+ApiStatsConfig] enabled = false
+API stats collection is disabled, skipping save
+```
+
+### 스케줄러 주기 변경
+
+`ApiStatsScheduler.java`의 cron 표현식 수정:
+
+```java
+@Scheduled(cron = "5 * * * * ?") // 매 분 5초
+@Scheduled(cron = "0 * * * * ?") // 매 분 0초
+@Scheduled(cron = "0 */5 * * * ?") // 5분마다
+```
+
+**주의:** 스케줄러 주기는 코드 변경 후 재배포 필요
+
+## 모니터링
+
+### 활성 집계기 개수 확인
+
+```java
+int count = statsCollector.getActiveAggregatorCount();
+log.info("Active aggregators: {}", count);
+```
+
+### 로그 레벨 조정
+
+```properties
+# application.properties
+logging.level.com.eactive.eai.custom.statistics=DEBUG
+```
+
+## 주의사항
+
+1. **NULL 값 처리**: 차원 값이 NULL이면 "NONE"으로 변환 필수
+2. **응답시간 범위**: PropManager 설정값 범위 초과 시 클리핑됨 (기본: 1ms ~ 60초)
+3. **스케줄러 활성화**: `@EnableScheduling` 필수
+4. **DB 저장 실패**: 로그로 기록되며 다음 분에 재시도하지 않음
+5. **PropManager 설정**: `ApiStats` 그룹이 DB에 없으면 기본값 사용
+
+## 테스트
+
+### 단위 테스트 예제
+
+```java
+@Test
+public void testStatsCollection() {
+ ApiStatsCollector collector = new ApiStatsCollector();
+
+ // 거래 이벤트 생성
+ TransactionEvent event = TransactionEvent.builder()
+ .apiName("TEST_API")
+ .gwInstanceId("GW01")
+ .bizDivCode("NONE")
+ .clientId("CLIENT01")
+ .inboundAdapter("HTTP")
+ .outboundAdapter("REST")
+ .responseTimeMs(100)
+ .success(true)
+ .build();
+
+ // 이벤트 기록
+ LocalDateTime now = LocalDateTime.of(2026, 1, 8, 10, 0, 30);
+ collector.recordEvent(event, now);
+
+ // Flush (10시 1분 이전)
+ LocalDateTime flushTime = LocalDateTime.of(2026, 1, 8, 10, 1, 0);
+ List result = collector.flushBefore(flushTime);
+
+ // 검증
+ assertEquals(1, result.size());
+ ApiStatsMinute stats = result.get(0);
+ assertEquals("TEST_API", stats.getApiName());
+ assertEquals(1L, stats.getTotalCnt());
+ assertEquals(1L, stats.getSuccessCnt());
+}
+```
+
+## 문제 해결
+
+### 통계가 저장되지 않음
+
+1. `@EnableScheduling` 확인
+2. 로그에서 스케줄러 실행 확인
+3. DB 연결 및 권한 확인
+
+### 메모리 증가
+
+1. 활성 집계기 개수 확인
+2. 스케줄러 정상 동작 확인
+3. 차원 카디널리티 확인 (너무 많은 고유 키)
+
+### P50, P95 값이 이상함
+
+1. 응답시간 단위 확인 (ms)
+2. PropManager 설정값 확인 (`ApiStats` 그룹)
+3. 히스토그램 범위 확인 (기본: 1~60000ms)
+4. 데이터 건수 확인 (최소 1건 이상)
+
+### PropManager 설정이 적용되지 않음
+
+1. DB에 `ApiStats` 그룹 설정 확인
+2. PropManager 초기화 확인
+3. 로그에서 설정값 로딩 확인
+4. 설정 변경 후 `PropManager.reload("ApiStats")` 실행
+
+### 통계 수집을 비활성화하고 싶음
+
+**운영 중 성능 이슈 발생 시:**
+```sql
+-- DB에서 비활성화
+UPDATE TSEAIRM24 SET PROP_VALUE = 'false'
+WHERE GROUP_NAME = 'ApiStats' AND PROP_KEY = 'enabled';
+```
+
+```java
+// 즉시 적용
+PropManager.getInstance().reload("ApiStats");
+```
+
+이후 모든 `recordEvent()` 호출과 스케줄러 실행이 즉시 중단됩니다.
+메모리에 쌓인 데이터는 유지되며, 다시 활성화 시 계속 수집됩니다.
diff --git a/src/main/java/com/eactive/eai/custom/statistics/collector/ApiStatsCollector.java b/src/main/java/com/eactive/eai/custom/statistics/collector/ApiStatsCollector.java
new file mode 100644
index 0000000..4ef6080
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/statistics/collector/ApiStatsCollector.java
@@ -0,0 +1,268 @@
+package com.eactive.eai.custom.statistics.collector;
+
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.springframework.stereotype.Service;
+
+import com.eactive.eai.common.util.Logger;
+import com.eactive.eai.custom.statistics.config.ApiStatsConfig;
+import com.eactive.eai.custom.statistics.dto.HourStatsKey;
+import com.eactive.eai.custom.statistics.dto.MinuteStatsKey;
+import com.eactive.eai.custom.statistics.dto.TransactionEvent;
+import com.eactive.eai.data.entity.custom.statistics.ApiStatsHour;
+import com.eactive.eai.data.entity.custom.statistics.ApiStatsMinute;
+
+import lombok.RequiredArgsConstructor;
+
+/**
+ * API 통계 수집기
+ * - 거래 이벤트를 분/시간 단위로 메모리에 집계
+ * - Thread-safe한 ConcurrentHashMap 사용
+ */
+@Service
+@RequiredArgsConstructor
+public class ApiStatsCollector {
+
+ private static Logger log = Logger.getLogger(Logger.LOGGER_DEFAULT);
+
+ /** 최대 Aggregator 수 제한 (메모리 보호) */
+ private static final int MAX_MINUTE_AGGREGATORS = 10000;
+ private static final int MAX_HOUR_AGGREGATORS = 5000;
+
+ /**
+ * 분단위 집계 맵
+ * Key: MinuteStatsKey (시간 + 차원들)
+ * Value: MinuteStatsAggregator (집계 데이터)
+ */
+ private final ConcurrentHashMap minuteAggregators = new ConcurrentHashMap<>();
+
+ /**
+ * 시간별 집계 맵
+ * Key: HourStatsKey (시간 + 차원들)
+ * Value: HourStatsAggregator (집계 데이터)
+ */
+ private final ConcurrentHashMap hourAggregators = new ConcurrentHashMap<>();
+
+ private final ApiStatsConfig apiStatsConfig;
+
+ /**
+ * 거래 이벤트 기록
+ *
+ * @param event 거래 이벤트
+ */
+ public void recordEvent(TransactionEvent event) {
+ recordEvent(event, LocalDateTime.now());
+ }
+
+ /**
+ * 거래 이벤트 기록 (시간 지정)
+ *
+ * @param event 거래 이벤트
+ * @param eventTime 이벤트 발생 시간
+ */
+ public void recordEvent(TransactionEvent event, LocalDateTime eventTime) {
+ boolean minuteEnabled = apiStatsConfig.isMinuteEnabled();
+ boolean hourEnabled = apiStatsConfig.isHourEnabled();
+
+ if (!minuteEnabled && !hourEnabled) {
+ log.debug("API stats collection is disabled (both minute and hour)");
+ return;
+ }
+
+ if (minuteEnabled) {
+ recordMinuteEvent(event, eventTime);
+ }
+
+ if (hourEnabled) {
+ recordHourEvent(event, eventTime);
+ }
+ }
+
+ private void recordMinuteEvent(TransactionEvent event, LocalDateTime eventTime) {
+ try {
+ if (minuteAggregators.size() >= MAX_MINUTE_AGGREGATORS) {
+ log.warn("Minute aggregator limit reached ({}), forcing flush of completed minutes", MAX_MINUTE_AGGREGATORS);
+ flushCompletedMinutes();
+
+ if (minuteAggregators.size() >= MAX_MINUTE_AGGREGATORS) {
+ log.error("Minute aggregator count still exceeds limit after flush: {}", minuteAggregators.size());
+ }
+ }
+
+ MinuteStatsKey minuteKey = MinuteStatsKey.from(event, eventTime);
+ MinuteStatsAggregator minuteAggregator = minuteAggregators.computeIfAbsent(
+ minuteKey,
+ MinuteStatsAggregator::new
+ );
+ minuteAggregator.recordEvent(event);
+
+ log.debug("Recorded minute event: key={}, total={}", minuteKey, minuteAggregator.getTotalCount());
+ } catch (Exception e) {
+ log.error("Failed to record minute event: {}", event, e);
+ }
+ }
+
+ private void recordHourEvent(TransactionEvent event, LocalDateTime eventTime) {
+ try {
+ if (hourAggregators.size() >= MAX_HOUR_AGGREGATORS) {
+ log.warn("Hour aggregator limit reached ({}), forcing flush of completed hours", MAX_HOUR_AGGREGATORS);
+ flushCompletedHours();
+
+ if (hourAggregators.size() >= MAX_HOUR_AGGREGATORS) {
+ log.error("Hour aggregator count still exceeds limit after flush: {}", hourAggregators.size());
+ }
+ }
+
+ HourStatsKey hourKey = HourStatsKey.from(event, eventTime);
+ HourStatsAggregator hourAggregator = hourAggregators.computeIfAbsent(
+ hourKey,
+ HourStatsAggregator::new
+ );
+ hourAggregator.recordEvent(event);
+
+ log.debug("Recorded hour event: key={}, total={}", hourKey, hourAggregator.getTotalCount());
+ } catch (Exception e) {
+ log.error("Failed to record hour event: {}", event, e);
+ }
+ }
+
+ /**
+ * 지정된 시간 이전의 분단위 집계 데이터를 flush하여 반환
+ * - 반환된 데이터는 메모리에서 제거됨
+ *
+ * @param beforeTime 이 시간 이전의 데이터를 flush (exclusive)
+ * @return 집계된 통계 리스트
+ */
+ public List flushMinuteBefore(LocalDateTime beforeTime) {
+ LocalDateTime cutoffTime = beforeTime.truncatedTo(ChronoUnit.MINUTES);
+ List result = new ArrayList<>();
+
+ // 대상 키 수집 및 스냅샷 생성
+ List keysToRemove = new ArrayList<>();
+
+ minuteAggregators.forEach((key, aggregator) -> {
+ if (key.getStatTime().isBefore(cutoffTime)) {
+ // 스냅샷 생성
+ ApiStatsMinute snapshot = aggregator.snapshot();
+ result.add(snapshot);
+ keysToRemove.add(key);
+ }
+ });
+
+ // 메모리에서 제거
+ keysToRemove.forEach(minuteAggregators::remove);
+
+ log.info("Flushed {} minute stats records before {}, remaining: {}",
+ result.size(), cutoffTime, minuteAggregators.size());
+
+ return result;
+ }
+
+ /**
+ * 지정된 시간 이전의 시간별 집계 데이터를 flush하여 반환
+ * - 반환된 데이터는 메모리에서 제거됨
+ *
+ * @param beforeTime 이 시간 이전의 데이터를 flush (exclusive)
+ * @return 집계된 통계 리스트
+ */
+ public List flushHourBefore(LocalDateTime beforeTime) {
+ LocalDateTime cutoffTime = beforeTime.truncatedTo(ChronoUnit.HOURS);
+ List result = new ArrayList<>();
+
+ // 대상 키 수집 및 스냅샷 생성
+ List keysToRemove = new ArrayList<>();
+
+ hourAggregators.forEach((key, aggregator) -> {
+ if (key.getStatTime().isBefore(cutoffTime)) {
+ // 스냅샷 생성
+ ApiStatsHour snapshot = aggregator.snapshot();
+ result.add(snapshot);
+ keysToRemove.add(key);
+ }
+ });
+
+ // 메모리에서 제거
+ keysToRemove.forEach(hourAggregators::remove);
+
+ log.info("Flushed {} hour stats records before {}, remaining: {}",
+ result.size(), cutoffTime, hourAggregators.size());
+
+ return result;
+ }
+
+ /**
+ * 완료된 분단위 집계 데이터를 flush
+ * - 현재 분 이전의 모든 데이터를 반환하고 제거
+ */
+ public List flushCompletedMinutes() {
+ // 현재 분은 아직 진행 중이므로 제외
+ LocalDateTime now = LocalDateTime.now();
+ LocalDateTime currentMinute = now.truncatedTo(ChronoUnit.MINUTES);
+
+ return flushMinuteBefore(currentMinute);
+ }
+
+ /**
+ * 완료된 시간별 집계 데이터를 flush
+ * - 현재 시간 이전의 모든 데이터를 반환하고 제거
+ */
+ public List flushCompletedHours() {
+ // 현재 시간은 아직 진행 중이므로 제외
+ LocalDateTime now = LocalDateTime.now();
+ LocalDateTime currentHour = now.truncatedTo(ChronoUnit.HOURS);
+
+ return flushHourBefore(currentHour);
+ }
+
+ /**
+ * 모든 분단위 집계 데이터를 강제로 flush (종료 시 사용)
+ */
+ public List flushAllMinutes() {
+ List result = new ArrayList<>();
+
+ minuteAggregators.forEach((key, aggregator) -> {
+ result.add(aggregator.snapshot());
+ });
+
+ minuteAggregators.clear();
+
+ log.info("Flushed all {} minute stats records", result.size());
+
+ return result;
+ }
+
+ /**
+ * 모든 시간별 집계 데이터를 강제로 flush (종료 시 사용)
+ */
+ public List flushAllHours() {
+ List result = new ArrayList<>();
+
+ hourAggregators.forEach((key, aggregator) -> {
+ result.add(aggregator.snapshot());
+ });
+
+ hourAggregators.clear();
+
+ log.info("Flushed all {} hour stats records", result.size());
+
+ return result;
+ }
+
+ /**
+ * 현재 집계 중인 분단위 키 개수 반환 (모니터링용)
+ */
+ public int getActiveMinuteAggregatorCount() {
+ return minuteAggregators.size();
+ }
+
+ /**
+ * 현재 집계 중인 시간별 키 개수 반환 (모니터링용)
+ */
+ public int getActiveHourAggregatorCount() {
+ return hourAggregators.size();
+ }
+}
diff --git a/src/main/java/com/eactive/eai/custom/statistics/collector/HourStatsAggregator.java b/src/main/java/com/eactive/eai/custom/statistics/collector/HourStatsAggregator.java
new file mode 100644
index 0000000..46db817
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/statistics/collector/HourStatsAggregator.java
@@ -0,0 +1,250 @@
+package com.eactive.eai.custom.statistics.collector;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.concurrent.atomic.AtomicLong;
+
+import com.eactive.eai.custom.statistics.dto.HourStatsKey;
+import com.eactive.eai.custom.statistics.dto.TransactionEvent;
+import com.eactive.eai.data.entity.custom.statistics.ApiStatsHour;
+
+import lombok.Getter;
+
+/**
+ * 시간별 통계 집계기
+ * - Bucket 방식으로 응답시간 백분위 계산 (메모리 최적화)
+ * - Thread-safe한 집계 처리
+ */
+public class HourStatsAggregator {
+
+ @Getter
+ private final HourStatsKey key;
+
+ // 건수 메트릭
+ private final AtomicLong totalCnt = new AtomicLong(0);
+ private final AtomicLong successCnt = new AtomicLong(0);
+ private final AtomicLong timeoutCnt = new AtomicLong(0);
+ private final AtomicLong systemErrCnt = new AtomicLong(0);
+ private final AtomicLong bizErrCnt = new AtomicLong(0);
+
+ // 로그 시퀀스 900 구간 에러 카운트
+ private final AtomicLong seq900TimeoutCnt = new AtomicLong(0);
+ private final AtomicLong seq900SystemErrCnt = new AtomicLong(0);
+ private final AtomicLong seq900BizErrCnt = new AtomicLong(0);
+
+ // 응답시간 Bucket (10개 구간으로 분류)
+ private final AtomicLong[] respTimeBuckets = new AtomicLong[10];
+
+ // Bucket 경계값 (ms)
+ private static final long[] BUCKET_BOUNDARIES = {
+ 20, 50, 70, 100, // 빠른 구간 (0-100ms)
+ 200, 300, 500, // 일반 구간 (100-500ms) - P95 주로 여기
+ 1000, 5000, 60000 // 느린 구간 (500ms-60s)
+ };
+
+ // 응답시간 통계용
+ private final AtomicLong totalRespTime = new AtomicLong(0); // 평균 계산용
+ private final AtomicLong minRespTime = new AtomicLong(Long.MAX_VALUE);
+ private final AtomicLong maxRespTime = new AtomicLong(Long.MIN_VALUE);
+
+ public HourStatsAggregator(HourStatsKey key) {
+ this.key = key;
+ // Bucket 초기화
+ for (int i = 0; i < respTimeBuckets.length; i++) {
+ respTimeBuckets[i] = new AtomicLong(0);
+ }
+ }
+
+ /**
+ * 거래 이벤트 기록
+ */
+ public void recordEvent(TransactionEvent event) {
+ int logSeq = event.getLogSequence();
+
+ // 로그 시퀀스 100: 총 건수만 증가 (첫 호출)
+ if (logSeq == 100) {
+ totalCnt.incrementAndGet();
+ }
+ // 로그 시퀀스 400: 응답시간 및 에러 타입 기록
+ else if (logSeq == 400) {
+ // 성공 여부 카운트
+ if (event.isSuccess()) {
+ successCnt.incrementAndGet();
+ } else {
+ // 에러 유형별 카운트
+ switch (event.getErrorType()) {
+ case TIMEOUT:
+ timeoutCnt.incrementAndGet();
+ break;
+ case SYSTEM_ERROR:
+ systemErrCnt.incrementAndGet();
+ break;
+ case BUSINESS_ERROR:
+ bizErrCnt.incrementAndGet();
+ break;
+ }
+ }
+
+ // 응답시간 기록 (400 구간만)
+ long respTime = event.getResponseTimeMs();
+ totalRespTime.addAndGet(respTime);
+
+ // Bucket에 기록
+ int bucketIndex = findBucketIndex(respTime);
+ respTimeBuckets[bucketIndex].incrementAndGet();
+
+ // Min/Max 업데이트
+ updateMinMax(respTime);
+ }
+ // 로그 시퀀스 900: 900 전용 에러 카운트만 집계
+ else if (logSeq == 900 && !event.isSuccess()) {
+ switch (event.getErrorType()) {
+ case TIMEOUT:
+ seq900TimeoutCnt.incrementAndGet();
+ break;
+ case SYSTEM_ERROR:
+ seq900SystemErrCnt.incrementAndGet();
+ break;
+ case BUSINESS_ERROR:
+ seq900BizErrCnt.incrementAndGet();
+ break;
+ }
+ }
+ // 그 외 로그 시퀀스는 무시
+ }
+
+ /**
+ * Min/Max 응답시간 업데이트 (thread-safe, lock-free)
+ */
+ private void updateMinMax(long respTime) {
+ // Min 업데이트 (compare-and-swap)
+ long currentMin;
+ while ((currentMin = minRespTime.get()) > respTime) {
+ if (minRespTime.compareAndSet(currentMin, respTime)) {
+ break;
+ }
+ }
+
+ // Max 업데이트 (compare-and-swap)
+ long currentMax;
+ while ((currentMax = maxRespTime.get()) < respTime) {
+ if (maxRespTime.compareAndSet(currentMax, respTime)) {
+ break;
+ }
+ }
+ }
+
+ /**
+ * 응답시간에 해당하는 Bucket 인덱스 찾기
+ */
+ private int findBucketIndex(long respTime) {
+ for (int i = 0; i < BUCKET_BOUNDARIES.length; i++) {
+ if (respTime <= BUCKET_BOUNDARIES[i]) {
+ return i;
+ }
+ }
+ return BUCKET_BOUNDARIES.length - 1; // 마지막 경계값 초과 시 마지막 bucket
+ }
+
+ /**
+ * Bucket 기반 백분위 계산
+ * @param percentile 백분위 (50.0 for P50, 95.0 for P95)
+ * @return 백분위 응답시간 (ms)
+ */
+ private long calculatePercentile(double percentile) {
+ long avgCount = getAvgCount();
+ if (avgCount == 0) {
+ return 0;
+ }
+
+ long targetCount = (long) Math.ceil(avgCount * percentile / 100.0);
+ long accumulated = 0;
+
+ for (int i = 0; i < respTimeBuckets.length; i++) {
+ accumulated += respTimeBuckets[i].get();
+ if (accumulated >= targetCount) {
+ // 해당 bucket의 상한값 반환
+ return BUCKET_BOUNDARIES[i];
+ }
+ }
+
+ // 모든 bucket을 넘어간 경우
+ return BUCKET_BOUNDARIES[BUCKET_BOUNDARIES.length - 1];
+ }
+
+ /**
+ * 현재 집계 결과를 Entity로 변환
+ */
+ public ApiStatsHour snapshot() {
+ ApiStatsHour stats = new ApiStatsHour();
+
+ // 키 정보
+ stats.setStatTime(key.getStatTime());
+ stats.setApiName(key.getApiName());
+ stats.setGwInstanceId(key.getGwInstanceId());
+ stats.setBizDivCode(key.getBizDivCode());
+ stats.setClientId(key.getClientId());
+ stats.setInboundAdapter(key.getInboundAdapter());
+ stats.setOutboundAdapter(key.getOutboundAdapter());
+
+ // 건수 메트릭
+ long total = totalCnt.get();
+ long success = successCnt.get();
+ long timeout = timeoutCnt.get();
+ long systemErr = systemErrCnt.get();
+ long bizErr = bizErrCnt.get();
+ long avgCount = getAvgCount();
+
+ stats.setTotalCnt(total);
+ stats.setSuccessCnt(success);
+ stats.setTimeoutCnt(timeout);
+ stats.setSystemErrCnt(systemErr);
+ stats.setBizErrCnt(bizErr);
+
+ // 로그 시퀀스 900 구간 에러 카운트
+ stats.setSeq900TimeoutCnt(seq900TimeoutCnt.get());
+ stats.setSeq900SystemErrCnt(seq900SystemErrCnt.get());
+ stats.setSeq900BizErrCnt(seq900BizErrCnt.get());
+
+ // 응답시간 메트릭
+ if (avgCount > 0 && totalRespTime.get() > 0) {
+ // 응답시간이 실제로 기록된 경우만 처리
+ double avg = (double) totalRespTime.get() / avgCount;
+ stats.setAvgRespTime(BigDecimal.valueOf(avg).setScale(3, RoundingMode.HALF_UP));
+
+ // Min/Max (totalRespTime > 0이면 반드시 갱신됨)
+ stats.setMinRespTime(BigDecimal.valueOf(minRespTime.get()).setScale(3, RoundingMode.HALF_UP));
+ stats.setMaxRespTime(BigDecimal.valueOf(maxRespTime.get()).setScale(3, RoundingMode.HALF_UP));
+
+ // 백분위 (Bucket 기반 계산)
+ long p50 = calculatePercentile(50.0);
+ long p95 = calculatePercentile(95.0);
+ stats.setP50RespTime(BigDecimal.valueOf(p50).setScale(3, RoundingMode.HALF_UP));
+ stats.setP95RespTime(BigDecimal.valueOf(p95).setScale(3, RoundingMode.HALF_UP));
+ } else {
+ // 응답시간이 기록되지 않음 (logSeq 400 없음)
+ stats.setAvgRespTime(BigDecimal.ZERO);
+ stats.setMinRespTime(BigDecimal.ZERO);
+ stats.setMaxRespTime(BigDecimal.ZERO);
+ stats.setP50RespTime(BigDecimal.ZERO);
+ stats.setP95RespTime(BigDecimal.ZERO);
+ }
+
+ return stats;
+ }
+
+ private long getAvgCount() {
+ long success = successCnt.get();
+ long timeout = timeoutCnt.get();
+ long systemErr = systemErrCnt.get();
+ long bizErr = bizErrCnt.get();
+ return success + timeout + systemErr + bizErr;
+ }
+
+ /**
+ * 집계된 총 건수 반환 (빈 집계기 체크용)
+ */
+ public long getTotalCount() {
+ return totalCnt.get();
+ }
+}
diff --git a/src/main/java/com/eactive/eai/custom/statistics/collector/MinuteStatsAggregator.java b/src/main/java/com/eactive/eai/custom/statistics/collector/MinuteStatsAggregator.java
new file mode 100644
index 0000000..d5c59b5
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/statistics/collector/MinuteStatsAggregator.java
@@ -0,0 +1,250 @@
+package com.eactive.eai.custom.statistics.collector;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.concurrent.atomic.AtomicLong;
+
+import com.eactive.eai.custom.statistics.dto.MinuteStatsKey;
+import com.eactive.eai.custom.statistics.dto.TransactionEvent;
+import com.eactive.eai.data.entity.custom.statistics.ApiStatsMinute;
+
+import lombok.Getter;
+
+/**
+ * 분단위 통계 집계기
+ * - Bucket 방식으로 응답시간 백분위 계산 (메모리 최적화)
+ * - Thread-safe한 집계 처리
+ */
+public class MinuteStatsAggregator {
+
+ @Getter
+ private final MinuteStatsKey key;
+
+ // 건수 메트릭
+ private final AtomicLong totalCnt = new AtomicLong(0);
+ private final AtomicLong successCnt = new AtomicLong(0);
+ private final AtomicLong timeoutCnt = new AtomicLong(0);
+ private final AtomicLong systemErrCnt = new AtomicLong(0);
+ private final AtomicLong bizErrCnt = new AtomicLong(0);
+
+ // 로그 시퀀스 900 구간 에러 카운트
+ private final AtomicLong seq900TimeoutCnt = new AtomicLong(0);
+ private final AtomicLong seq900SystemErrCnt = new AtomicLong(0);
+ private final AtomicLong seq900BizErrCnt = new AtomicLong(0);
+
+ // 응답시간 Bucket (10개 구간으로 분류)
+ private final AtomicLong[] respTimeBuckets = new AtomicLong[10];
+
+ // Bucket 경계값 (ms)
+ private static final long[] BUCKET_BOUNDARIES = {
+ 20, 50, 70, 100, // 빠른 구간 (0-100ms)
+ 200, 300, 500, // 일반 구간 (100-500ms) - P95 주로 여기
+ 1000, 5000, 60000 // 느린 구간 (500ms-60s)
+ };
+
+ // 응답시간 통계용
+ private final AtomicLong totalRespTime = new AtomicLong(0); // 평균 계산용
+ private final AtomicLong minRespTime = new AtomicLong(Long.MAX_VALUE);
+ private final AtomicLong maxRespTime = new AtomicLong(Long.MIN_VALUE);
+
+ public MinuteStatsAggregator(MinuteStatsKey key) {
+ this.key = key;
+ // Bucket 초기화
+ for (int i = 0; i < respTimeBuckets.length; i++) {
+ respTimeBuckets[i] = new AtomicLong(0);
+ }
+ }
+
+ /**
+ * 거래 이벤트 기록
+ */
+ public void recordEvent(TransactionEvent event) {
+ int logSeq = event.getLogSequence();
+
+ // 로그 시퀀스 100: 총 건수만 증가 (첫 호출)
+ if (logSeq == 100) {
+ totalCnt.incrementAndGet();
+ }
+ // 로그 시퀀스 400: 응답시간 및 에러 타입 기록
+ else if (logSeq == 400) {
+ // 성공 여부 카운트
+ if (event.isSuccess()) {
+ successCnt.incrementAndGet();
+ } else {
+ // 에러 유형별 카운트
+ switch (event.getErrorType()) {
+ case TIMEOUT:
+ timeoutCnt.incrementAndGet();
+ break;
+ case SYSTEM_ERROR:
+ systemErrCnt.incrementAndGet();
+ break;
+ case BUSINESS_ERROR:
+ bizErrCnt.incrementAndGet();
+ break;
+ }
+ }
+
+ // 응답시간 기록 (400 구간만)
+ long respTime = event.getResponseTimeMs();
+ totalRespTime.addAndGet(respTime);
+
+ // Bucket에 기록
+ int bucketIndex = findBucketIndex(respTime);
+ respTimeBuckets[bucketIndex].incrementAndGet();
+
+ // Min/Max 업데이트
+ updateMinMax(respTime);
+ }
+ // 로그 시퀀스 900: 900 전용 에러 카운트만 집계
+ else if (logSeq == 900 && !event.isSuccess()) {
+ switch (event.getErrorType()) {
+ case TIMEOUT:
+ seq900TimeoutCnt.incrementAndGet();
+ break;
+ case SYSTEM_ERROR:
+ seq900SystemErrCnt.incrementAndGet();
+ break;
+ case BUSINESS_ERROR:
+ seq900BizErrCnt.incrementAndGet();
+ break;
+ }
+ }
+ // 그 외 로그 시퀀스는 무시
+ }
+
+ /**
+ * Min/Max 응답시간 업데이트 (thread-safe, lock-free)
+ */
+ private void updateMinMax(long respTime) {
+ // Min 업데이트 (compare-and-swap)
+ long currentMin;
+ while ((currentMin = minRespTime.get()) > respTime) {
+ if (minRespTime.compareAndSet(currentMin, respTime)) {
+ break;
+ }
+ }
+
+ // Max 업데이트 (compare-and-swap)
+ long currentMax;
+ while ((currentMax = maxRespTime.get()) < respTime) {
+ if (maxRespTime.compareAndSet(currentMax, respTime)) {
+ break;
+ }
+ }
+ }
+
+ /**
+ * 응답시간에 해당하는 Bucket 인덱스 찾기
+ */
+ private int findBucketIndex(long respTime) {
+ for (int i = 0; i < BUCKET_BOUNDARIES.length; i++) {
+ if (respTime <= BUCKET_BOUNDARIES[i]) {
+ return i;
+ }
+ }
+ return BUCKET_BOUNDARIES.length - 1; // 마지막 경계값 초과 시 마지막 bucket
+ }
+
+ /**
+ * Bucket 기반 백분위 계산
+ * @param percentile 백분위 (50.0 for P50, 95.0 for P95)
+ * @return 백분위 응답시간 (ms)
+ */
+ private long calculatePercentile(double percentile) {
+ long avgCount = getAvgCount();
+ if (avgCount == 0) {
+ return 0;
+ }
+
+ long targetCount = (long) Math.ceil(avgCount * percentile / 100.0);
+ long accumulated = 0;
+
+ for (int i = 0; i < respTimeBuckets.length; i++) {
+ accumulated += respTimeBuckets[i].get();
+ if (accumulated >= targetCount) {
+ // 해당 bucket의 상한값 반환
+ return BUCKET_BOUNDARIES[i];
+ }
+ }
+
+ // 모든 bucket을 넘어간 경우
+ return BUCKET_BOUNDARIES[BUCKET_BOUNDARIES.length - 1];
+ }
+
+ /**
+ * 현재 집계 결과를 Entity로 변환
+ */
+ public ApiStatsMinute snapshot() {
+ ApiStatsMinute stats = new ApiStatsMinute();
+
+ // 키 정보
+ stats.setStatTime(key.getStatTime());
+ stats.setApiName(key.getApiName());
+ stats.setGwInstanceId(key.getGwInstanceId());
+ stats.setBizDivCode(key.getBizDivCode());
+ stats.setClientId(key.getClientId());
+ stats.setInboundAdapter(key.getInboundAdapter());
+ stats.setOutboundAdapter(key.getOutboundAdapter());
+
+ // 건수 메트릭
+ long total = totalCnt.get();
+ long success = successCnt.get();
+ long timeout = timeoutCnt.get();
+ long systemErr = systemErrCnt.get();
+ long bizErr = bizErrCnt.get();
+ long avgCount = success + timeout + systemErr + bizErr;
+
+ stats.setTotalCnt(total);
+ stats.setSuccessCnt(success);
+ stats.setTimeoutCnt(timeout);
+ stats.setSystemErrCnt(systemErr);
+ stats.setBizErrCnt(bizErr);
+
+ // 로그 시퀀스 900 구간 에러 카운트
+ stats.setSeq900TimeoutCnt(seq900TimeoutCnt.get());
+ stats.setSeq900SystemErrCnt(seq900SystemErrCnt.get());
+ stats.setSeq900BizErrCnt(seq900BizErrCnt.get());
+
+ // 응답시간 메트릭
+ if (avgCount > 0 && totalRespTime.get() > 0) {
+ // 응답시간이 실제로 기록된 경우만 처리
+ double avg = (double) totalRespTime.get() / avgCount;
+ stats.setAvgRespTime(BigDecimal.valueOf(avg).setScale(3, RoundingMode.HALF_UP));
+
+ // Min/Max (totalRespTime > 0이면 반드시 갱신됨)
+ stats.setMinRespTime(BigDecimal.valueOf(minRespTime.get()).setScale(3, RoundingMode.HALF_UP));
+ stats.setMaxRespTime(BigDecimal.valueOf(maxRespTime.get()).setScale(3, RoundingMode.HALF_UP));
+
+ // 백분위 (Bucket 기반 계산)
+ long p50 = calculatePercentile(50.0);
+ long p95 = calculatePercentile(95.0);
+ stats.setP50RespTime(BigDecimal.valueOf(p50).setScale(3, RoundingMode.HALF_UP));
+ stats.setP95RespTime(BigDecimal.valueOf(p95).setScale(3, RoundingMode.HALF_UP));
+ } else {
+ // 응답시간이 기록되지 않음 (logSeq 400 없음)
+ stats.setAvgRespTime(BigDecimal.ZERO);
+ stats.setMinRespTime(BigDecimal.ZERO);
+ stats.setMaxRespTime(BigDecimal.ZERO);
+ stats.setP50RespTime(BigDecimal.ZERO);
+ stats.setP95RespTime(BigDecimal.ZERO);
+ }
+
+ return stats;
+ }
+
+ /**
+ * 집계된 총 건수 반환 (빈 집계기 체크용)
+ */
+ public long getTotalCount() {
+ return totalCnt.get();
+ }
+
+ private long getAvgCount() {
+ long success = successCnt.get();
+ long timeout = timeoutCnt.get();
+ long systemErr = systemErrCnt.get();
+ long bizErr = bizErrCnt.get();
+ return success + timeout + systemErr + bizErr;
+ }
+}
diff --git a/src/main/java/com/eactive/eai/custom/statistics/config/ApiStatsConfig.java b/src/main/java/com/eactive/eai/custom/statistics/config/ApiStatsConfig.java
new file mode 100644
index 0000000..2da8b65
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/statistics/config/ApiStatsConfig.java
@@ -0,0 +1,85 @@
+package com.eactive.eai.custom.statistics.config;
+
+import org.springframework.stereotype.Component;
+
+import com.eactive.eai.common.property.PropManager;
+import com.eactive.eai.common.util.Logger;
+
+import lombok.RequiredArgsConstructor;
+
+/**
+ * API 통계 설정 관리 - PropManager를 통해 운영 중 동적 변경 가능한 설정값 관리
+ */
+@Component
+@RequiredArgsConstructor
+public class ApiStatsConfig {
+
+ private static final Logger logger = Logger.getLogger(Logger.LOGGER_DEFAULT);
+
+ /** PropManager 그룹명 */
+ private static final String GROUP_NAME = "ApiStats";
+
+ /** 기본값 상수 */
+ private static final boolean DEFAULT_ENABLED = true;
+ private static final boolean DEFAULT_MINUTE_ENABLED = true;
+ private static final boolean DEFAULT_HOUR_ENABLED = true;
+
+ private final PropManager propManager;
+
+ /**
+ * 통계 수집 활성화 여부 (전체 ON/OFF) - true: 통계 수집 활성화 (기본값) - false: 통계 수집 비활성화
+ */
+ public boolean isEnabled() {
+ try {
+ String value = propManager.getProperty(GROUP_NAME, "enabled", String.valueOf(DEFAULT_ENABLED));
+ return Boolean.parseBoolean(value);
+ } catch (Exception e) {
+ logger.debug("Failed to get enabled from PropManager, using default: " + DEFAULT_ENABLED);
+ return DEFAULT_ENABLED;
+ }
+ }
+
+ /**
+ * 분단위 통계 수집 활성화 여부 - true: 분단위 통계 수집 활성화 (기본값) - false: 분단위 통계 수집 비활성화 - 전체
+ * enabled가 false이면 이 설정과 무관하게 비활성화됨
+ */
+ public boolean isMinuteEnabled() {
+ if (!isEnabled()) {
+ return false;
+ }
+ try {
+ String value = propManager.getProperty(GROUP_NAME, "minute.enabled",
+ String.valueOf(DEFAULT_MINUTE_ENABLED));
+ return Boolean.parseBoolean(value);
+ } catch (Exception e) {
+ logger.debug("Failed to get minute.enabled from PropManager, using default: " + DEFAULT_MINUTE_ENABLED);
+ return DEFAULT_MINUTE_ENABLED;
+ }
+ }
+
+ /**
+ * 시간별 통계 수집 활성화 여부 - true: 시간별 통계 수집 활성화 (기본값) - false: 시간별 통계 수집 비활성화 - 전체
+ * enabled가 false이면 이 설정과 무관하게 비활성화됨
+ */
+ public boolean isHourEnabled() {
+ if (!isEnabled()) {
+ return false;
+ }
+ try {
+ String value = propManager.getProperty(GROUP_NAME, "hour.enabled", String.valueOf(DEFAULT_HOUR_ENABLED));
+ return Boolean.parseBoolean(value);
+ } catch (Exception e) {
+ logger.debug("Failed to get hour.enabled from PropManager, using default: " + DEFAULT_HOUR_ENABLED);
+ return DEFAULT_HOUR_ENABLED;
+ }
+ }
+
+ /**
+ * 설정값 로깅 (초기화 시)
+ */
+ public void logCurrentConfig() {
+ logger.info("ApiStatsConfig] enabled = " + isEnabled());
+ logger.info("ApiStatsConfig] minute.enabled = " + isMinuteEnabled());
+ logger.info("ApiStatsConfig] hour.enabled = " + isHourEnabled());
+ }
+}
diff --git a/src/main/java/com/eactive/eai/custom/statistics/dto/HourStatsKey.java b/src/main/java/com/eactive/eai/custom/statistics/dto/HourStatsKey.java
new file mode 100644
index 0000000..5097ddb
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/statistics/dto/HourStatsKey.java
@@ -0,0 +1,90 @@
+package com.eactive.eai.custom.statistics.dto;
+
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.Objects;
+
+import lombok.Getter;
+
+/**
+ * 시간별 통계 집계 키
+ * - 동일 시간의 동일 차원별로 집계하기 위한 키
+ */
+@Getter
+public class HourStatsKey {
+
+ /** 통계 시간 (시간 단위, 분/초는 00) */
+ private final LocalDateTime statTime;
+
+ /** API명 */
+ private final String apiName;
+
+ /** API Gateway 인스턴스 ID */
+ private final String gwInstanceId;
+
+ /** 업무구분코드 */
+ private final String bizDivCode;
+
+ /** 클라이언트 ID */
+ private final String clientId;
+
+ /** Inbound Adapter */
+ private final String inboundAdapter;
+
+ /** Outbound Adapter */
+ private final String outboundAdapter;
+
+ public HourStatsKey(LocalDateTime statTime, String apiName, String gwInstanceId,
+ String bizDivCode, String clientId, String inboundAdapter, String outboundAdapter) {
+ // 분, 초, 나노초를 0으로 절사하여 시간 단위로 정규화
+ this.statTime = statTime.truncatedTo(ChronoUnit.HOURS);
+ this.apiName = apiName;
+ this.gwInstanceId = gwInstanceId;
+ this.bizDivCode = bizDivCode;
+ this.clientId = clientId;
+ this.inboundAdapter = inboundAdapter;
+ this.outboundAdapter = outboundAdapter;
+ }
+
+ /**
+ * TransactionEvent로부터 키 생성
+ */
+ public static HourStatsKey from(TransactionEvent event, LocalDateTime eventTime) {
+ return new HourStatsKey(
+ eventTime,
+ event.getApiName(),
+ event.getGwInstanceId(),
+ event.getBizDivCode(),
+ event.getClientId(),
+ event.getInboundAdapter(),
+ event.getOutboundAdapter()
+ );
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ HourStatsKey that = (HourStatsKey) o;
+ return Objects.equals(statTime, that.statTime) &&
+ Objects.equals(apiName, that.apiName) &&
+ Objects.equals(gwInstanceId, that.gwInstanceId) &&
+ Objects.equals(bizDivCode, that.bizDivCode) &&
+ Objects.equals(clientId, that.clientId) &&
+ Objects.equals(inboundAdapter, that.inboundAdapter) &&
+ Objects.equals(outboundAdapter, that.outboundAdapter);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(statTime, apiName, gwInstanceId, bizDivCode,
+ clientId, inboundAdapter, outboundAdapter);
+ }
+
+ @Override
+ public String toString() {
+ return String.format("%s|%s|%s|%s|%s|%s|%s",
+ statTime, apiName, gwInstanceId, bizDivCode,
+ clientId, inboundAdapter, outboundAdapter);
+ }
+}
diff --git a/src/main/java/com/eactive/eai/custom/statistics/dto/MinuteStatsKey.java b/src/main/java/com/eactive/eai/custom/statistics/dto/MinuteStatsKey.java
new file mode 100644
index 0000000..f2d6797
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/statistics/dto/MinuteStatsKey.java
@@ -0,0 +1,90 @@
+package com.eactive.eai.custom.statistics.dto;
+
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.Objects;
+
+import lombok.Getter;
+
+/**
+ * 분단위 통계 집계 키
+ * - 동일 분의 동일 차원별로 집계하기 위한 키
+ */
+@Getter
+public class MinuteStatsKey {
+
+ /** 통계 시간 (분 단위, 초는 00) */
+ private final LocalDateTime statTime;
+
+ /** API명 */
+ private final String apiName;
+
+ /** API Gateway 인스턴스 ID */
+ private final String gwInstanceId;
+
+ /** 업무구분코드 */
+ private final String bizDivCode;
+
+ /** 클라이언트 ID */
+ private final String clientId;
+
+ /** Inbound Adapter */
+ private final String inboundAdapter;
+
+ /** Outbound Adapter */
+ private final String outboundAdapter;
+
+ public MinuteStatsKey(LocalDateTime statTime, String apiName, String gwInstanceId,
+ String bizDivCode, String clientId, String inboundAdapter, String outboundAdapter) {
+ // 초와 나노초를 0으로 절사하여 분 단위로 정규화
+ this.statTime = statTime.truncatedTo(ChronoUnit.MINUTES);
+ this.apiName = apiName;
+ this.gwInstanceId = gwInstanceId;
+ this.bizDivCode = bizDivCode;
+ this.clientId = clientId;
+ this.inboundAdapter = inboundAdapter;
+ this.outboundAdapter = outboundAdapter;
+ }
+
+ /**
+ * TransactionEvent로부터 키 생성
+ */
+ public static MinuteStatsKey from(TransactionEvent event, LocalDateTime eventTime) {
+ return new MinuteStatsKey(
+ eventTime,
+ event.getApiName(),
+ event.getGwInstanceId(),
+ event.getBizDivCode(),
+ event.getClientId(),
+ event.getInboundAdapter(),
+ event.getOutboundAdapter()
+ );
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ MinuteStatsKey that = (MinuteStatsKey) o;
+ return Objects.equals(statTime, that.statTime) &&
+ Objects.equals(apiName, that.apiName) &&
+ Objects.equals(gwInstanceId, that.gwInstanceId) &&
+ Objects.equals(bizDivCode, that.bizDivCode) &&
+ Objects.equals(clientId, that.clientId) &&
+ Objects.equals(inboundAdapter, that.inboundAdapter) &&
+ Objects.equals(outboundAdapter, that.outboundAdapter);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(statTime, apiName, gwInstanceId, bizDivCode,
+ clientId, inboundAdapter, outboundAdapter);
+ }
+
+ @Override
+ public String toString() {
+ return String.format("%s|%s|%s|%s|%s|%s|%s",
+ statTime, apiName, gwInstanceId, bizDivCode,
+ clientId, inboundAdapter, outboundAdapter);
+ }
+}
diff --git a/src/main/java/com/eactive/eai/custom/statistics/dto/TransactionEvent.java b/src/main/java/com/eactive/eai/custom/statistics/dto/TransactionEvent.java
new file mode 100644
index 0000000..60a0793
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/statistics/dto/TransactionEvent.java
@@ -0,0 +1,58 @@
+package com.eactive.eai.custom.statistics.dto;
+
+import lombok.Builder;
+import lombok.Getter;
+
+/**
+ * 거래 1건의 이벤트 정보
+ */
+@Getter
+@Builder
+public class TransactionEvent {
+
+ /** API명 */
+ private final String apiName;
+
+ /** API Gateway 인스턴스 ID */
+ private final String gwInstanceId;
+
+ /** 업무구분코드 (없으면 "NONE") */
+ private final String bizDivCode;
+
+ /** 클라이언트 ID (없으면 "NONE") */
+ private final String clientId;
+
+ /** Inbound Adapter (없으면 "NONE") */
+ private final String inboundAdapter;
+
+ /** Outbound Adapter (없으면 "NONE") */
+ private final String outboundAdapter;
+
+ /** 응답시간 (ms) */
+ private final long responseTimeMs;
+
+ /** 성공 여부 */
+ private final boolean success;
+
+ /** 오류 유형 (성공시 null) */
+ private final ErrorType errorType;
+
+ /** 로그 시퀀스 번호 (100, 200, 300, 400, 900) */
+ private final int logSequence;
+
+ /**
+ * 오류 유형
+ */
+ public enum ErrorType {
+ TIMEOUT, // Timeout 오류
+ SYSTEM_ERROR, // 시스템 오류
+ BUSINESS_ERROR // 업무 오류
+ }
+
+ /**
+ * 기본값을 "NONE"으로 정규화
+ */
+ public static String normalizeValue(String value) {
+ return (value == null || value.trim().isEmpty()) ? "NONE" : value;
+ }
+}
diff --git a/src/main/java/com/eactive/eai/custom/statistics/package-info.java b/src/main/java/com/eactive/eai/custom/statistics/package-info.java
new file mode 100644
index 0000000..a61de7a
--- /dev/null
+++ b/src/main/java/com/eactive/eai/custom/statistics/package-info.java
@@ -0,0 +1,14 @@
+/**
+ * API Gateway 통계 수집 모듈
+ *
+ * 분단위로 API 거래 통계를 수집하고 DB에 저장합니다.
+ * HdrHistogram을 사용하여 메모리 효율적으로 응답시간 백분위(P50, P95)를 계산합니다.
+ *
+ *
주요 컴포넌트
+ * 
