diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/EditorSiddhiAppRuntimeService.java b/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/EditorSiddhiAppRuntimeService.java index e060df97d05..772ae50cc2e 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/EditorSiddhiAppRuntimeService.java +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/EditorSiddhiAppRuntimeService.java @@ -48,6 +48,6 @@ public Map getActiveSiddhiAppRuntimes() { @Override public void enableSiddhiAppStatistics(Level statsEnabled) { - //ignore the server runtime statistics + //ignore the editor runtime statistics } } diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/internal/DockerUtils.java b/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/internal/DockerUtils.java index 3efc577998c..5a8aa9a904e 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/internal/DockerUtils.java +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/internal/DockerUtils.java @@ -53,7 +53,7 @@ public class DockerUtils { private static final String SIDDHI_FILES_DIR = "siddhi-files"; private static final String README_FILE = "README.md"; private static final String DOCKER_COMPOSE_FILE = "docker-compose.yml"; - private static final String DOCKER_COMPOSE_EDITOR_FILE = "docker-compose.server.yml"; + private static final String DOCKER_COMPOSE_EDITOR_FILE = "docker-compose.editor.yml"; private static final String DOCKER_COMPOSE_WORKER_FILE = "docker-compose.worker.yml"; private static final String PRODUCT_VERSION_TOKEN = "\\{\\{PRODUCT_VERSION}}"; private final ConfigProvider configProvider; @@ -124,7 +124,7 @@ private Map getFileMap(String profile, List siddhiFiles) { // Add readme.md and the respective docker-compose.yml files. files.put(README_FILE, Paths.get(RUNTIME_PATH, RESOURCES_DIR, README_FILE)); files.put(DOCKER_COMPOSE_FILE, Paths.get(RUNTIME_PATH, RESOURCES_DIR, - "server".equals(profile) ? DOCKER_COMPOSE_EDITOR_FILE : DOCKER_COMPOSE_WORKER_FILE)); + "editor".equals(profile) ? DOCKER_COMPOSE_EDITOR_FILE : DOCKER_COMPOSE_WORKER_FILE)); // Add selected Siddhi files. for (String siddhiFile : siddhiFiles) { diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/internal/EditorConsoleService.java b/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/internal/EditorConsoleService.java index 7ea5603099a..e088f0c0dc0 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/internal/EditorConsoleService.java +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/internal/EditorConsoleService.java @@ -43,7 +43,7 @@ * EditorConsoleService Websocket - Client connect to this */ @Component( - name = "server-console-service", + name = "editor-console-service", service = WebSocketEndpoint.class, immediate = true ) @@ -93,7 +93,7 @@ public void onClose(WebSocketConnection webSocketConnection) { if (webSocketConnection.isOpen()) { try { ConsoleLogEvent clientCloseEvent = new ConsoleLogEvent(); - clientCloseEvent.setMessage("Connection closed (Possibly due to opening the server in a " + clientCloseEvent.setMessage("Connection closed (Possibly due to opening the editor in a " + "new Tab/Window) ! Refresh to reconnect to the console."); clientCloseEvent.setLevel("ERROR"); clientCloseEvent.setFqcn(EditorConsoleService.class.getCanonicalName()); diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/internal/EditorMicroservice.java b/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/internal/EditorMicroservice.java index 190baba090d..ec7ca570b36 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/internal/EditorMicroservice.java +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/internal/EditorMicroservice.java @@ -533,7 +533,7 @@ public Response write(String payload) { if (null != fileNamePath) { String siddhiAppName = fileNamePath.toString().replace(Constants.SIDDHI_APP_FILE_EXTENSION, ""); if (null != EditorDataHolder.getDebugProcessorService().getSiddhiAppRuntimeHolder(siddhiAppName)) { - //making the app faulty until the file gets deployed again for server usage purposes + //making the app faulty until the file gets deployed again for editor usage purposes EditorDataHolder.getDebugProcessorService().getSiddhiAppRuntimeHolder(siddhiAppName).setMode( DebugRuntime.Mode.FAULTY); } diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/internal/StartupComponent.java b/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/internal/StartupComponent.java index 9d51b1a14c0..33dbdc29991 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/internal/StartupComponent.java +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/internal/StartupComponent.java @@ -69,14 +69,14 @@ protected void setMicroservicesServer(MicroservicesServer microservicesServer) { e.getMessage(), e); } String startingURL = entry.getValue().getScheme() + "://" + hostname + ":" + entry.getValue() - .getPort() + "/server"; + .getPort() + "/editor"; logger.info("Editor Started on : " + startingURL); } }); - logger.debug("Microservices server registered to startup component of server"); + logger.debug("Microservices server registered to startup component of editor"); } protected void unsetMicroservicesServer(MicroservicesServer microservicesServer) { - logger.debug("Microservices server unregistered from startup component of server"); + logger.debug("Microservices server unregistered from startup component of editor"); } } diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/internal/WorkspaceDeployer.java b/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/internal/WorkspaceDeployer.java index f06f7eadffb..d79677ec197 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/internal/WorkspaceDeployer.java +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/internal/WorkspaceDeployer.java @@ -45,7 +45,7 @@ import java.nio.charset.Charset; /** - * WorkspaceDeployer is responsible for all server workspace related deployment tasks + * WorkspaceDeployer is responsible for all editor workspace related deployment tasks */ @Component( name = "workspace-artifact-deployer", diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/util/siddhiappdeployer/api/SiddhiAppApiHelperService.java b/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/util/siddhiappdeployer/api/SiddhiAppApiHelperService.java index 1cd99fda34c..de34dcd161b 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/util/siddhiappdeployer/api/SiddhiAppApiHelperService.java +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/util/siddhiappdeployer/api/SiddhiAppApiHelperService.java @@ -21,7 +21,7 @@ import org.wso2.carbon.siddhi.editor.core.exception.SiddhiAppDeployerServiceStubException; /** - * Interface for services related to deploying siddhi apps of server. + * Interface for services related to deploying siddhi apps of editor. */ public interface SiddhiAppApiHelperService { diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/css/layout.css b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/css/layout.css index acc470569ab..d80ddd5f0aa 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/css/layout.css +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/css/layout.css @@ -326,7 +326,7 @@ div[class*="col-sm-12"] { /*//////////////////////////////////////////////////*/ /*//////////////////////////////////////////////////*/ -/** ace server (source view) related styles | Start -> **/ +/** ace editor (source view) related styles | Start -> **/ .nav-tabs-bar{ overflow: hidden; diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/js/dialog/docker-export-dialog.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/js/dialog/docker-export-dialog.js index a4ff9f146c5..9503f42fe73 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/js/dialog/docker-export-dialog.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/js/dialog/docker-export-dialog.js @@ -79,7 +79,7 @@ define(['require', 'jquery', 'log', 'backbone', 'file_browser'], } } var downloadURL = window.location.protocol + "//" + window.location.host + - "/server/docker/download?q=" + encodeURIComponent(JSON.stringify(payload)); + "/editor/docker/download?q=" + encodeURIComponent(JSON.stringify(payload)); $('#frm-download').attr('src', downloadURL); }); diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/js/dialog/query-store-rest-client.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/js/dialog/query-store-rest-client.js index 7d667b484c9..814861a9ece 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/js/dialog/query-store-rest-client.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/js/dialog/query-store-rest-client.js @@ -18,7 +18,7 @@ */ define(["jquery"], function (jQuery) { var self = {}; - self.siddhiStoreUrl = window.location.protocol + "//" + window.location.host + "/server/stores/query"; + self.siddhiStoreUrl = window.location.protocol + "//" + window.location.host + "/editor/stores/query"; self.retrieveStoresQuery = function (appName, query, successCallback, errorCallback) { jQuery.ajax({ async: true, diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/js/dialog/sample-event-rest-client.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/js/dialog/sample-event-rest-client.js index 3f1d1037899..780224ea32e 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/js/dialog/sample-event-rest-client.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/js/dialog/sample-event-rest-client.js @@ -24,7 +24,7 @@ define(["jquery"], function (jQuery) { self.HTTP_POST = "POST"; self.HTTP_PUT = "PUT"; self.HTTP_DELETE = "DELETE"; - self.siddhiAppsUrl = window.location.protocol + "//" + window.location.host + "/server"; + self.siddhiAppsUrl = window.location.protocol + "//" + window.location.host + "/editor"; self.retrieveSampleEvent = function (appName, streamName, eventFormat, successCallback, errorCallback) { jQuery.ajax({ diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/js/welcome-page/first-launch-welcome.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/js/welcome-page/first-launch-welcome.js index 83a5ba03b63..5902d1854cc 100755 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/js/welcome-page/first-launch-welcome.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/js/welcome-page/first-launch-welcome.js @@ -22,7 +22,7 @@ define(['require', 'lodash', 'log', 'jquery', 'backbone', 'command', 'sample_pre initialize: function (options) { var errMsg; if (!_.has(options, 'tab')) { - errMsg = 'unable to find a reference for server tab'; + errMsg = 'unable to find a reference for editor tab'; log.error(errMsg); throw errMsg; } @@ -88,7 +88,7 @@ define(['require', 'lodash', 'log', 'jquery', 'backbone', 'command', 'sample_pre buttonWrap.append(newButton); buttonWrap.append(openButton); - var productNameWrapHeader = $('

' + + var productNameWrapHeader = $('

' + '

Stream Processor Studio

'); productNameWrap.append(productNameWrapHeader); diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/js/workspace/workspace.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/js/workspace/workspace.js index db1e9b7e9dd..a7806dbf926 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/js/workspace/workspace.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/js/workspace/workspace.js @@ -64,7 +64,7 @@ define(['ace/ace', 'jquery', 'lodash', 'log','dialogs','./service-client','welco }; this.saveFileBrowserBased = function saveFile() { - var editor = ace.edit('siddhi-server'); + var editor = ace.edit('siddhi-editor'); var code = editor.getValue(); var filename = "untitled"; var match = plan_regex.exec(code); @@ -76,7 +76,7 @@ define(['ace/ace', 'jquery', 'lodash', 'log','dialogs','./service-client','welco }; this.saveFile = function saveFile() { - var editor = ace.edit('siddhi-server'); + var editor = ace.edit('siddhi-editor'); var code = editor.getValue(); var filename = "untitled"; var match = plan_regex.exec(code); @@ -87,7 +87,7 @@ define(['ace/ace', 'jquery', 'lodash', 'log','dialogs','./service-client','welco filePath = (filePath.slice(-1) === '/') ? filePath + filename : filePath + '/' + filename; $.ajax({ type: "POST", - url: window.location.protocol + "//" + window.location.host + "/server/save", + url: window.location.protocol + "//" + window.location.host + "/editor/save", data: JSON.stringify({ siddhiApp: code, filePath: filePath @@ -762,7 +762,7 @@ define(['ace/ace', 'jquery', 'lodash', 'log','dialogs','./service-client','welco //Run hint tour app.commandManager.registerHandler('tour-guide', this.runGuide, this); - app.commandManager.registerHandler('deploy-to-server', this.handleDeploy, this); + app.commandManager.registerHandler('deploy-to-editor', this.handleDeploy, this); } }); diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ace.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ace.js index 2d3c3713361..f6711a6ef08 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ace.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ace.js @@ -69,7 +69,7 @@ if (typeof define === "function") exports.define = define; /** - * Embeds the Ace server into the DOM, at the element provided by `el`. + * Embeds the Ace editor into the DOM, at the element provided by `el`. * @param {String | DOMElement} el Either the id of an element, or the element itself * **/ diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/background_tokenizer.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/background_tokenizer.js index dbad0953692..ea4ddd0f69b 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/background_tokenizer.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/background_tokenizer.js @@ -46,7 +46,7 @@ var EventEmitter = require("./lib/event_emitter").EventEmitter; /** * Creates a new `BackgroundTokenizer` object. * @param {Tokenizer} tokenizer The tokenizer to use - * @param {Editor} editor The server to associate with + * @param {Editor} editor The editor to associate with * * @constructor **/ diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/edit_session.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/edit_session.js index 45ea222c592..0f75e2f2555 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/edit_session.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/edit_session.js @@ -984,7 +984,7 @@ var EditSession = function(text, mode) { }; /** - * [Returns the value of the distance between the top of the server and the topmost part of the visible content.]{: #EditSession.getScrollTop} + * [Returns the value of the distance between the top of the editor and the topmost part of the visible content.]{: #EditSession.getScrollTop} * @returns {Number} **/ this.getScrollTop = function() { @@ -993,7 +993,7 @@ var EditSession = function(text, mode) { this.$scrollLeft = 0; /** - * [Sets the value of the distance between the left of the server and the leftmost part of the visible content.]{: #EditSession.setScrollLeft} + * [Sets the value of the distance between the left of the editor and the leftmost part of the visible content.]{: #EditSession.setScrollLeft} **/ this.setScrollLeft = function(scrollLeft) { // scrollLeft = Math.round(scrollLeft); @@ -1005,7 +1005,7 @@ var EditSession = function(text, mode) { }; /** - * [Returns the value of the distance between the left of the server and the leftmost part of the visible content.]{: #EditSession.getScrollLeft} + * [Returns the value of the distance between the left of the editor and the leftmost part of the visible content.]{: #EditSession.getScrollLeft} * @returns {Number} **/ this.getScrollLeft = function() { @@ -1610,7 +1610,7 @@ var EditSession = function(text, mode) { }; /** - * Sets the line length for soft wrap in the server. Lines will break + * Sets the line length for soft wrap in the editor. Lines will break * at a minimum of the given length minus 20 chars and at a maximum * of the given number of chars. * @param {number} limit The maximum line length in chars, for soft wrapping lines. diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/edit_session/fold_line.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/edit_session/fold_line.js index 48ee8e7ecaf..9d73154d861 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/edit_session/fold_line.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/edit_session/fold_line.js @@ -169,7 +169,7 @@ function FoldLine(foldData, folds) { && fold.start.column != column && fold.start.row != row) { - //throwing here breaks whole server + //throwing here breaks whole editor //TODO: properly handle this window.console && window.console.log(row, column, fold); } else if (fold.start.row == row) { diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/editor.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/editor.js index 1dc4584903b..b4c961bd548 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/editor.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/editor.js @@ -485,7 +485,7 @@ var Editor = function(renderer, session) { }; /** - * Gets the current font size of the server text. + * Gets the current font size of the editor text. */ this.getFontSize = function () { return this.getOption("fontSize") || @@ -493,7 +493,7 @@ var Editor = function(renderer, session) { }; /** - * Set a new font size (in pixels) for the server text. + * Set a new font size (in pixels) for the editor text. * @param {String} size A font size ( _e.g._ "12px") * * @@ -652,7 +652,7 @@ var Editor = function(renderer, session) { }; /** - * Emitted once the server comes into focus. + * Emitted once the editor comes into focus. * @event focus * * @@ -667,7 +667,7 @@ var Editor = function(renderer, session) { }; /** - * Emitted once the server has been blurred. + * Emitted once the editor has been blurred. * @event blur * * @@ -730,7 +730,7 @@ var Editor = function(renderer, session) { if (!this.$blockScrolling) { config.warn("Automatically scrolling cursor into view after selection change", "this will be disabled in the next version", - "set server.$blockScrolling = Infinity to disable this message" + "set editor.$blockScrolling = Infinity to disable this message" ); this.renderer.scrollCursorIntoView(); } @@ -1163,7 +1163,7 @@ var Editor = function(renderer, session) { }; /** - * If `showInvisibles` is set to `true`, invisible characters—like spaces or new lines—are show in the server. + * If `showInvisibles` is set to `true`, invisible characters—like spaces or new lines—are show in the editor. * @param {Boolean} showInvisibles Specifies whether or not to show invisible characters * **/ @@ -1188,7 +1188,7 @@ var Editor = function(renderer, session) { }; /** - * If `showPrintMargin` is set to `true`, the print margin is shown in the server. + * If `showPrintMargin` is set to `true`, the print margin is shown in the editor. * @param {Boolean} showPrintMargin Specifies whether or not to show the print margin * **/ @@ -1222,8 +1222,8 @@ var Editor = function(renderer, session) { }; /** - * If `readOnly` is true, then the server is set to read-only mode, and none of the content can change. - * @param {Boolean} readOnly Specifies whether the server can be modified or not + * If `readOnly` is true, then the editor is set to read-only mode, and none of the content can change. + * @param {Boolean} readOnly Specifies whether the editor can be modified or not * **/ this.setReadOnly = function(readOnly) { @@ -1231,7 +1231,7 @@ var Editor = function(renderer, session) { }; /** - * Returns `true` if the server is set to read-only mode. + * Returns `true` if the editor is set to read-only mode. * @returns {Boolean} **/ this.getReadOnly = function() { @@ -1907,7 +1907,7 @@ var Editor = function(renderer, session) { }; /** - * Moves the server to the specified row. + * Moves the editor to the specified row. * @related VirtualRenderer.scrollToRow **/ this.scrollToRow = function(row) { @@ -1974,7 +1974,7 @@ var Editor = function(renderer, session) { /** - * Selects all the text in server. + * Selects all the text in editor. * @related Selection.selectAll **/ this.selectAll = function() { @@ -2527,7 +2527,7 @@ var Editor = function(renderer, session) { /** * - * Cleans up the entire server. + * Cleans up the entire editor. **/ this.destroy = function() { this.renderer.destroy(); @@ -2538,7 +2538,7 @@ var Editor = function(renderer, session) { }; /** - * Enables automatic scrolling of the cursor into view when server itself is inside scrollable element + * Enables automatic scrolling of the cursor into view when editor itself is inside scrollable element * @param {Boolean} enable default true **/ this.setAutoScrollEditorIntoView = function(enable) { diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/editor_change_document_test.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/editor_change_document_test.js index 474d0a064e6..a1fdaad9d40 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/editor_change_document_test.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/editor_change_document_test.js @@ -158,7 +158,7 @@ module.exports = { "test: should use stop worker of old document" : function(next) { var self = this; - // 1. Open an server and set the session to CssMode + // 1. Open an editor and set the session to CssMode self.editor.setSession(self.session1); self.session1.setMode(new CssMode()); diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/emmet.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/emmet.js index 21b610aa856..49eb14e46a7 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/emmet.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/emmet.js @@ -31,7 +31,7 @@ define(function(require, exports, module) { "use strict"; var HashHandler = require("ace/keyboard/hash_handler").HashHandler; -var Editor = require("ace/server").Editor; +var Editor = require("ace/editor").Editor; var snippetManager = require("ace/snippets").snippetManager; var Range = require("ace/range").Range; var emmet, emmetPath; @@ -59,7 +59,7 @@ AceEmmetEditor.prototype = { * to current caret position * @return {Object} * @example - * var selection = server.getSelectionRange(); + * var selection = editor.getSelectionRange(); * alert(selection.start + ', ' + selection.end); */ getSelectionRange: function() { @@ -79,10 +79,10 @@ AceEmmetEditor.prototype = { * @param {Number} start * @param {Number} [end] * @example - * server.createSelection(10, 40); + * editor.createSelection(10, 40); * * //move caret to 15th character - * server.createSelection(15); + * editor.createSelection(15); */ createSelection: function(start, end) { var doc = this.ace.session.doc; @@ -97,7 +97,7 @@ AceEmmetEditor.prototype = { * and end properties * @return {Object} * @example - * var range = server.getCurrentLineRange(); + * var range = editor.getCurrentLineRange(); * alert(range.start + ', ' + range.end); */ getCurrentLineRange: function() { @@ -139,9 +139,9 @@ AceEmmetEditor.prototype = { }, /** - * Replace server's content or it's part (from start to + * Replace editor's content or it's part (from start to * end index). If value contains - * caret_placeholder, the server will put caret into + * caret_placeholder, the editor will put caret into * this position. If you skip start and end * arguments, the whole target's content will be replaced with * value. @@ -154,8 +154,8 @@ AceEmmetEditor.prototype = { * the corresponding substring of current target's content will be * replaced with value. * @param {String} value Content you want to paste - * @param {Number} [start] Start index of server's content - * @param {Number} [end] End index of server's content + * @param {Number} [start] Start index of editor's content + * @param {Number} [end] End index of editor's content * @param {Boolean} [noIndent] Do not auto indent value */ replaceContent: function(value, start, end, noIndent) { @@ -170,14 +170,14 @@ AceEmmetEditor.prototype = { editor.session.remove(range); range.end = range.start; - //server.selection.setRange(range); + //editor.selection.setRange(range); value = this.$updateTabstops(value); snippetManager.insertSnippet(editor, value); }, /** - * Returns server's content + * Returns editor's content * @return {String} */ getContent: function(){ @@ -185,7 +185,7 @@ AceEmmetEditor.prototype = { }, /** - * Returns current server's syntax mode + * Returns current editor's syntax mode * @return {String} */ getSyntax: function() { @@ -251,7 +251,7 @@ AceEmmetEditor.prototype = { }, /** - * Returns current server's file path + * Returns current editor's file path * @return {String} * @since 0.65 */ diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/keybinding_menu.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/keybinding_menu.js index 9fb10dabef2..38e578d81f4 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/keybinding_menu.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/keybinding_menu.js @@ -44,13 +44,13 @@ define(function(require, exports, module) { "use strict"; - var Editor = require("ace/server").Editor; + var Editor = require("ace/editor").Editor; /** * Generates a menu which displays the keyboard shortcuts. * @author * Matthew Christopher Kastor-Inare III
* ☭ Hial Atropa!! ☭ - * @param {ace.Editor} editor An instance of the ace server. + * @param {ace.Editor} editor An instance of the ace editor. */ function showKeyboardShortcuts (editor) { // make sure the menu isn't open already. diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/linking.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/linking.js index 44acc13cfb2..cfd333b2a75 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/linking.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/linking.js @@ -30,7 +30,7 @@ define(function(require, exports, module) { -var Editor = require("ace/server").Editor; +var Editor = require("ace/editor").Editor; require("../config").defineOptions(Editor.prototype, "editor", { enableLinking: { diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/menu_tools/add_editor_menu_options.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/menu_tools/add_editor_menu_options.js index c7543023063..6fc877f56ef 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/menu_tools/add_editor_menu_options.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/menu_tools/add_editor_menu_options.js @@ -48,13 +48,13 @@ define(function(require, exports, module) { 'use strict'; /** - * The menu options property needs to be added to the server + * The menu options property needs to be added to the editor * so that the settings menu can know about options for * selection elements and track which option is selected. * @author * Matthew Christopher Kastor-Inare III
* ☭ Hial Atropa!! ☭ - * @param {ace.Editor} editor An instance of the ace server. + * @param {ace.Editor} editor An instance of the ace editor. */ module.exports.addEditorMenuOptions = function addEditorMenuOptions (editor) { var modelist = require('../modelist'); diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/menu_tools/generate_settings_menu.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/menu_tools/generate_settings_menu.js index e5901f7a949..a15c26dda89 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/menu_tools/generate_settings_menu.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/menu_tools/generate_settings_menu.js @@ -52,7 +52,7 @@ var getSetFunctions = require('./get_set_functions').getSetFunctions; * @author * Matthew Christopher Kastor-Inare III
* ☭ Hial Atropa!! ☭ - * @param {ace.Editor} editor An instance of the ace server. + * @param {ace.Editor} editor An instance of the ace editor. */ module.exports.generateSettingsMenu = function generateSettingsMenu (editor) { /** @@ -108,7 +108,7 @@ module.exports.generateSettingsMenu = function generateSettingsMenu (editor) { * set function. It is used to set up event listeners for when the * menu options change. * @param {string} clss Maps to the class of the dom element. This is - * the name of the object containing the set function e.g. `server`, + * the name of the object containing the set function e.g. `editor`, * `session`, `renderer`. * @param {string} item This is the set function name. It maps to the * id of the dom element (check, select, input) and to the "contains" @@ -177,7 +177,7 @@ module.exports.generateSettingsMenu = function generateSettingsMenu (editor) { } /** * Generates selection fields for the menu and populates their options - * using information from `server.menuOptions` + * using information from `editor.menuOptions` * @author * Matthew Christopher Kastor-Inare III
* ☭ Hial Atropa!! ☭ @@ -202,7 +202,7 @@ module.exports.generateSettingsMenu = function generateSettingsMenu (editor) { } /** * Processes the set functions returned from `getSetFunctions`. First it - * checks for menu options defined in `server.menuOptions`. If no + * checks for menu options defined in `editor.menuOptions`. If no * options are specified then it checks whether there is a get function * (replace set with get) for the setting. When either of those * conditions are met it will attempt to create a new entry for the diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/menu_tools/get_editor_keyboard_shortcuts.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/menu_tools/get_editor_keyboard_shortcuts.js index b839fce3b38..99e006b0977 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/menu_tools/get_editor_keyboard_shortcuts.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/menu_tools/get_editor_keyboard_shortcuts.js @@ -51,12 +51,12 @@ var keys = require("../../lib/keys"); * @author * Matthew Christopher Kastor-Inare III
* ☭ Hial Atropa!! ☭ - * @param {ace.Editor} editor An server instance. + * @param {ace.Editor} editor An editor instance. * @returns {Array} Returns an array of objects representing the keyboard - * shortcuts for the given server. + * shortcuts for the given editor. * @example * var getKbShortcuts = require('./get_keyboard_shortcuts'); - * console.log(getKbShortcuts(server)); + * console.log(getKbShortcuts(editor)); * // [ * // {'command' : aCommand, 'key' : 'Control-d'}, * // {'command' : aCommand, 'key' : 'Control-d'} diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/menu_tools/get_set_functions.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/menu_tools/get_set_functions.js index 75f7e8ce5db..4cd655084d6 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/menu_tools/get_set_functions.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/menu_tools/get_set_functions.js @@ -49,14 +49,14 @@ define(function(require, exports, module) { * @author * Matthew Christopher Kastor-Inare III
* ☭ Hial Atropa!! ☭ - * @param {object} editor The server instance + * @param {object} editor The editor instance * @return {array} Returns an array of objects. Each object contains the * following properties: functionName, parentObj, and parentName. The * function name will be the name of a method beginning with the string * `set` which was found. The parent object will be a reference to the * object having the method matching the function name. The parent name * will be a string representing the identifier of the parent object e.g. - * `server`, `session`, or `renderer`. + * `editor`, `session`, or `renderer`. */ module.exports.getSetFunctions = function getSetFunctions (editor) { /** diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/settings_menu.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/settings_menu.js index 0e568d7e5dc..44f6d6ad535 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/settings_menu.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/settings_menu.js @@ -37,7 +37,7 @@ * Show Settings Menu * @fileOverview Show Settings Menu
* Displays an interactive settings menu mostly generated on the fly based on - * the current state of the server. + * the current state of the editor. * @author * Matthew Christopher Kastor-Inare III
* ☭ Hial Atropa!! ☭ @@ -52,7 +52,7 @@ var overlayPage = require('./menu_tools/overlay_page').overlayPage; * @author * Matthew Christopher Kastor-Inare III
* ☭ Hial Atropa!! ☭ - * @param {ace.Editor} editor An instance of the ace server. + * @param {ace.Editor} editor An instance of the ace editor. */ function showSettingsMenu(editor) { // make sure the menu isn't open already. @@ -63,12 +63,12 @@ function showSettingsMenu(editor) { /** * Initializes the settings menu extension. It adds the showSettingsMenu - * method to the given server object and adds the showSettingsMenu command - * to the server with appropriate keyboard shortcuts. + * method to the given editor object and adds the showSettingsMenu command + * to the editor with appropriate keyboard shortcuts. * @param {ace.Editor} editor An instance of the Editor. */ module.exports.init = function(editor) { - var Editor = require("ace/server").Editor; + var Editor = require("ace/editor").Editor; Editor.prototype.showSettingsMenu = function() { showSettingsMenu(this); }; diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/textarea.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/textarea.js index d8bfa5aef8d..c997248870a 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/textarea.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/ext/textarea.js @@ -79,7 +79,7 @@ function setupContainer(element, getValue) { var parentNode = element.parentNode; - // This will hold the server. + // This will hold the editor. var container = document.createElement('div'); // To put Ace in the place of the textarea, we have to copy a few of the @@ -223,7 +223,7 @@ exports.transformTextarea = function(element, options) { session.setValue(element.value || element.innerHTML); editor.focus(); - // Add the settingPanel opener to the server's div. + // Add the settingPanel opener to the editor's div. container.appendChild(settingOpener); // Create the API. diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/incremental_search.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/incremental_search.js index e3aad50a5e5..c32af27544d 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/incremental_search.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/incremental_search.js @@ -42,7 +42,7 @@ var ISearchKbd = iSearchCommandModule.IncrementalSearchKeyboardHandler; * @class IncrementalSearch * * Implements immediate searching while the user is typing. When incremental - * search is activated, keystrokes into the server will be used for composing + * search is activated, keystrokes into the editor will be used for composing * a search term. Immediately after every keystroke the search is updated: * - so-far-matching characters are highlighted * - the cursor is moved to the next match @@ -120,8 +120,8 @@ function objectToRegExp(obj) { }; this.selectionFix = function(editor) { - // Fix selection bug: When clicked inside the server - // server.selection.$isEmpty is false even if the mouse click did not + // Fix selection bug: When clicked inside the editor + // editor.selection.$isEmpty is false even if the mouse click did not // open a selection. This is interpreted by the move commands to // extend the selection. To only extend the selection when there is // one, we clear it here diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/keyboard/textinput.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/keyboard/textinput.js index 4f7abdbae91..5ef60d9b19d 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/keyboard/textinput.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/keyboard/textinput.js @@ -199,7 +199,7 @@ var TextInput = function(parentNode, host) { } inComposition ? onCompositionUpdate() : onCompositionStart(); }); - // when user presses backspace after focusing the server + // when user presses backspace after focusing the editor // propertychange isn't called for the next character event.addListener(text, "keydown", function (e) { syncProperty.schedule(50); diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/keyboard/vim.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/keyboard/vim.js index 9cec8fa7794..bcaee2f6887 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/keyboard/vim.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/keyboard/vim.js @@ -18,7 +18,7 @@ * behavior. * * Events: - * 'vim-mode-change' - raised on the server anytime the current mode changes, + * 'vim-mode-change' - raised on the editor anytime the current mode changes, * Event object: {mode: "visual", subMode: "linewise"} * * Code structure: @@ -4842,7 +4842,7 @@ dom.importCssString(".normal-mode .ace_cursor{\ } } if (!commandName) { - showConfirm(cm, 'Not an server command ":' + input + '"'); + showConfirm(cm, 'Not an editor command ":' + input + '"'); return; } try { @@ -6075,7 +6075,7 @@ dom.importCssString(".normal-mode .ace_cursor{\ }); cm.ace.renderer.setStyle("normal-mode", !getVim(cm).insertMode); editor.renderer.$cursorLayer.drawCursor = this.drawCursor.bind(cm); - // renderVirtualNumbers.attach(server); + // renderVirtualNumbers.attach(editor); this.updateMacCompositionHandlers(editor, true); }, detach: function(editor) { @@ -6086,7 +6086,7 @@ dom.importCssString(".normal-mode .ace_cursor{\ editor.$vimModeHandler = null; editor.renderer.$cursorLayer.drawCursor = null; editor.renderer.setStyle("normal-mode", false); - // renderVirtualNumbers.detach(server); + // renderVirtualNumbers.detach(editor); this.updateMacCompositionHandlers(editor, false); }, getStatusText: function(editor) { diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/keyboard/vim_test.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/keyboard/vim_test.js index 8c07a5217e4..47255b03b7f 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/keyboard/vim_test.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/keyboard/vim_test.js @@ -83,7 +83,7 @@ vim.CodeMirror.Vim.defineEx('write', 'w', function(cm) { // cm.setBookmark({ch: 5, line: 0}) // cm.setBookmark({ch: 4, line: 0}) -// cm.replaceRange("x-", {ch: 4, line: 0}, {ch: 5, line: 0}); [server.$vimModeHandler.cm.marks[0].find(),server.$vimModeHandler.cm.marks[1].find()] +// cm.replaceRange("x-", {ch: 4, line: 0}, {ch: 5, line: 0}); [editor.$vimModeHandler.cm.marks[0].find(),editor.$vimModeHandler.cm.marks[1].find()] var lineText, verbose, phantom; var Pos = CodeMirror.Pos; diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/layer/font_metrics.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/layer/font_metrics.js index fe60aec92a4..e4101698ba8 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/layer/font_metrics.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/layer/font_metrics.js @@ -144,7 +144,7 @@ var FontMetrics = exports.FontMetrics = function(parentEl) { width: this.$measureNode.clientWidth / CHAR_COUNT }; } - // Size and width can be null if the server is not visible or + // Size and width can be null if the editor is not visible or // detached from the document if (size.width === 0 || size.height === 0) return null; diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/mode/_test/tokens_nix.json b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/mode/_test/tokens_nix.json index b9424456350..119007741c3 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/mode/_test/tokens_nix.json +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/mode/_test/tokens_nix.json @@ -296,7 +296,7 @@ ["constant.language.escape","${"], ["identifier","app"], ["constant.language.escape","}"], - ["string","/server.js\""], + ["string","/editor.js\""], ["text",";"] ],[ "start", diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/mode/folding/siddhi.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/mode/folding/siddhi.js index d79668347c6..2a103fc28f2 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/mode/folding/siddhi.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/mode/folding/siddhi.js @@ -114,7 +114,7 @@ define(["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding * Return the range from the start position to the position at which the first string matching the endTokenRegex is found * Search is started at start position and traveled forward * - * @param session Ace server session + * @param session Ace editor session * @param startRow Start row of the range * @param startColumn Start column of the range * @param endTokenRegex Regex of the end token @@ -155,7 +155,7 @@ define(["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding * Return the range from the end position to the position at which the last string matching the startTokenRegex is found * Search is started at end position and traveled backward * - * @param session Ace server session + * @param session Ace editor session * @param endRow End row of the range * @param endColumn End column of the range * @param startTokenRegex Regex of the end token diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/mode/r.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/mode/r.js index ef51e32ae1b..d69fcf62dc4 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/mode/r.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/mode/r.js @@ -135,13 +135,13 @@ define(function(require, exports, module) { return ""; }; - this.transformAction = function(state, action, server, session, text) { + this.transformAction = function(state, action, editor, session, text) { if (action === 'insertion' && text === "\n") { // If newline in a doxygen comment, continue the comment - var pos = server.getSelectionRange().start; + var pos = editor.getSelectionRange().start; var match = /^((\s*#+')\s*)/.exec(session.doc.getLine(pos.row)); - if (match && server.getSelectionRange().start.column >= match[2].length) { + if (match && editor.getSelectionRange().start.column >= match[2].length) { return {text: "\n" + match[1]}; } } diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/mode/xquery/xqlint.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/mode/xquery/xqlint.js index 4e699fbf9cb..b8db7ba0411 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/mode/xquery/xqlint.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/mode/xquery/xqlint.js @@ -87355,7 +87355,7 @@ exports.JSONiqLexer = _dereq_('./lexers/jsoniq_lexer').JSONiqLexer; exports.XQueryLexer = _dereq_('./lexers/xquery_lexer').XQueryLexer; exports.XQLint = function (source, opts) { - //ACE server worker hack + //ACE editor worker hack if(_.defaults) { opts = _.defaults(opts ? opts : {}, { styleCheck: false }); } diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/mouse/default_handlers.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/mouse/default_handlers.js index c200980cb9f..1e2ce66594f 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/mouse/default_handlers.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/mouse/default_handlers.js @@ -82,7 +82,7 @@ function DefaultHandlers(mouseHandler) { } this.mousedownEvent.time = Date.now(); - // if this click caused the server to be focused should not clear the + // if this click caused the editor to be focused should not clear the // selection if (inSelection && !editor.isFocused()) { editor.focus(); diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/mouse/dragdrop_handler.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/mouse/dragdrop_handler.js index 17efd2da17e..31111234bd2 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/mouse/dragdrop_handler.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/mouse/dragdrop_handler.js @@ -105,7 +105,7 @@ function DragdropHandler(mouseHandler) { if (!editor.getReadOnly()) { var dropEffect = e.dataTransfer.dropEffect; if (!dragOperation && dropEffect == "move") - // text was dragged outside the server + // text was dragged outside the editor editor.session.remove(editor.getSelectionRange()); editor.renderer.$cursorLayer.setBlinking(true); } @@ -290,7 +290,7 @@ function DragdropHandler(mouseHandler) { event.removeListener(document, "mousemove", onMouseMove); } - // sometimes other code on the page can stop dragleave event leaving server stuck in the drag state + // sometimes other code on the page can stop dragleave event leaving editor stuck in the drag state var onMouseMoveTimer = null; function onMouseMove() { if (onMouseMoveTimer == null) { diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/mouse/mouse_handler.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/mouse/mouse_handler.js index 5d434fc7276..e01535a32de 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/mouse/mouse_handler.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/mouse/mouse_handler.js @@ -147,7 +147,7 @@ var MouseHandler = function(editor) { var self = this; var onMouseMove = function(e) { if (!e) return; - // if server is loaded inside iframe, and mouseup event is outside + // if editor is loaded inside iframe, and mouseup event is outside // we won't recieve it, so we cancel on first mousemove without button if (useragent.isWebKit && !e.which && self.releaseMouse) return self.releaseMouse(); diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/multi_select.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/multi_select.js index 3067dd7a90c..e37b7e24bf5 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/multi_select.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/multi_select.js @@ -39,7 +39,7 @@ var lang = require("./lib/lang"); var commands = require("./commands/multi_select_commands"); exports.commands = commands.defaultCommands.concat(commands.multiSelectCommands); -// Todo: session.find or server.findVolatile that returns range +// Todo: session.find or editor.findVolatile that returns range var Search = require("./search").Search; var search = new Search(); @@ -898,9 +898,9 @@ exports.onSessionChange = function(e) { } }; -// MultiSelect(server) -// adds multiple selection support to the server -// (note: should be called only once for each server instance) +// MultiSelect(editor) +// adds multiple selection support to the editor +// (note: should be called only once for each editor instance) function MultiSelect(editor) { if (editor.$multiselectOnSessionChange) return; diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/multi_select_test.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/multi_select_test.js index ba266e621ea..7fd504fb733 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/multi_select_test.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/multi_select_test.js @@ -120,7 +120,7 @@ module.exports = { exec("selectall"); assert.ok(!editor.inMultiSelectMode); - //assert.equal(server.selection.getAllRanges().length, 1); + //assert.equal(editor.selection.getAllRanges().length, 1); }, "test: multiselect navigation": function() { diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/occur.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/occur.js index 7246e1ce5af..d3522ee393e 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/occur.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/occur.js @@ -62,7 +62,7 @@ oop.inherits(Occur, Search); * Enables occur mode. expects that `options.needle` is a search term. * This search term is used to filter out all the lines that include it * and these are then used as the content of a new [[Document - * `Document`]]. The current cursor position of server will be translated + * `Document`]]. The current cursor position of editor will be translated * so that the cursor is on the matching row/column as it was before. * @param {Editor} editor * @param {Object} options options.needle should be a String diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/occur_test.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/occur_test.js index 78365c41b4d..59fb8548b59 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/occur_test.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/occur_test.js @@ -89,7 +89,7 @@ module.exports = { editor.execCommand('occur', {needle: 'o'}); assert.equal(editor.getValue(), 'lo\nwo'); // command install OK? - // assert.ok(server.getReadOnly(), 'occur doc not marked as read only'); + // assert.ok(editor.getReadOnly(), 'occur doc not marked as read only'); assert.ok(editor.getKeyboardHandler().isOccurHandler, 'no occur handler installed'); assert.ok(editor.commands.byName.occurexit, 'no exitoccur command installed'); @@ -97,8 +97,8 @@ module.exports = { editor.execCommand('occurexit'); assert.equal(editor.getValue(), text); - // server state cleaned up? - // assert.ok(!server.getReadOnly(), 'original doc is marked as read only'); + // editor state cleaned up? + // assert.ok(!editor.getReadOnly(), 'original doc is marked as read only'); assert.ok(!editor.getKeyboardHandler().isOccurHandler, 'occur handler installed after detach'); assert.ok(!editor.commands.byName.occurexit, 'exitoccur installed after exiting occur'); }, diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/range.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/range.js index 309e1afc744..1e3af274282 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/range.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/range.js @@ -34,7 +34,7 @@ var comparePoints = function(p1, p2) { return p1.row - p2.row || p1.column - p2.column; }; /** - * This object is used in various places to indicate a region within the server. To better visualize how this works, imagine a rectangle. Each quadrant of the rectangle is analogus to a range, as ranges contain a starting row and starting column, and an ending row, and ending column. + * This object is used in various places to indicate a region within the editor. To better visualize how this works, imagine a rectangle. Each quadrant of the rectangle is analogus to a range, as ranges contain a starting row and starting column, and an ending row, and ending column. * @class Range **/ diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/scrollbar.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/scrollbar.js index 5dad6bcfc18..7e093f05402 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/scrollbar.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/scrollbar.js @@ -86,7 +86,7 @@ var ScrollBar = function(parent) { /** * Creates a new `VScrollBar`. `parent` is the owner of the scroll bar. * @param {DOMElement} parent A DOM element - * @param {Object} renderer An server renderer + * @param {Object} renderer An editor renderer * * @constructor **/ @@ -190,7 +190,7 @@ oop.inherits(VScrollBar, ScrollBar); /** * Creates a new `HScrollBar`. `parent` is the owner of the scroll bar. * @param {DOMElement} parent A DOM element - * @param {Object} renderer An server renderer + * @param {Object} renderer An editor renderer * * @constructor **/ diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/split.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/split.js index 6569699bf67..878b0dc3cf0 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/split.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/split.js @@ -126,9 +126,9 @@ var Split = function(container, theme, splits) { }; /** - * @param {Number} idx The index of the server you want + * @param {Number} idx The index of the editor you want * - * Returns the server identified by the index `idx`. + * Returns the editor identified by the index `idx`. * **/ this.getEditor = function(idx) { @@ -137,7 +137,7 @@ var Split = function(container, theme, splits) { /** * - * Returns the current server. + * Returns the current editor. * @returns {Editor} **/ this.getCurrentEditor = function() { @@ -145,7 +145,7 @@ var Split = function(container, theme, splits) { }; /** - * Focuses the current server. + * Focuses the current editor. * @related Editor.focus **/ this.focus = function() { @@ -153,7 +153,7 @@ var Split = function(container, theme, splits) { }; /** - * Blurs the current server. + * Blurs the current editor. * @related Editor.blur **/ this.blur = function() { @@ -177,8 +177,8 @@ var Split = function(container, theme, splits) { * * @param {String} keybinding * - * Sets the keyboard handler for the server. - * @related server.setKeyboardHandler + * Sets the keyboard handler for the editor. + * @related editor.setKeyboardHandler **/ this.setKeyboardHandler = function(keybinding) { this.$editors.forEach(function(editor) { @@ -243,9 +243,9 @@ var Split = function(container, theme, splits) { /** * * @param {EditSession} session The new edit session - * @param {Number} idx The server's index you're interested in + * @param {Number} idx The editor's index you're interested in * - * Sets a new [[EditSession `EditSession`]] for the indicated server. + * Sets a new [[EditSession `EditSession`]] for the indicated editor. * @related Editor.setSession **/ this.setSession = function(session, idx) { @@ -260,7 +260,7 @@ var Split = function(container, theme, splits) { // split. If it is, we have to clone the session as two editors using // the same session can cause terrible side effects (e.g. UndoQueue goes // wrong). This also gives the user of Split the possibility to treat - // each session on each split server different. + // each session on each split editor different. var isUsed = this.$editors.some(function(editor) { return editor.session === session; }); @@ -270,7 +270,7 @@ var Split = function(container, theme, splits) { } editor.setSession(session); - // Return the session set on the server. This might be a cloned one. + // Return the session set on the editor. This might be a cloned one. return session; }; @@ -299,7 +299,7 @@ var Split = function(container, theme, splits) { }; /** - * Resizes the server. + * Resizes the editor. **/ this.resize = function() { var width = this.$container.clientWidth; diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/theme/crimson_editor.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/theme/crimson_editor.js index e3b74851663..a5971075edf 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/theme/crimson_editor.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/theme/crimson_editor.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = false; exports.cssText = require("../requirejs/text!./crimson_editor.css"); -exports.cssClass = "ace-crimson-server"; +exports.cssClass = "ace-crimson-editor"; var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/theme/github.css b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/theme/github.css index d442b79f5a4..14799227563 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/theme/github.css +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/theme/github.css @@ -83,7 +83,7 @@ box-shadow: 0 0 3px 0px white; } /* bold keywords cause cursor issues for some fonts */ -/* this disables bold style for server and keeps for static highlighter */ +/* this disables bold style for editor and keeps for static highlighter */ .ace-github.ace_nobold .ace_line > span { font-weight: normal !important; } diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/tokenizer.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/tokenizer.js index 0785ae4b7ce..9ae071f22fd 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/tokenizer.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/tokenizer.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { "use strict"; var config = require("./config"); -// tokenizing lines longer than this makes server very slow +// tokenizing lines longer than this makes editor very slow var MAX_TOKEN_COUNT = 2000; /** * This class takes a set of highlighting rules, and creates a tokenizer out of them. For more information, see [the wiki on extending highlighters](https://github.com/ajaxorg/ace/wiki/Creating-or-Extending-an-Edit-Mode#wiki-extendingTheHighlighter). diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/tokenizer_dev.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/tokenizer_dev.js index dd92190ed98..522318fdc2e 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/tokenizer_dev.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/tokenizer_dev.js @@ -31,7 +31,7 @@ define(function(require, exports, module) { var BaseTokenizer = require("./tokenizer").Tokenizer; -// tokenizing lines longer than this makes server very slow +// tokenizing lines longer than this makes editor very slow var MAX_TOKEN_COUNT = 100000; /* * version of Tokenizer with additional logging diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/virtual_renderer.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/virtual_renderer.js index 6c1bcdb541e..638bbe79ae8 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/virtual_renderer.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/ace-editor/virtual_renderer.js @@ -50,13 +50,13 @@ dom.importCssString(editorCss, "ace_editor.css"); /** * The class that is responsible for drawing everything you see on the screen! - * @related server.renderer + * @related editor.renderer * @class VirtualRenderer **/ /** * Constructs a new `VirtualRenderer` within the `container` specified, applying the given `theme`. - * @param {DOMElement} container The root element of the server + * @param {DOMElement} container The root element of the editor * @param {String} theme The starting theme * * @constructor @@ -335,11 +335,11 @@ var VirtualRenderer = function(container, theme) { this.onResize(); }; /** - * [Triggers a resize of the server.]{: #VirtualRenderer.onResize} + * [Triggers a resize of the editor.]{: #VirtualRenderer.onResize} * @param {Boolean} force If `true`, recomputes the size, even if the height and width haven't changed * @param {Number} gutterWidth The width of the gutter in pixels - * @param {Number} width The width of the server in pixels - * @param {Number} height The hiehgt of the server, in pixels + * @param {Number} width The width of the editor in pixels + * @param {Number} height The hiehgt of the editor, in pixels * **/ this.onResize = function(force, gutterWidth, width, height) { @@ -1158,10 +1158,10 @@ var VirtualRenderer = function(container, theme) { /** * - * Scrolls the cursor into the first visibile area of the server + * Scrolls the cursor into the first visibile area of the editor **/ this.scrollCursorIntoView = function(cursor, offset, $viewMargin) { - // the server is not visible + // the editor is not visible if (this.$size.scrollerHeight === 0) return; @@ -1235,7 +1235,7 @@ var VirtualRenderer = function(container, theme) { }; /** - * Gracefully scrolls from the top of the server to the row indicated. + * Gracefully scrolls from the top of the editor to the row indicated. * @param {Number} row A row id * * @related EditSession.setScrollTop @@ -1273,9 +1273,9 @@ var VirtualRenderer = function(container, theme) { }; /** - * Gracefully scrolls the server to the row indicated. + * Gracefully scrolls the editor to the row indicated. * @param {Number} line A line number - * @param {Boolean} center If `true`, centers the server the to indicated line + * @param {Boolean} center If `true`, centers the editor the to indicated line * @param {Boolean} animate If `true` animates scrolling * @param {Function} callback Function to be called after the animation has finished * @@ -1336,7 +1336,7 @@ var VirtualRenderer = function(container, theme) { }; /** - * Scrolls the server to the y pixel indicated. + * Scrolls the editor to the y pixel indicated. * @param {Number} scrollTop The position to scroll to * * @returns {Number} @@ -1351,7 +1351,7 @@ var VirtualRenderer = function(container, theme) { }; /** - * Scrolls the server across the x-axis to the pixel indicated. + * Scrolls the editor across the x-axis to the pixel indicated. * @param {Number} scrollLeft The position to scroll to * * @returns {Number} @@ -1363,7 +1363,7 @@ var VirtualRenderer = function(container, theme) { }; /** - * Scrolls the server across both x- and y-axes. + * Scrolls the editor across both x- and y-axes. * @param {Number} x The x value to scroll to * @param {Number} y The y value to scroll to **/ @@ -1373,7 +1373,7 @@ var VirtualRenderer = function(container, theme) { }; /** - * Scrolls the server across both x- and y-axes. + * Scrolls the editor across both x- and y-axes. * @param {Number} deltaX The x value to scroll by * @param {Number} deltaY The y value to scroll by **/ @@ -1502,7 +1502,7 @@ var VirtualRenderer = function(container, theme) { }; /** - * [Sets a new theme for the server. `theme` should exist, and be a directory path, like `ace/theme/textmate`.]{: #VirtualRenderer.setTheme} + * [Sets a new theme for the editor. `theme` should exist, and be a directory path, like `ace/theme/textmate`.]{: #VirtualRenderer.setTheme} * @param {String} theme The path to a theme * @param {Function} cb optional callback * @@ -1564,12 +1564,12 @@ var VirtualRenderer = function(container, theme) { return this.$themeId; }; - // Methods allows to add / remove CSS classnames to the server element. + // Methods allows to add / remove CSS classnames to the editor element. // This feature can be used by plug-ins to provide a visual indication of - // a certain mode that server is in. + // a certain mode that editor is in. /** - * [Adds a new class, `style`, to the server.]{: #VirtualRenderer.setStyle} + * [Adds a new class, `style`, to the editor.]{: #VirtualRenderer.setStyle} * @param {String} style A class name * **/ @@ -1578,7 +1578,7 @@ var VirtualRenderer = function(container, theme) { }; /** - * [Removes the class `style` from the server.]{: #VirtualRenderer.unsetStyle} + * [Removes the class `style` from the editor.]{: #VirtualRenderer.unsetStyle} * @param {String} style A class name * **/ diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/json-editor_v0.7.28/jsoneditor.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/json-editor_v0.7.28/jsoneditor.js index f9ebb62b463..239545c8ab2 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/json-editor_v0.7.28/jsoneditor.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/commons/lib/json-editor_v0.7.28/jsoneditor.js @@ -258,7 +258,7 @@ JSONEditor.prototype = { } self.validator = new JSONEditor.Validator(self,null,validator_options); - // Create the root server + // Create the root editor var editor_class = self.getEditorClass(self.schema); self.root = self.createEditor(editor_class, { jsoneditor: self, @@ -398,8 +398,8 @@ JSONEditor.prototype = { } }); - if(!classname) throw "Unknown server for schema "+JSON.stringify(schema); - if(!JSONEditor.defaults.editors[classname]) throw "Unknown server "+classname; + if(!classname) throw "Unknown editor for schema "+JSON.stringify(schema); + if(!JSONEditor.defaults.editors[classname]) throw "Unknown editor "+classname; return JSONEditor.defaults.editors[classname]; }, @@ -1528,7 +1528,7 @@ JSONEditor.AbstractEditor = Class.extend({ getButton: function(text, icon, title) { - var btnClass = 'json-server-btn-'+icon; + var btnClass = 'json-editor-btn-'+icon; if(!this.iconlib) icon = null; else icon = this.iconlib.getIcon(icon); @@ -2127,7 +2127,7 @@ JSONEditor.defaults.editors.string = JSONEditor.AbstractEditor.extend({ // Any special formatting that needs to happen after the input is added to the dom window.requestAnimationFrame(function() { - // Skip in case the input is only a temporary server, + // Skip in case the input is only a temporary editor, // otherwise, in the case of an ace_editor creation, // it will generate an error trying to append it to the missing parentNode if(self.input.parentNode) self.afterInputReady(); @@ -2158,9 +2158,9 @@ JSONEditor.defaults.editors.string = JSONEditor.AbstractEditor.extend({ afterInputReady: function() { var self = this, options; - // Code server + // Code editor if(this.source_code) { - // WYSIWYG html and bbcode server + // WYSIWYG html and bbcode editor if(this.options.wysiwyg && ['html','bbcode'].indexOf(this.input_type) >= 0 && window.jQuery && window.jQuery.fn && window.jQuery.fn.sceditor @@ -2177,7 +2177,7 @@ JSONEditor.defaults.editors.string = JSONEditor.AbstractEditor.extend({ self.sceditor_instance = window.jQuery(self.input).sceditor('instance'); self.sceditor_instance.blur(function() { - // Get server's value + // Get editor's value var val = window.jQuery("
"+self.sceditor_instance.val()+"
"); // Remove sceditor spans/divs window.jQuery('#sceditor-start-marker,#sceditor-end-marker,.sceditor-nlf',val).remove(); @@ -2211,7 +2211,7 @@ JSONEditor.defaults.editors.string = JSONEditor.AbstractEditor.extend({ self.onChange(true); }); } - // ACE server for everything else + // ACE editor for everything else else if(window.ace) { var mode = this.input_type; // aliases for c/cpp @@ -2254,7 +2254,7 @@ JSONEditor.defaults.editors.string = JSONEditor.AbstractEditor.extend({ this.serialized = this.value; }, destroy: function() { - // If using SCEditor, destroy the server instance + // If using SCEditor, destroy the editor instance if(this.sceditor_instance) { this.sceditor_instance.destroy(); } @@ -2285,7 +2285,7 @@ JSONEditor.defaults.editors.string = JSONEditor.AbstractEditor.extend({ onWatchedFieldChange: function() { var self = this, vars, j; - // If this server needs to be rendered by a macro template + // If this editor needs to be rendered by a macro template if(this.template) { vars = this.getWatchedFieldValues(); this.setValue(this.template(vars),false,true); @@ -2418,12 +2418,12 @@ JSONEditor.defaults.editors.object = JSONEditor.AbstractEditor.extend({ var found = false; var width = editor.options.hidden? 0 : (editor.options.grid_columns || editor.getNumColumns()); var height = editor.options.hidden? 0 : editor.container.offsetHeight; - // See if the server will fit in any of the existing rows first + // See if the editor will fit in any of the existing rows first for(var i=0; i height)) { found = i; } @@ -2443,7 +2443,7 @@ JSONEditor.defaults.editors.object = JSONEditor.AbstractEditor.extend({ rows[found].editors.push({ key: key, - //server: server, + //editor: editor, width: width, height: height }); @@ -2454,7 +2454,7 @@ JSONEditor.defaults.editors.object = JSONEditor.AbstractEditor.extend({ // Make almost full rows width 12 // Do this by increasing all editors' sizes proprotionately - // Any left over space goes to the biggest server + // Any left over space goes to the biggest editor // Don't touch rows with a width of 6 or less for(i=0; i diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/design-view/constants.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/design-view/constants.js index ae599363e5b..631ef8d6c10 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/design-view/constants.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/design-view/constants.js @@ -17,14 +17,14 @@ */ /** - * Constants to be used by the siddhi server design view + * Constants to be used by the siddhi editor design view */ define(function () { "use strict"; // JS strict mode /** - * Constants used by the siddhi server design-view + * Constants used by the siddhi editor design-view */ var constants = { ALPHABETIC_VALIDATOR_REGEX: /^([a-zA-Z])$/, diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/design-view/design-grid.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/design-view/design-grid.js index 2132df291df..a69fca01ae9 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/design-view/design-grid.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/design-view/design-grid.js @@ -54,7 +54,7 @@ define(['require', 'log', 'jquery', 'backbone', 'lodash', 'designViewUtils', 'dr /** * @class DesignGrid * @constructor - * @class DesignGrid Wraps the Ace server for design view + * @class DesignGrid Wraps the Ace editor for design view * @param {Object} options Rendering options for the view */ var DesignGrid = function (options) { @@ -2727,7 +2727,7 @@ define(['require', 'log', 'jquery', 'backbone', 'lodash', 'designViewUtils', 'dr DesignGrid.prototype.getTooltips = function (designViewJSON) { var self = this; var result = {}; - self.tooltipsURL = window.location.protocol + "//" + window.location.host + "/server/tooltips"; + self.tooltipsURL = window.location.protocol + "//" + window.location.host + "/editor/tooltips"; $.ajax({ type: "POST", url: self.tooltipsURL, diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/design-view/design-view.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/design-view/design-view.js index 6432adf68ae..51301df512a 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/design-view/design-view.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/design-view/design-view.js @@ -23,7 +23,7 @@ define(['require', 'log', 'lodash', 'jquery', 'tool_palette/tool-palette', 'desi /** * @class DesignView * @constructor - * @class DesignView Wraps the Ace server for design view + * @class DesignView Wraps the Ace editor for design view * @param {Object} options Rendering options for the view * @param application Application data * @param jsPlumbInstance js plumb instance for the design grid @@ -208,7 +208,7 @@ define(['require', 'log', 'lodash', 'jquery', 'tool_palette/tool-palette', 'desi responseString: defaultString }; } else { - self.codeToDesignURL = window.location.protocol + "//" + window.location.host + "/server/design-view"; + self.codeToDesignURL = window.location.protocol + "//" + window.location.host + "/editor/design-view"; $.ajax({ type: "POST", url: self.codeToDesignURL, @@ -233,7 +233,7 @@ define(['require', 'log', 'lodash', 'jquery', 'tool_palette/tool-palette', 'desi DesignView.prototype.getCode = function (designViewJSON) { var self = this; var result = {}; - self.designToCodeURL = window.location.protocol + "//" + window.location.host + "/server/code-view"; + self.designToCodeURL = window.location.protocol + "//" + window.location.host + "/editor/code-view"; $.ajax({ type: "POST", url: self.designToCodeURL, diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/design-view/drop-elements.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/design-view/drop-elements.js index 852c2b4f12b..7d9d02a181a 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/design-view/drop-elements.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/design-view/drop-elements.js @@ -25,7 +25,7 @@ define(['require', 'log', 'lodash', 'jquery', 'partition', 'stream', 'query', 'f /** * @class DesignView * @constructor - * @class DesignView Wraps the Ace server for design view + * @class DesignView Wraps the Ace editor for design view * @param {Object} options Rendering options for the view */ diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/design-view/form-builder/form-builder.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/design-view/form-builder/form-builder.js index 16221a205ba..364fc41e696 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/design-view/form-builder/form-builder.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/design-view/form-builder/form-builder.js @@ -23,7 +23,7 @@ define(['require', 'log', 'jquery', 'lodash', 'formUtils', 'streamForm', 'tableF WindowFilterProjectionQueryForm, PatternQueryForm, JoinQueryForm, PartitionForm, SequenceQueryForm, SourceForm, SinkForm, FunctionForm, AppAnnotationForm, Constants) { - // common properties for the JSON server + // common properties for the JSON editor JSONEditor.defaults.options.theme = 'bootstrap3'; JSONEditor.defaults.options.iconlib = 'bootstrap3'; JSONEditor.defaults.options.disable_edit_json = true; diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/design-view/form-builder/form-utils.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/design-view/form-builder/form-utils.js index b9514c5d4c4..863187ece35 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/design-view/form-builder/form-utils.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/design-view/form-builder/form-utils.js @@ -3191,7 +3191,7 @@ define(['require', 'lodash', 'appData', 'log', 'constants', 'handlebar', 'annota }, "themes": { "theme": "default", - "url": "server/commons/lib/js-tree-v3.3.2/themes/default/style.css" + "url": "editor/commons/lib/js-tree-v3.3.2/themes/default/style.css" }, "checkbox": { "three_state": false, @@ -3255,10 +3255,10 @@ define(['require', 'lodash', 'appData', 'log', 'constants', 'handlebar', 'annota tree.create_node(selectedNode, { text: "property", class: "annotation-key", state: {"opened": true}, - "a_attr": {"class": "annotation-key"}, icon: "/server/commons/images/properties.png", + "a_attr": {"class": "annotation-key"}, icon: "/editor/commons/images/properties.png", children: [{ text: "value", class: "annotation-value", "a_attr": {"class": "annotation-value"}, - icon: "/server/commons/images/value.png" + icon: "/editor/commons/images/value.png" }] } ); @@ -3275,13 +3275,13 @@ define(['require', 'lodash', 'appData', 'log', 'constants', 'handlebar', 'annota } tree.create_node(selectedNode, { text: "Annotation", class: "annotation", state: {"opened": true}, - "a_attr": {"class": "annotation"}, icon: "/server/commons/images/annotation.png", + "a_attr": {"class": "annotation"}, icon: "/editor/commons/images/annotation.png", children: [{ - text: "property", class: "annotation-key", icon: "/server/commons/images/properties.png", + text: "property", class: "annotation-key", icon: "/editor/commons/images/properties.png", "a_attr": {"class": "annotation-key"}, children: [{ text: "value", class: "annotation-value", "a_attr": {"class": "annotation-value"}, - icon: "/server/commons/images/value.png" + icon: "/editor/commons/images/value.png" }] }] @@ -4544,7 +4544,7 @@ define(['require', 'lodash', 'appData', 'log', 'constants', 'handlebar', 'annota var self = this; var result = ''; - self.tooltipsURL = window.location.protocol + "//" + window.location.host + "/server/tooltips"; + self.tooltipsURL = window.location.protocol + "//" + window.location.host + "/editor/tooltips"; $.ajax({ type: "POST", url: self.tooltipsURL, diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/design-view/tool-palette/tool-palette.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/design-view/tool-palette/tool-palette.js index deec4cab6cd..2fe6c7bc963 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/design-view/tool-palette/tool-palette.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/design-view/tool-palette/tool-palette.js @@ -45,112 +45,112 @@ define(['require', 'log', 'jquery', 'backbone', 'tool_palette/tool', 'tool_palet id: "stream", className: "stream-drag", title: "Stream", - icon: "/server/images/streams.svg", + icon: "/editor/images/streams.svg", toolGroupName: "Flow Constructs" }, { id: "source", className: "source-drag", title: "Source", - icon: "/server/images/source.svg", + icon: "/editor/images/source.svg", toolGroupName: "I/O" }, { id: "sink", className: "sink-drag", title: "Sink", - icon: "/server/images/sink.svg", + icon: "/editor/images/sink.svg", toolGroupName: "I/O" }, { id: "table", className: "table-drag", title: "Table", - icon: "/server/images/table.svg", + icon: "/editor/images/table.svg", toolGroupName: "Collections" }, { id: "window", className: "window-drag", title: "Window", - icon: "/server/images/window.svg", + icon: "/editor/images/window.svg", toolGroupName: "Collections" }, { id: "trigger", className: "trigger-drag", title: "Trigger", - icon: "/server/images/trigger.svg", + icon: "/editor/images/trigger.svg", toolGroupName: "Flow Constructs" }, { id: "aggregation", className: "aggregation-drag", title: "Aggregation", - icon: "/server/images/aggregate.svg", + icon: "/editor/images/aggregate.svg", toolGroupName: "Collections" }, { id: "projection-query", className: "projection-query-drag", title: "Projection", - icon: "/server/images/query.svg", + icon: "/editor/images/query.svg", toolGroupName: "Queries" }, { id: "filter-query", className: "filter-query-drag", title: "Filter", - icon: "/server/images/filter-query.svg", + icon: "/editor/images/filter-query.svg", toolGroupName: "Queries" }, { id: "window-query", className: "window-query-drag", title: "Window", - icon: "/server/images/window-query.svg", + icon: "/editor/images/window-query.svg", toolGroupName: "Queries" }, { id: "function-query", className: "function-query-drag", title: "Function", - icon: "/server/images/function-query.svg", + icon: "/editor/images/function-query.svg", toolGroupName: "Queries" }, { id: "join-query", className: "join-query-drag", title: "Join", - icon: "/server/images/join-query.svg", + icon: "/editor/images/join-query.svg", toolGroupName: "Queries" }, { id: "pattern-query", className: "pattern-query-drag", title: "Pattern", - icon: "/server/images/pattern-query.svg", + icon: "/editor/images/pattern-query.svg", toolGroupName: "Queries" }, { id : "sequence-query", className : "sequence-query-drag", title : "Sequence", - icon : "/server/images/sequence-query.svg", + icon : "/editor/images/sequence-query.svg", toolGroupName: "Queries" }, { id: "partition", className: "partition-drag", title: "Partition", - icon: "/server/images/partition.svg", + icon: "/editor/images/partition.svg", toolGroupName: "Flow Constructs" }, { id: "function", className: "function-drag", title: "Function", - icon: "/server/images/function.svg", + icon: "/editor/images/function.svg", toolGroupName: "Functions" } ]; diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/event-simulator/constants.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/event-simulator/constants.js index 1abed6ede4b..b92bc1378e2 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/event-simulator/constants.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/event-simulator/constants.js @@ -20,7 +20,7 @@ define(function() { "use strict"; // JS strict mode /** - * Constants used by the tool - server + * Constants used by the tool - editor */ var constants = { ALLOWED_KEYS: ["Delete", "ArrowRight", "ArrowLeft", "Backspace"], diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/event-simulator/simulator-rest-client.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/event-simulator/simulator-rest-client.js index 2a6b0e445d0..e9aef945ec2 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/event-simulator/simulator-rest-client.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/event-simulator/simulator-rest-client.js @@ -28,7 +28,7 @@ define(["jquery"], function (jQuery) { self.HTTP_PUT = "PUT"; self.HTTP_DELETE = "DELETE"; self.simulatorUrl = window.location.protocol + "//" + window.location.host + "/simulation"; - self.editorUrl = window.location.protocol + "//" + window.location.host + '/server'; + self.editorUrl = window.location.protocol + "//" + window.location.host + '/editor'; self.retrieveSiddhiAppNames = function (successCallback, errorCallback) { diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/guide/constants.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/guide/constants.js index 435be5114e0..166c5aa3d20 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/guide/constants.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/guide/constants.js @@ -17,7 +17,7 @@ */ /** - * Constants to be used by the siddhi server tour guide + * Constants to be used by the siddhi editor tour guide */ define(function () { @@ -30,7 +30,7 @@ define(function () { CONTENT: '@App:name(\'SweetFactory\')\n' + '@App:description(\'Description of the plan\')\n' + '\n' + - '-- Please refer to https://docs.wso2.com/display/SP430/Quick+Start+Guide on getting started with SP server. \n' + + '-- Please refer to https://docs.wso2.com/display/SP430/Quick+Start+Guide on getting started with SP editor. \n' + '\n' + 'define stream SweetProductionStream (name string, amount long);\n' + '@sink(type = \'log\', \n' + diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/launcher/launch-manager.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/launcher/launch-manager.js index 1bdda313ded..984c9476b89 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/launcher/launch-manager.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/launcher/launch-manager.js @@ -24,7 +24,7 @@ define(['require', 'jquery', 'backbone', 'lodash', 'event_channel', 'console' ], this.enable = false; this.channel = undefined; this.active = false; - this.baseurl = window.location.protocol + "//" + window.location.host + "/server/"; + this.baseurl = window.location.protocol + "//" + window.location.host + "/editor/"; }; LaunchManager.prototype = Object.create(EventChannel.prototype); diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/operator-finder/operator-finder.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/operator-finder/operator-finder.js index 4158f472647..0155af7f5a0 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/operator-finder/operator-finder.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/operator-finder/operator-finder.js @@ -16,7 +16,7 @@ * under the License. */ -define(['jquery', 'lodash', 'log', 'handlebar', 'designViewUtils', 'app/source-server/completion-engine'], +define(['jquery', 'lodash', 'log', 'handlebar', 'designViewUtils', 'app/source-editor/completion-engine'], function ($, _, log, Handlebars, DesignViewUtils, CompletionEngine) { /** * Load operators from the Completion engine. diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/antlr-worker.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/antlr-worker.js index 4dcbafb60c4..56b3fa5cdde 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/antlr-worker.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/antlr-worker.js @@ -69,7 +69,7 @@ var SiddhiEditor = {}; } /** - * Run on server change tasks + * Run on editor change tasks * * @param {object} data Editor change data received */ @@ -223,12 +223,12 @@ var SiddhiEditor = {}; var TokenTooltipPointRecognitionListener = require(SiddhiEditor.constants.antlr.ROOT + SiddhiEditor.constants.antlr.SIDDHI_TOKEN_TOOL_TIP_UPDATE_LISTENER).TokenTooltipPointRecognitionListener; /** - * Run on server change tasks + * Run on editor change tasks * Creates the parse tree and walks it for recognizing syntax errors and completion engine's data * Syntax errors list will be passed to the main js after finding them * Completion Engine's data will be passed to the main js after finding them * - * @param {string} editorText Text in the server for which the parse tree will be generated + * @param {string} editorText Text in the editor for which the parse tree will be generated */ walker.onEditorChange = function (editorText) { // Following code segment parse the input query using antlr4's parser and lexer @@ -243,10 +243,10 @@ var SiddhiEditor = {}; parser._listeners.push(errorListener); parser.buildParseTrees = true; - // Syntax errors in parsing are stored in server.state.syntaxErrorList + // Syntax errors in parsing are stored in editor.state.syntaxErrorList lastParseTree = parser.parse(); - // Adding the syntax errors identified into the server gutter + // Adding the syntax errors identified into the editor gutter renderer.notifyParseTreeWalkingCompletion(walker.syntaxErrorList); // If there are no syntax errors, walk the parse tree to generate completion data diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/antlr/DataPopulationListener.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/antlr/DataPopulationListener.js index 2fb82decf0b..ac6cca4aa7f 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/antlr/DataPopulationListener.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/antlr/DataPopulationListener.js @@ -26,7 +26,7 @@ var SiddhiQLListener = require('./gen/SiddhiQLListener').SiddhiQLListener; * THe data is stored in the main js * * @constructor - * @param walker The server for which this listener is populating data + * @param walker The editor for which this listener is populating data */ function DataPopulationListener(walker) { SiddhiQLListener.call(this); // inherit default listener @@ -248,12 +248,12 @@ DataPopulationListener.prototype.exitExecution_element = function (ctx) { }; /** - * Add a statement to the server.completionEngine.statementsList array + * Add a statement to the editor.completionEngine.statementsList array * endOfStatementToken is added at the end of the statement if provided * Statements list is used in sending statement by statement for validation * Also the statements list is used for getting the last statement for completions * - * @param {object} walker The server which holds the statements list to which the statement is added + * @param {object} walker The editor which holds the statements list to which the statement is added * @param {object} ctx The ANTLR context which will be used in getting the statement * @param [endOfStatementToken] The token to be appended at the end of the statement */ diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/antlr/SyntaxErrorListener.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/antlr/SyntaxErrorListener.js index 74f0bf5ddf0..2fdb848da7b 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/antlr/SyntaxErrorListener.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/antlr/SyntaxErrorListener.js @@ -23,7 +23,7 @@ var ErrorListener = require("../antlr4-js-runtime/error/ErrorListener").ErrorLis * Inherits from ErrorListener in the antlr4 JS runtime * * Only recognizing syntax errors is done by this listener - * Errors are added to the ace server gutter in the main js + * Errors are added to the ace editor gutter in the main js * * Semantic errors such as invalid extension names is not recognized by this listener * These errors are recognized using a server side ajax call to validate using the Siddhi engine diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/completion-engine.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/completion-engine.js index 605840e00cd..64815ec7afe 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/completion-engine.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/completion-engine.js @@ -137,7 +137,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "ace/snippets", "ace/rang */ /* - * Snippets to be used in the ace server at the start of a statement + * Snippets to be used in the ace editor at the start of a statement */ var generalInitialSnippets = aceModules.snippetManager.parseSnippetFile("#Define Statements\n" + "snippet define-Stream\n" + @@ -195,7 +195,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "ace/snippets", "ace/rang ); /* - * Snippets to be used in the ace server at the start of a statement and at the start of a query inside partitions + * Snippets to be used in the ace editor at the start of a statement and at the start of a query inside partitions */ var queryInitialSnippets = aceModules.snippetManager.parseSnippetFile( "snippet query-Filter\n" + @@ -923,7 +923,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "ace/snippets", "ace/rang * The relevant part of the query the user is in will be tested again using regexps * * @param {string[]} regexResults Regex results from the regex test in the main rule base matching - * @param {string} fullEditorText Complete server text before the cursor + * @param {string} fullEditorText Complete editor text before the cursor */ self.$aggregationDefinition = function (regexResults, fullEditorText) { // Find the part of the query in which the cursor is at @@ -956,7 +956,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "ace/snippets", "ace/rang * Handle the standard stream suggestions for aggregation definitions * @private * @param {string[]} regexResults Array of groups from the regex execution of the aggregation definition - * @param {string} fullEditorText Complete server text before the cursor + * @param {string} fullEditorText Complete editor text before the cursor */ function handleAggregationDefinitionStandardStreamSuggestions(regexResults, fullEditorText) { var aggregationInput = regexResults[4]; @@ -1070,7 +1070,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "ace/snippets", "ace/rang * * @private * @param {string[]} regexResults Array of groups from the regex execution of the aggregation definition - * @param {string} fullEditorText Complete server text before the cursor + * @param {string} fullEditorText Complete editor text before the cursor */ function handleAggregationDefinitionSelectionSuggestions(regexResults, fullEditorText) { var aggregationSelectionClause = regexResults[6]; @@ -1139,7 +1139,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "ace/snippets", "ace/rang * * @private * @param {string[]} regexResults Array of groups from the regex execution of the aggregation definition - * @param {string} fullEditorText Complete server text before the cursor + * @param {string} fullEditorText Complete editor text before the cursor */ function handleAggregationDefinitionGroupBySuggestions(regexResults, fullEditorText) { var groupByClause = regexResults[8]; @@ -1175,7 +1175,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "ace/snippets", "ace/rang * * @private * @param {string[]} regexResults Array of groups from the regex execution of the aggregation definition - * @param {string} fullEditorText Complete server text before the cursor + * @param {string} fullEditorText Complete editor text before the cursor */ function handleAggregationDefinitionBySuggestions(regexResults, fullEditorText) { var byClause = regexResults[11]; @@ -1233,7 +1233,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "ace/snippets", "ace/rang * The relevant part of the query the user is in will be tested again using regexps * * @param {string[]} regexResults Regex results from the regex test in the main rule base matching - * @param {string} fullEditorText Complete server text before the cursor + * @param {string} fullEditorText Complete editor text before the cursor */ self.$query = function (regexResults, fullEditorText) { // Find the part of the query in which the cursor is at @@ -1281,7 +1281,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "ace/snippets", "ace/rang * * @private * @param {string[]} regexResults Array of groups from the regex execution of the query - * @param {string} fullEditorText Complete server text before the cursor + * @param {string} fullEditorText Complete editor text before the cursor */ function handleQueryInputSuggestions(regexResults, fullEditorText) { var queryInput = regexResults[4]; @@ -1524,7 +1524,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "ace/snippets", "ace/rang * * @private * @param {string[]} regexResults Array of groups from the regex execution of the query - * @param {string} fullEditorText Complete server text before the cursor + * @param {string} fullEditorText Complete editor text before the cursor */ function handleQuerySelectionSuggestions(regexResults, fullEditorText) { var querySelectionClause = regexResults[6]; @@ -1597,7 +1597,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "ace/snippets", "ace/rang * * @private * @param {string[]} regexResults Array of groups from the regex execution of the query - * @param {string} fullEditorText Complete server text before the cursor + * @param {string} fullEditorText Complete editor text before the cursor */ function handleGroupBySuggestions(regexResults, fullEditorText) { var groupByClause = regexResults[8]; @@ -1637,7 +1637,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "ace/snippets", "ace/rang * * @private * @param {string[]} regexResults Array of groups from the regex execution of the query - * @param {string} fullEditorText Complete server text before the cursor + * @param {string} fullEditorText Complete editor text before the cursor */ function handleHavingSuggestions(regexResults, fullEditorText) { var havingClause = regexResults[10]; @@ -1676,7 +1676,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "ace/snippets", "ace/rang * * @private * @param {string[]} regexResults Array of groups from the regex execution of the query - * @param {string} fullEditorText Complete server text before the cursor + * @param {string} fullEditorText Complete editor text before the cursor */ function handleOrderBySuggestions(regexResults, fullEditorText) { var orderByClause = regexResults[12]; @@ -1715,7 +1715,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "ace/snippets", "ace/rang * * @private * @param {string[]} regexResults Array of groups from the regex execution of the query - * @param {string} fullEditorText Complete server text before the cursor + * @param {string} fullEditorText Complete editor text before the cursor */ function handleLimitSuggestions(regexResults, fullEditorText) { var limitClause = regexResults[14]; @@ -1806,7 +1806,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "ace/snippets", "ace/rang * * @private * @param {string[]} regexResults Array of groups from the regex execution of the query - * @param {string} fullEditorText Complete server text before the cursor + * @param {string} fullEditorText Complete editor text before the cursor */ function handleQueryInsertIntoSuggestions(regexResults, fullEditorText) { var streamOutputClause = regexResults[18]; @@ -1898,7 +1898,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "ace/snippets", "ace/rang * * @private * @param {string[]} regexResults Array of groups from the regex execution of the query - * @param {string} fullEditorText Complete server text before the cursor + * @param {string} fullEditorText Complete editor text before the cursor */ function handleQueryUpdateOrInsertIntoDeleteUpdateSuggestions(regexResults, fullEditorText) { var tableOutputClause = regexResults[18]; @@ -2018,7 +2018,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "ace/snippets", "ace/rang * Get the current partition index * Partition index indicates the index in the order they are found in the siddhi App * - * @param {string} fullEditorText The full server text before the cursor + * @param {string} fullEditorText The full editor text before the cursor * @return {number} */ function getTheCurrentPartitionIndex(fullEditorText) { @@ -2177,7 +2177,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "ace/snippets", "ace/rang * * @private * @param {string[]} regexResults Array of groups from the regex execution of the query - * @param {string} fullEditorText Complete server text before the cursor + * @param {string} fullEditorText Complete editor text before the cursor * @param {int} attributePriority priority to be set as attribute priority * @param {int} streamPriority priority to be set as stream priority */ @@ -2210,7 +2210,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "ace/snippets", "ace/rang * * @private * @param {string[]} regexResults Array of groups from the regex execution of the query - * @param {string} fullEditorText Complete server text before the cursor + * @param {string} fullEditorText Complete editor text before the cursor * @param {int} attributePriority priority to be set as attribute priority * @param {int} streamPriority priority to be set as stream priority * @param {string[]} sourceTypes Source types to search for. Should be a subset of [constants.STREAMS, @@ -2242,7 +2242,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "ace/snippets", "ace/rang * * @private * @param {string[]} regexResults Array of groups from the regex execution of the query - * @param {string} fullEditorText Complete server text before the cursor + * @param {string} fullEditorText Complete editor text before the cursor * @param {int} attributePriority priority to be set as attribute priority * @param {int} streamPriority priority to be set as stream priority */ @@ -2273,7 +2273,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "ace/snippets", "ace/rang * * @private * @param {string[]} regexResults Array of groups from the regex execution of the query - * @param {string} fullEditorText Complete server text before the cursor + * @param {string} fullEditorText Complete editor text before the cursor * @param {int} attributePriority priority to be set as attribute priority * @param {int} streamPriority priority to be set as stream priority */ @@ -2302,7 +2302,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "ace/snippets", "ace/rang * * @private * @param {string[]} regexResults Array of groups from the regex execution of the query - * @param {string} fullEditorText Complete server text before the cursor + * @param {string} fullEditorText Complete editor text before the cursor * @param {int} attributePriority priority to be set as attribute priority * @param {int} streamPriority priority to be set as stream priority * @param {string[]} sourceTypes Source types to search for. Should be a subset of @@ -2334,7 +2334,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "ace/snippets", "ace/rang * * @private * @param {string[]} regexResults Array of groups from the regex execution of the query - * @param {string} fullEditorText Complete server text before the cursor + * @param {string} fullEditorText Complete editor text before the cursor * @param {string[]} sources Array of streams of which attributes will be added * @param {int} attributePriority priority to be set as attribute priority * @param {int} sourcePriority priority to be set as source priority @@ -2394,7 +2394,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "ace/snippets", "ace/rang * * @private * @param {string[]} regexResults Array of groups from the regex execution of the query - * @param {string} fullEditorText Complete server text before the cursor + * @param {string} fullEditorText Complete editor text before the cursor * @param {string[]} sourceToStreamMap Array of streams of which attributes will be added * @param {int} attributePriority priority to be set as attribute priority * @param {int} sourcePriority priority to be set as source priority @@ -2659,7 +2659,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "ace/snippets", "ace/rang * * @private * @param {string[]} regexResults Array of groups from the regex execution of the query - * @param {string} fullEditorText Complete server text before the cursor + * @param {string} fullEditorText Complete editor text before the cursor * @param {Object|Object[]} sourceName name of the source of which attributes are returned * @param {string[]} sourceTypes Source types to search for. Should be a subset of [constants.STREAMS, * constants.AGGREGATIONS, constants.EVENT_TABLES, constants.WINDOWS, constants.EVAL_SCRIPTS, @@ -2727,7 +2727,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "ace/snippets", "ace/rang * * @private * @param {string[]} regexResults Array of groups from the regex execution of the query - * @param {string} fullEditorText Complete server text before the cursor + * @param {string} fullEditorText Complete editor text before the cursor * @param {string} sourceName name of the source of which attributes are returned * @param {string[]} sourceTypes Source types to search for. Should be a subset of * [constants.STREAMS, constants.EVENT_TABLES, constants.WINDOWS, constants.EVAL_SCRIPTS, @@ -2752,7 +2752,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "ace/snippets", "ace/rang * * @private * @param {string[]} regexResults Array of groups from the regex execution of the query - * @param {string} fullEditorText Complete server text before the cursor + * @param {string} fullEditorText Complete editor text before the cursor * @param {string} sourceName Name of the source to fetch * @param {string[]} sourceTypes Source types to search for. Should be a subset of * [constants.STREAMS, constants.EVENT_TABLES, constants.WINDOWS, constants.EVAL_SCRIPTS, @@ -3061,7 +3061,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "ace/snippets", "ace/rang /** * Prepare a snippet from the processor - * Snippets are objects that can be passed into the ace server to add snippets to the completions provided + * Snippets are objects that can be passed into the ace editor to add snippets to the completions provided * * @private * @param {Object} processorMetaData The processor object with relevant parameters diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/constants.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/constants.js index 434b9121330..9dd548423f6 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/constants.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/constants.js @@ -17,7 +17,7 @@ */ /** - * Constants to be used by the siddhi server and the siddhi web worker + * Constants to be used by the siddhi editor and the siddhi web worker * This is not directly imported by the web worker since some of the constants are initiated using the window object * The SiddhiEditor.constants in passed into the web worker when the siddhi worker is initialized */ @@ -26,7 +26,7 @@ define(function() { "use strict"; // JS strict mode /** - * Constants used by the server + * Constants used by the editor */ var constants = { SOURCE: "source", @@ -53,7 +53,7 @@ define(function() { // Server side validation related constants - constants.SERVER_URL = window.location.protocol + "//" + window.location.host + "/server/"; + constants.SERVER_URL = window.location.protocol + "//" + window.location.host + "/editor/"; constants.SERVER_SIDE_VALIDATION_DELAY = 1000; // Token tooltips are also updated after this delay constants.TOOLTIP_SHOW_DELAY = 1000; // Time the user needs to hover the mouse to get the tooltip @@ -63,7 +63,7 @@ define(function() { }; /* - * Names displayed in the server + * Names displayed in the editor */ constants.typeToDisplayNameMap = {}; constants.typeToDisplayNameMap[constants.FUNCTIONS] = "Function"; @@ -82,7 +82,7 @@ define(function() { constants.typeToDisplayNameMap[constants.AGGREGATIONS] = "Aggregation"; /* - * Ace server library related constants + * Ace editor library related constants */ constants.ace = { SNIPPET_MANAGER: "ace/snippets", diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/debug-rest-client.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/debug-rest-client.js index 28650f4709a..a9a0ca129b2 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/debug-rest-client.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/debug-rest-client.js @@ -29,7 +29,7 @@ define(["jquery"], function (jQuery) { self.DATA_TYPE_JzSON = "json"; self.CONTENT_TYPE_JSON = "application/json"; self.RESPONSE_ELEMENT = "responseJSON"; - self.serverUrl = window.location.protocol + "//" + window.location.host + "/server"; + self.serverUrl = window.location.protocol + "//" + window.location.host + "/editor"; self.start = function (siddhiAppName, callback, error) { jQuery.ajax({ diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/editor.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/editor.js index 8b4455e7091..4cb4b470771 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/editor.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/editor.js @@ -15,8 +15,8 @@ */ /* - * This module contains the integration code segment of Siddhi server. - * This will set the options of ACE server, attach client side parser and attach SiddhiCompletion Engine with the server + * This module contains the integration code segment of Siddhi editor. + * This will set the options of ACE editor, attach client side parser and attach SiddhiCompletion Engine with the server */ define(["ace/ace", "jquery", "./constants", "./utils", "./completion-engine", "./token-tooltip", "ace/ext/language_tools", "./debug-rest-client", "log", 'ace/range'], @@ -64,14 +64,14 @@ define(["ace/ace", "jquery", "./constants", "./utils", "./completion-engine", ". /* * Setting the language mode to siddhi * - * Language mode is located at ace-server/mode/siddhi.js - * Highlight style is located at ace-server/mode/siddhi_highlight_rules.js.js - * Folding is located at ace-server/mode/folding/siddhi.js - * Snippets are located at ace-server/snippets/siddhi.js + * Language mode is located at ace-editor/mode/siddhi.js + * Highlight style is located at ace-editor/mode/siddhi_highlight_rules.js.js + * Folding is located at ace-editor/mode/folding/siddhi.js + * Snippets are located at ace-editor/snippets/siddhi.js */ aceEditor.session.setMode(constants.ace.SIDDHI_MODE); - // Setting the server options + // Setting the editor options aceEditor.setReadOnly(config.readOnly); aceEditor.setTheme(config.theme ? "ace/theme/" + config.theme : constants.ace.DEFAULT_THEME); aceEditor.getSession().setUseWrapMode(true); @@ -100,7 +100,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "./completion-engine", ". self.completionEngine = new CompletionEngine(); self.rawExtensions = CompletionEngine.rawExtensions; - // Attaching server's onChange event handler + // Attaching editor's onChange event handler aceEditor.getSession().on('change', editorChangeHandler); // For adjusting the completer list as required @@ -112,7 +112,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "./completion-engine", ". // Adding events for adjusting the completions list styles // This is used for showing different styles for different types of completions aceEditor.renderer.on("afterRender", function () { - // Checking if a popup is open when the server is re-rendered + // Checking if a popup is open when the editor is re-rendered if (aceEditor.completer && aceEditor.completer.popup) { // Adding a on after render event for updating the popup styles aceEditor.completer.popup.renderer.on("afterRender", function () { @@ -151,26 +151,26 @@ define(["ace/ace", "jquery", "./constants", "./utils", "./completion-engine", ". }; /** - * Returns the ace server object - * Can be used for getting the ace server object and making custom changes + * Returns the ace editor object + * Can be used for getting the ace editor object and making custom changes */ self.getAceEditorObject = function () { return aceEditor; }; /** - * Returns the content in the ace server when the method is invoked + * Returns the content in the ace editor when the method is invoked * - * @return {string} Content in the server when the method is invoked + * @return {string} Content in the editor when the method is invoked */ self.getContent = function () { return aceEditor.getValue(); }; /** - * Sets the content in the ace server + * Sets the content in the ace editor * - * @param {string} content Content to set into the ace server + * @param {string} content Content to set into the ace editor */ self.setContent = function (content) { aceEditor.setValue((content ? content : ""), 1); @@ -309,7 +309,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "./completion-engine", ". type: "error" })]; - // Show the errors in the ace server gutter + // Show the errors in the ace editor gutter aceEditor.session.setAnnotations( self.state.semanticErrorList .concat(self.state.syntaxErrorList) @@ -323,7 +323,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "./completion-engine", ". type: "error" })]; - // Show the errors in the ace server gutter + // Show the errors in the ace editor gutter aceEditor.session.setAnnotations( self.state.semanticErrorList .concat(self.state.syntaxErrorList) @@ -466,7 +466,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "./completion-engine", ". if (worker) { worker.terminate(); } - worker = new Worker("/server/js/source-server/antlr-worker.js"); + worker = new Worker("/editor/js/source-editor/antlr-worker.js"); self.init(); }; @@ -488,10 +488,10 @@ define(["ace/ace", "jquery", "./constants", "./utils", "./completion-engine", ". }; /** - * Run on server's change + * Run on editor's change * Send message to the worker to create the parse tree and generate completion engine data * - * @param {string} editorText Text in the server after the change + * @param {string} editorText Text in the editor after the change */ var editorChangeDelayTimer; self.onEditorChange = function (editorText) { @@ -520,7 +520,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "./completion-engine", ". /** * Siddhi Debugger prototype - * Siddhi Debugger is used to debug current query in the server + * Siddhi Debugger is used to debug current query in the editor * * @param {object} aceEditor The Ace Editor object * @return {Debugger} Siddhi Debugger instance @@ -809,7 +809,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "./completion-engine", ". * Message handler prototype * Message handler is used by the siddhi worker * - * @param {object} editor The server object + * @param {object} editor The editor object * @return {MessageHandler} Message handler instance * @constructor */ @@ -907,7 +907,7 @@ define(["ace/ace", "jquery", "./constants", "./utils", "./completion-engine", ". /** * Token tooltips generator prototype * - * @param {object} editor The server object + * @param {object} editor The editor object * @return {TokenTooltipUpdater} Token tooltip generator instance * @constructor */ @@ -1155,7 +1155,6 @@ define(["ace/ace", "jquery", "./constants", "./utils", "./completion-engine", ". var aggregationName = tooltipData.aggregationName; var aggregation = editor.completionEngine.aggregationsList[aggregationName]; - //var details = server.incompleteData.aggregationsList; if (aggregation && aggregation.description) { updateTokenTooltip(row, column, aggregation.description); } diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/token-tooltip.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/token-tooltip.js index 069df123c5c..e175f203a73 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/token-tooltip.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/token-tooltip.js @@ -15,13 +15,13 @@ */ /* - * Taken from ace server demos and updated to suit the siddhi server + * Taken from ace editor demos and updated to suit the siddhi editor * Generates the token tool tips on mouse over */ /* * Generating tooltips when user hovers over a token - * The tooltip content is set in siddhi-server.js + * The tooltip content is set in siddhi-editor.js */ define(["ace/lib/dom", "ace/lib/oop", "ace/lib/event", "ace/range", "ace/tooltip", "./constants", "exports"], function (dom, oop, event, range, tooltip, constants, exports) { @@ -84,7 +84,7 @@ define(["ace/lib/dom", "ace/lib/oop", "ace/lib/event", "ace/range", "ace/tooltip } /* - * This had been added to suit the siddhi server implementation of token tool tips + * This had been added to suit the siddhi editor implementation of token tool tips */ var tokenText = token.tooltip; if (tokenText) { diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/utils.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/utils.js index 7085d216810..5d1a8e203ba 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/utils.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/source-editor/utils.js @@ -15,7 +15,7 @@ */ /* - * Utility functions to be used by the siddhi server and the siddhi web worker + * Utility functions to be used by the siddhi editor and the siddhi web worker */ define(["./constants"], function (constants) { diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/tab/service-tab.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/tab/service-tab.js index f4dff3d85c9..556781bde1a 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/tab/service-tab.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/tab/service-tab.js @@ -90,7 +90,7 @@ define(['require', 'log', 'jquery', 'lodash', './tab','workspace','toolEditor',' toolEditor.render(); this.app.workspaceManager.updateUndoRedoMenus(); - // bind app commands to source server commands + // bind app commands to source editor commands this.app.commandManager.getCommands().forEach(function(command){ toolEditor.getSourceView().bindCommand(command); }); diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/tool-editor/constants.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/tool-editor/constants.js index 995c553f7e1..b7b65753838 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/tool-editor/constants.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/tool-editor/constants.js @@ -21,12 +21,12 @@ define(function() { "use strict"; // JS strict mode /** - * Constants used by the tool - server + * Constants used by the tool - editor */ var constants = { INITIAL_SOURCE_INSTRUCTIONS: "@App:name(\"SiddhiApp\")\n@App:description(\"Description of the plan\")\n\n" + "-- Please refer to https://docs.wso2.com/display/SP400/Quick+Start+Guide " + - "on getting started with SP server. \n\n" + "on getting started with SI editor. \n\n" }; return constants; diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/tool-editor/module.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/tool-editor/module.js index 193672d7014..fc03fbda917 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/tool-editor/module.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/tool-editor/module.js @@ -15,7 +15,7 @@ * specific language governing permissions and limitations * under the License. */ -define(['require', 'app/tool-server/views/module'], +define(['require', 'app/tool-editor/views/module'], function (require,views) { return { Views: views diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/tool-editor/views/source.js b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/tool-editor/views/source.js index 89aadc9302c..19fa235149c 100644 --- a/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/tool-editor/views/source.js +++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/resources/web/js/tool-editor/views/source.js @@ -15,17 +15,17 @@ * specific language governing permissions and limitations * under the License. */ -define(['require', 'log', 'lodash', 'jquery', 'event_channel', 'app/source-server/server', 'ace/ace', +define(['require', 'log', 'lodash', 'jquery', 'event_channel', 'app/source-editor/editor', 'ace/ace', 'ace/ext/beautify/siddhi_rules'], function (require, log, _, $, EventChannel, SiddhiEditor, ace, beautify) { /** * @class SourceView * @constructor - * @class SourceView Wraps the Ace server for source view + * @class SourceView Wraps the Ace editor for source view * @param {Object} args - Rendering args for the view - * @param {String} args.container - selector for div element to render ace server - * @param {String} [args.content] - initial content for the server + * @param {String} args.container - selector for div element to render ace editor + * @param {String} [args.content] - initial content for the editor */ var SourceView = function (args) { this._options = args; @@ -91,8 +91,8 @@ define(['require', 'log', 'lodash', 'jquery', 'event_channel', 'app/source-serve /** - * Set the content of text server. - * @param {String} content - content for the server. + * Set the content of text editor. + * @param {String} content - content for the editor. * */ SourceView.prototype.setContent = function(content){ @@ -119,7 +119,7 @@ define(['require', 'log', 'lodash', 'jquery', 'event_channel', 'app/source-serve }; /** - * Binds a shortcut to ace server so that it will trigger the command on source view upon key press. + * Binds a shortcut to ace editor so that it will trigger the command on source view upon key press. * All the commands registered app's command manager will be bound to source view upon render. * * @param command {Object}