From 9eb88d8dafbcf217e9647dd251a92cd141f62b6b Mon Sep 17 00:00:00 2001 From: Valeriy Svydenko Date: Wed, 27 Jun 2018 14:30:53 +0200 Subject: [PATCH 1/4] CHE-8555: Hide LS hovers when dialog window is opened (#90) --- che-orion-editor/pom.xml | 49 +++++++++++++++++++ .../src/main/patches/add_hide_tooltip.diff | 19 +++++++ 2 files changed, 68 insertions(+) create mode 100644 che-orion-editor/src/main/patches/add_hide_tooltip.diff diff --git a/che-orion-editor/pom.xml b/che-orion-editor/pom.xml index 11bd797c..ce907189 100644 --- a/che-orion-editor/pom.xml +++ b/che-orion-editor/pom.xml @@ -32,6 +32,55 @@ + + + org.apache.maven.plugins + maven-patch-plugin + 1.1.1 + + + bugfix-patches + compile + + apply + + + ${patches.location} + + add_hide_tooltip.diff + fix_linked_mode.diff + fix_focus.diff + fix_goto_line.diff + fix_scrolling.diff + + false + true + 1 + ${project.build.directory}/classes + + + + + + + + + maven-antrun-plugin + + + replace + compile + + run + + + + + + + + + com.mycila license-maven-plugin diff --git a/che-orion-editor/src/main/patches/add_hide_tooltip.diff b/che-orion-editor/src/main/patches/add_hide_tooltip.diff new file mode 100644 index 00000000..717e7e64 --- /dev/null +++ b/che-orion-editor/src/main/patches/add_hide_tooltip.diff @@ -0,0 +1,19 @@ +This patch adds ability to hide opened tooltips. +=================================================================== +diff --git a/org/eclipse/che/orion/public/built-codeEdit/code_edit/built-codeEdit-amd.js b/org/eclipse/che/orion/public/built-codeEdit/code_edit/built-codeEdit-amd.js +--- a/org/eclipse/che/orion/public/built-codeEdit/code_edit/built-codeEdit-amd.js ++++ b/org/eclipse/che/orion/public/built-codeEdit/code_edit/built-codeEdit-amd.js +@@ -28631,6 +28631,13 @@ define("orion/editor/editor", [ //$NON-NLS-0$ + getTooltip: function() { + return mTooltip.Tooltip.getTooltip(this._textView, this); + }, ++ /** ++ * Hides opened tooltip. ++ */ ++ hideTooltip: function() { ++ var tooltip = mTooltip.Tooltip.getTooltip(this._textView, this); ++ tooltip.hide(true); ++ }, + /** + * Returns the zoom ruler of the editor. + * From 940b8d27bd14fcf57b7b8450fb57ca4028b229a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=A4der?= Date: Tue, 31 Jul 2018 11:24:41 +0200 Subject: [PATCH 2/4] Removed jdt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Mäder --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4210f0f9..096953e6 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,6 @@ che-tomcat8-slf4j-logback swagger - org-eclipse-jdt-core-repack che-orion-editor che-terminal-client antlr-java5-grammar From 7a84d134771b21cf682eb7b9217370e994c26af1 Mon Sep 17 00:00:00 2001 From: Valeriy Svydenko Date: Thu, 23 Aug 2018 00:05:37 +0300 Subject: [PATCH 3/4] Avoid patching during the build (#107) Signed-off-by: Valeriy Svydenko --- che-orion-editor/pom.xml | 49 ------------------- .../src/main/patches/add_hide_tooltip.diff | 19 ------- .../code_edit/built-codeEdit-amd.js | 9 ++++ 3 files changed, 9 insertions(+), 68 deletions(-) delete mode 100644 che-orion-editor/src/main/patches/add_hide_tooltip.diff diff --git a/che-orion-editor/pom.xml b/che-orion-editor/pom.xml index ce907189..11bd797c 100644 --- a/che-orion-editor/pom.xml +++ b/che-orion-editor/pom.xml @@ -32,55 +32,6 @@ - - - org.apache.maven.plugins - maven-patch-plugin - 1.1.1 - - - bugfix-patches - compile - - apply - - - ${patches.location} - - add_hide_tooltip.diff - fix_linked_mode.diff - fix_focus.diff - fix_goto_line.diff - fix_scrolling.diff - - false - true - 1 - ${project.build.directory}/classes - - - - - - - - - maven-antrun-plugin - - - replace - compile - - run - - - - - - - - - com.mycila license-maven-plugin diff --git a/che-orion-editor/src/main/patches/add_hide_tooltip.diff b/che-orion-editor/src/main/patches/add_hide_tooltip.diff deleted file mode 100644 index 717e7e64..00000000 --- a/che-orion-editor/src/main/patches/add_hide_tooltip.diff +++ /dev/null @@ -1,19 +0,0 @@ -This patch adds ability to hide opened tooltips. -=================================================================== -diff --git a/org/eclipse/che/orion/public/built-codeEdit/code_edit/built-codeEdit-amd.js b/org/eclipse/che/orion/public/built-codeEdit/code_edit/built-codeEdit-amd.js ---- a/org/eclipse/che/orion/public/built-codeEdit/code_edit/built-codeEdit-amd.js -+++ b/org/eclipse/che/orion/public/built-codeEdit/code_edit/built-codeEdit-amd.js -@@ -28631,6 +28631,13 @@ define("orion/editor/editor", [ //$NON-NLS-0$ - getTooltip: function() { - return mTooltip.Tooltip.getTooltip(this._textView, this); - }, -+ /** -+ * Hides opened tooltip. -+ */ -+ hideTooltip: function() { -+ var tooltip = mTooltip.Tooltip.getTooltip(this._textView, this); -+ tooltip.hide(true); -+ }, - /** - * Returns the zoom ruler of the editor. - * diff --git a/che-orion-editor/src/main/resources/org/eclipse/che/orion/public/built-codeEdit/code_edit/built-codeEdit-amd.js b/che-orion-editor/src/main/resources/org/eclipse/che/orion/public/built-codeEdit/code_edit/built-codeEdit-amd.js index d1627151..a57579e1 100644 --- a/che-orion-editor/src/main/resources/org/eclipse/che/orion/public/built-codeEdit/code_edit/built-codeEdit-amd.js +++ b/che-orion-editor/src/main/resources/org/eclipse/che/orion/public/built-codeEdit/code_edit/built-codeEdit-amd.js @@ -28656,6 +28656,15 @@ define("orion/editor/editor", [ //$NON-NLS-0$ getTooltip: function() { return mTooltip.Tooltip.getTooltip(this._textView, this); }, + + /** + * Hides opened tooltip. + */ + hideTooltip: function() { + var tooltip = mTooltip.Tooltip.getTooltip(this._textView, this); + tooltip.hide(true); + }, + /** * Returns the zoom ruler of the editor. * From 38f0efb8a8876319b8b428147bd021781c1a9f8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=A4der?= Date: Fri, 24 Aug 2018 14:46:40 +0200 Subject: [PATCH 4/4] Remove leftovers of jdt repack MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Mäder --- org-eclipse-jdt-core-repack/pom.xml | 116 ------------------ .../src/main/java/App.java | 16 --- 2 files changed, 132 deletions(-) delete mode 100644 org-eclipse-jdt-core-repack/pom.xml delete mode 100644 org-eclipse-jdt-core-repack/src/main/java/App.java diff --git a/org-eclipse-jdt-core-repack/pom.xml b/org-eclipse-jdt-core-repack/pom.xml deleted file mode 100644 index 7688d9b8..00000000 --- a/org-eclipse-jdt-core-repack/pom.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - 4.0.0 - - che-lib-parent - org.eclipse.che.lib - 6.11.0-SNAPSHOT - ../pom.xml - - org-eclipse-jdt-core-repack - jar - Che Plugin :: Java :: Eclipse JDT Core Repack - We repack JAR for removing Eclipse RSA key - - false - - - - org.eclipse.tycho - org.eclipse.jdt.core - - - - - - com.mycila - license-maven-plugin - - - **/*.java - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-deps - process-resources - - copy - - - - - org.eclipse.tycho - org.eclipse.jdt.core - ${org.eclipse.jdt.core.version} - jar - false - ${project.build.directory}/packager-conf/jar - - - - - - - - maven-antrun-plugin - - - unpack - process-resources - - run - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org-eclipse-jdt-core-repack/src/main/java/App.java b/org-eclipse-jdt-core-repack/src/main/java/App.java deleted file mode 100644 index d7c3eeff..00000000 --- a/org-eclipse-jdt-core-repack/src/main/java/App.java +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (c) 2012-2018 Red Hat, Inc. - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - */ -/** This is a dummy class to force maven to generate sources and javadoc artifacts */ -public class App { - - public static void main(String[] args) {} -}