Avoid patching during the build (#107)

Signed-off-by: Valeriy Svydenko <[email protected]>
eclipse-che · Sep 13, 2018 · e47e215 · e47e215
1 parent 3814411
commit e47e215
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 68 deletions.
diff --git a/che-orion-editor/pom.xml b/che-orion-editor/pom.xml
@@ -32,55 +32,6 @@
             </resource>
         </resources>
         <plugins>
-            <plugin>
-                <!-- Apply patches -->
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-patch-plugin</artifactId>
-                <version>1.1.1</version>
-                <executions>
-                    <execution>
-                        <id>bugfix-patches</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>apply</goal>
-                        </goals>
-                        <configuration>
-                            <patchDirectory>${patches.location}</patchDirectory>
-                            <patches>
-                                <patch>add_hide_tooltip.diff</patch>
-                                <patch>fix_linked_mode.diff</patch>
-                                <patch>fix_focus.diff</patch>
-                                <patch>fix_goto_line.diff</patch>
-                                <patch>fix_scrolling.diff</patch>
-                            </patches>
-                            <optimizations>false</optimizations>
-                            <strictPatching>true</strictPatching>
-                            <strip>1</strip>
-                            <targetDirectory>${project.build.directory}/classes</targetDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <!--Fix for https://github.com/eclipse/che/issues/3768. The plugin needs for putting correct path to the resources.-->
-                <!--After upgrading Orion Editor version don't forget to add folder with images-->
-                <!--org/eclipse/che/orion/public/built-codeEdit/webtools/images-->
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>replace</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <replace file="${project.build.outputDirectory}/org/eclipse/che/orion/public/built-codeEdit/webtools/plugins/webToolsPlugin.js" token="../webtools/images" value="../_app/built-codeEdit/webtools/images" />
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>com.mycila</groupId>
                 <artifactId>license-maven-plugin</artifactId>

diff --git a/che-orion-editor/src/main/patches/add_hide_tooltip.diff b/che-orion-editor/src/main/patches/add_hide_tooltip.diff
diff --git a/...ain/resources/org/eclipse/che/orion/public/built-codeEdit/code_edit/built-codeEdit-amd.js b/...ain/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.
 		 *