Merge remote-tracking branch 'origin/master'

java-decompiler · Nov 17, 2019 · 7bca465 · 7bca465
2 parents 34afc1b + b925383
commit 7bca465
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -105,6 +105,7 @@ task proguard(type: proguard.gradle.ProGuardTask, dependsOn: 'jar') {
     injars jar.archivePath
     outjars 'build/libs/' + project.name + '-' + project.version + '-min.jar'
     libraryjars System.getProperty('java.home') + '/lib/rt.jar'
+    libraryjars System.getProperty('java.home') + '/jmods/'
 }
 
 // Java executable wrapper for Windows //

diff --git a/services/build.gradle b/services/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'java'
 
 dependencies {
-    compile 'com.fifesoft:rsyntaxtextarea:2.5.6'
+    compile 'com.fifesoft:rsyntaxtextarea:3.0.4'
     compile 'org.ow2.asm:asm:7.1'
     compile 'org.jd:jd-core:' + parent.jdCoreVersion
     compile project(':api')

diff --git a/services/src/main/java/org/jd/gui/view/component/TextPage.java b/services/src/main/java/org/jd/gui/view/component/TextPage.java
@@ -27,7 +27,7 @@ public void copy() {
         if (textArea.getSelectionStart() == textArea.getSelectionEnd()) {
             getToolkit().getSystemClipboard().setContents(new StringSelection(""), null);
         } else {
-            textArea.copyAsRtf();
+            textArea.copyAsStyledText();
         }
     }