From 9336d53e1e2bb5a758f01f9f8faad631f9768a49 Mon Sep 17 00:00:00 2001 From: nbauma109 Date: Sun, 21 Jan 2024 17:57:29 +0100 Subject: [PATCH] quiltflower -> vineflower --- README.md | 8 +++--- .../assembly.xml | 4 +-- .../feature.properties | 2 +- .../feature.properties | 2 +- .../feature.properties | 2 +- .../feature.properties | 2 +- .../icons/quiltflower_16.png | Bin 639 -> 0 bytes .../build.properties | 2 +- .../feature.properties | 2 +- .../.project | 2 +- .../org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.core.runtime.prefs | 0 .../build.properties | 0 .../eclipse_update_120.jpg | Bin .../epl-v10.html | 0 .../feature.properties | 4 +-- .../feature.xml | 6 ++-- .../license.html | 0 .../pom.xml | 2 +- .../.classpath | 2 +- .../.project | 2 +- .../org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.core.runtime.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../.settings/org.eclipse.m2e.core.prefs | 0 .../META-INF/MANIFEST.MF | 12 ++++---- .../build.properties | 2 +- .../icons/LICENSE.txt | 0 .../icons/pluginIcon.svg | 0 .../icons/pluginIcon.txt | 0 .../icons/vineflower_16.png | Bin 0 -> 1107 bytes .../plugin.xml | 12 ++++---- .../pom.xml | 10 +++---- .../VineflowerDecompilerPlugin.java | 18 ++++++------ .../DecompileWithVineflowerCoreAction.java | 16 +++++------ .../DecompileWithVineflowerCoreHandler.java | 8 +++--- .../decompiler/VineflowerDecompiler.java | 10 +++---- .../VineflowerDecompilerDescriptor.java | 26 +++++++++--------- .../decompiler/VineflowerSourceMapper.java | 14 +++++----- .../decompiler/vineflower}/i18n/Messages.java | 4 +-- .../vineflower}/i18n/messages.properties | 4 +-- org.sf.feeling.decompiler/about.properties | 2 +- pom.xml | 8 +++--- site.xml | 8 +++--- 45 files changed, 98 insertions(+), 98 deletions(-) delete mode 100644 org.sf.feeling.decompiler.quiltflower/icons/quiltflower_16.png rename {org.sf.feeling.decompiler.quiltflower.feature => org.sf.feeling.decompiler.vineflower.feature}/.project (85%) rename {org.sf.feeling.decompiler.quiltflower.feature => org.sf.feeling.decompiler.vineflower.feature}/.settings/org.eclipse.core.resources.prefs (100%) rename {org.sf.feeling.decompiler.quiltflower.feature => org.sf.feeling.decompiler.vineflower.feature}/.settings/org.eclipse.core.runtime.prefs (100%) rename {org.sf.feeling.decompiler.quiltflower.feature => org.sf.feeling.decompiler.vineflower.feature}/build.properties (100%) rename {org.sf.feeling.decompiler.quiltflower.feature => org.sf.feeling.decompiler.vineflower.feature}/eclipse_update_120.jpg (100%) rename {org.sf.feeling.decompiler.quiltflower.feature => org.sf.feeling.decompiler.vineflower.feature}/epl-v10.html (100%) rename {org.sf.feeling.decompiler.quiltflower.feature => org.sf.feeling.decompiler.vineflower.feature}/feature.properties (99%) rename {org.sf.feeling.decompiler.quiltflower.feature => org.sf.feeling.decompiler.vineflower.feature}/feature.xml (90%) rename {org.sf.feeling.decompiler.quiltflower.feature => org.sf.feeling.decompiler.vineflower.feature}/license.html (100%) rename {org.sf.feeling.decompiler.quiltflower.feature => org.sf.feeling.decompiler.vineflower.feature}/pom.xml (89%) rename {org.sf.feeling.decompiler.quiltflower => org.sf.feeling.decompiler.vineflower}/.classpath (85%) rename {org.sf.feeling.decompiler.quiltflower => org.sf.feeling.decompiler.vineflower}/.project (93%) rename {org.sf.feeling.decompiler.quiltflower => org.sf.feeling.decompiler.vineflower}/.settings/org.eclipse.core.resources.prefs (100%) rename {org.sf.feeling.decompiler.quiltflower => org.sf.feeling.decompiler.vineflower}/.settings/org.eclipse.core.runtime.prefs (100%) rename {org.sf.feeling.decompiler.quiltflower => org.sf.feeling.decompiler.vineflower}/.settings/org.eclipse.jdt.core.prefs (100%) rename {org.sf.feeling.decompiler.quiltflower => org.sf.feeling.decompiler.vineflower}/.settings/org.eclipse.jdt.ui.prefs (100%) rename {org.sf.feeling.decompiler.quiltflower => org.sf.feeling.decompiler.vineflower}/.settings/org.eclipse.m2e.core.prefs (100%) rename {org.sf.feeling.decompiler.quiltflower => org.sf.feeling.decompiler.vineflower}/META-INF/MANIFEST.MF (65%) rename {org.sf.feeling.decompiler.quiltflower => org.sf.feeling.decompiler.vineflower}/build.properties (76%) rename {org.sf.feeling.decompiler.quiltflower => org.sf.feeling.decompiler.vineflower}/icons/LICENSE.txt (100%) rename {org.sf.feeling.decompiler.quiltflower => org.sf.feeling.decompiler.vineflower}/icons/pluginIcon.svg (100%) rename {org.sf.feeling.decompiler.quiltflower => org.sf.feeling.decompiler.vineflower}/icons/pluginIcon.txt (100%) create mode 100644 org.sf.feeling.decompiler.vineflower/icons/vineflower_16.png rename {org.sf.feeling.decompiler.quiltflower => org.sf.feeling.decompiler.vineflower}/plugin.xml (70%) rename {org.sf.feeling.decompiler.quiltflower => org.sf.feeling.decompiler.vineflower}/pom.xml (89%) rename org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower/QuiltflowerDecompilerPlugin.java => org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/VineflowerDecompilerPlugin.java (75%) rename org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower/actions/DecompileWithQuiltflowerCoreAction.java => org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/actions/DecompileWithVineflowerCoreAction.java (63%) rename org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower/actions/DecompileWithQuiltflowerCoreHandler.java => org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/actions/DecompileWithVineflowerCoreHandler.java (72%) rename org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower/decompiler/QuiltflowerDecompiler.java => org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/decompiler/VineflowerDecompiler.java (95%) rename org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower/decompiler/QuiltflowerDecompilerDescriptor.java => org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/decompiler/VineflowerDecompilerDescriptor.java (52%) rename org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower/decompiler/QuiltflowerSourceMapper.java => org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/decompiler/VineflowerSourceMapper.java (78%) rename {org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower => org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower}/i18n/Messages.java (90%) rename {org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower => org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower}/i18n/messages.properties (77%) diff --git a/README.md b/README.md index 3627fdd3..c88a119e 100644 --- a/README.md +++ b/README.md @@ -5,12 +5,12 @@ [![Github Release](https://github.com/nbauma109/ecd/actions/workflows/release.yml/badge.svg)](https://github.com/nbauma109/ecd/actions/workflows/release.yml) # Enhanced Class Decompiler -Enhanced Class Decompiler integrates **JD**, **FernFlower**, **Quiltflower**, **CFR**, **Procyon** seamlessly with Eclipse and allows Java developers to **debug class files without source code directly**. It also integrates with the eclipse class editor, m2e plugin, supports **Javadoc**, **reference search**, **library source attaching**, **byte code view** and the syntax of JDK8 **lambda** expression. +Enhanced Class Decompiler integrates **JD**, **FernFlower**, **Vineflower**, **CFR**, **Procyon** seamlessly with Eclipse and allows Java developers to **debug class files without source code directly**. It also integrates with the eclipse class editor, m2e plugin, supports **Javadoc**, **reference search**, **library source attaching**, **byte code view** and the syntax of JDK8 **lambda** expression.

## Description -Enhanced Class Decompiler is a plug-in for the Eclipse platform. It integrates JD, FernFlower, Quiltflower, CFR, Procyon seamlessly with Eclipse, allows you to display all the Java sources during your debugging process, even if you do not have them all, and you can debug these class files without source code directly. +Enhanced Class Decompiler is a plug-in for the Eclipse platform. It integrates JD, FernFlower, Vineflower, CFR, Procyon seamlessly with Eclipse, allows you to display all the Java sources during your debugging process, even if you do not have them all, and you can debug these class files without source code directly. ## Why is this plug-in "enhanced"? This is an ad-free fork of the Eclipse Decompiler Plugin. So we enhanced it by removing all code which might compromise your privacy or security (to the best of our knowledge). @@ -93,7 +93,7 @@ Used libraries: * Nexus Restlet1x Model: [Eclipse Public License v1.0](https://www.eclipse.org/legal/epl-v10.html) * Plexus Utils: Copyright The Codehaus Foundation, [Apache License V2.0](https://www.apache.org/licenses/LICENSE-2.0.html) * JD-Core: Copyright Emmanuel Dupuy, [GPL 3](https://www.gnu.org/licenses/gpl-3.0-standalone.html) - * Quiltflower: [Apache License V2.0](https://www.apache.org/licenses/LICENSE-2.0.html) + * Vineflower: [Apache License V2.0](https://www.apache.org/licenses/LICENSE-2.0.html) ## Contributors @@ -107,7 +107,7 @@ Used libraries: * Version 3.3.0 * ECD releases are now signed with a self-signed certificate * Removed Jad decompiler (decompiler was released 2001) - * Quiltflower plugin and feature added + * Vineflower plugin and feature added * Updated Embedded Decompilers * CFR to version 0.152 (JDK 14 support) * Procyon to version 0.6.0 diff --git a/org.sf.feeling.decompiler.assembly/assembly.xml b/org.sf.feeling.decompiler.assembly/assembly.xml index 5b9b971b..3d3683f4 100644 --- a/org.sf.feeling.decompiler.assembly/assembly.xml +++ b/org.sf.feeling.decompiler.assembly/assembly.xml @@ -33,7 +33,7 @@ com.github.ecd-plugin.features:org.sf.feeling.decompiler com.github.ecd-plugin.features:org.sf.feeling.decompiler.cfr com.github.ecd-plugin.features:org.sf.feeling.decompiler.jd - com.github.ecd-plugin.features:org.sf.feeling.decompiler.quiltflower + com.github.ecd-plugin.features:org.sf.feeling.decompiler.vineflower com.github.ecd-plugin.features:org.sf.feeling.decompiler.procyon com.github.ecd-plugin.features:org.sf.feeling.decompiler.source @@ -49,7 +49,7 @@ com.github.ecd-plugin:org.sf.feeling.decompiler com.github.ecd-plugin:org.sf.feeling.decompiler.cfr com.github.ecd-plugin:org.sf.feeling.decompiler.jd - com.github.ecd-plugin:org.sf.feeling.decompiler.quiltflower + com.github.ecd-plugin:org.sf.feeling.decompiler.vineflower com.github.ecd-plugin:org.sf.feeling.decompiler.procyon com.github.ecd-plugin:org.sf.feeling.decompiler.source.attach diff --git a/org.sf.feeling.decompiler.cfr.feature/feature.properties b/org.sf.feeling.decompiler.cfr.feature/feature.properties index bf1f8d54..b81a365a 100644 --- a/org.sf.feeling.decompiler.cfr.feature/feature.properties +++ b/org.sf.feeling.decompiler.cfr.feature/feature.properties @@ -22,7 +22,7 @@ providerName=ECD project contributors updateSiteName=Enhanced Class Decompiler Updates # "description" property - description of the feature -description=Enhanced Class Decompiler integrates JD, FernFlower, Quiltflower, CFR, Procyon with Eclipse seamlessly. \ +description=Enhanced Class Decompiler integrates JD, FernFlower, Vineflower, CFR, Procyon with Eclipse seamlessly. \ It allows Java developers to debug class files without source code directly. copyrightURL=https://ecd-plugin.github.io diff --git a/org.sf.feeling.decompiler.feature/feature.properties b/org.sf.feeling.decompiler.feature/feature.properties index e83d0aca..3c2be1c5 100644 --- a/org.sf.feeling.decompiler.feature/feature.properties +++ b/org.sf.feeling.decompiler.feature/feature.properties @@ -22,7 +22,7 @@ providerName=ECD project contributors updateSiteName=Enhanced Class Decompiler Updates # "description" property - description of the feature -description=Enhanced Class Decompiler integrates JD, FernFlower, Quiltflower, CFR, Procyon with Eclipse seamlessly. \ +description=Enhanced Class Decompiler integrates JD, FernFlower, Vineflower, CFR, Procyon with Eclipse seamlessly. \ It allows Java developers to debug class files without source code directly. copyrightURL=https://ecd-plugin.github.io diff --git a/org.sf.feeling.decompiler.jd.feature/feature.properties b/org.sf.feeling.decompiler.jd.feature/feature.properties index ddcb57c3..7556b1e3 100644 --- a/org.sf.feeling.decompiler.jd.feature/feature.properties +++ b/org.sf.feeling.decompiler.jd.feature/feature.properties @@ -22,7 +22,7 @@ providerName=ECD project contributors updateSiteName=Enhanced Class Decompiler Updates # "description" property - description of the feature -description=Enhanced Class Decompiler integrates JD, FernFlower, Quiltflower, CFR, Procyon with Eclipse seamlessly. \ +description=Enhanced Class Decompiler integrates JD, FernFlower, Vineflower, CFR, Procyon with Eclipse seamlessly. \ It allows Java developers to debug class files without source code directly. copyrightURL=https://ecd-plugin.github.io diff --git a/org.sf.feeling.decompiler.procyon.feature/feature.properties b/org.sf.feeling.decompiler.procyon.feature/feature.properties index 80cd62f9..c85044c5 100644 --- a/org.sf.feeling.decompiler.procyon.feature/feature.properties +++ b/org.sf.feeling.decompiler.procyon.feature/feature.properties @@ -22,7 +22,7 @@ providerName=ECD project contributors updateSiteName=Enhanced Class Decompiler Updates # "description" property - description of the feature -description=Enhanced Class Decompiler integrates JD, FernFlower, Quiltflower, CFR, Procyon with Eclipse seamlessly. \ +description=Enhanced Class Decompiler integrates JD, FernFlower, Vineflower, CFR, Procyon with Eclipse seamlessly. \ It allows Java developers to debug class files without source code directly. copyrightURL=https://ecd-plugin.github.io diff --git a/org.sf.feeling.decompiler.quiltflower/icons/quiltflower_16.png b/org.sf.feeling.decompiler.quiltflower/icons/quiltflower_16.png deleted file mode 100644 index 9e1845c79cd521c3f7f2593b2ba6fad08ed7193a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 639 zcmV-_0)YLAP)W0 ziSZ9$z{Ej=(ZK;X5+l@)_*DZzg2ndI(#yTK#{t_=P|#;O=gE10d7d{pVvNB_JH1kq zn?M$bvAta2h0*4kH}B=d-edPlO{Rdv4uhLjG@%*NR@52;j{WB_Ktz=66DQ@k_1Im< zVD&HO!FunmOiIZ|BfK%IU z>bH{FIE7bb!b+`fjfJpJ<(bA{9c`s+Q83ra;|EfF51;#~7UuCY6 Z{{=NEws=H7EQJ67002ovPDHLkV1k*&9}WNj diff --git a/org.sf.feeling.decompiler.source.feature/build.properties b/org.sf.feeling.decompiler.source.feature/build.properties index 5961fe35..4d46b729 100644 --- a/org.sf.feeling.decompiler.source.feature/build.properties +++ b/org.sf.feeling.decompiler.source.feature/build.properties @@ -8,4 +8,4 @@ generate.plugin@org.sf.feeling.decompiler.source = org.sf.feeling.decompiler generate.plugin@org.sf.feeling.decompiler.jd.source = org.sf.feeling.decompiler.jd generate.plugin@org.sf.feeling.decompiler.cfr.source = org.sf.feeling.decompiler.cfr generate.plugin@org.sf.feeling.decompiler.procyon.source = org.sf.feeling.decompiler.procyon -generate.plugin@org.sf.feeling.decompiler.quiltflower.source = org.sf.feeling.decompiler.quiltflower \ No newline at end of file +generate.plugin@org.sf.feeling.decompiler.vineflower.source = org.sf.feeling.decompiler.vineflower \ No newline at end of file diff --git a/org.sf.feeling.decompiler.source.feature/feature.properties b/org.sf.feeling.decompiler.source.feature/feature.properties index 270e05c7..1bbd419d 100644 --- a/org.sf.feeling.decompiler.source.feature/feature.properties +++ b/org.sf.feeling.decompiler.source.feature/feature.properties @@ -22,7 +22,7 @@ providerName=ECD project contributors updateSiteName=Enhanced Class Decompiler Updates # "description" property - description of the feature -description=Enhanced Class Decompiler integrates JD, FernFlower, Quiltflower, CFR, Procyon with Eclipse seamlessly. \ +description=Enhanced Class Decompiler integrates JD, FernFlower, Vineflower, CFR, Procyon with Eclipse seamlessly. \ It allows Java developers to debug class files without source code directly. copyrightURL=https://ecd-plugin.github.io diff --git a/org.sf.feeling.decompiler.quiltflower.feature/.project b/org.sf.feeling.decompiler.vineflower.feature/.project similarity index 85% rename from org.sf.feeling.decompiler.quiltflower.feature/.project rename to org.sf.feeling.decompiler.vineflower.feature/.project index a26e45be..353a5e6e 100644 --- a/org.sf.feeling.decompiler.quiltflower.feature/.project +++ b/org.sf.feeling.decompiler.vineflower.feature/.project @@ -1,6 +1,6 @@ - org.sf.feeling.decompiler.quiltflower.feature + org.sf.feeling.decompiler.vineflower.feature diff --git a/org.sf.feeling.decompiler.quiltflower.feature/.settings/org.eclipse.core.resources.prefs b/org.sf.feeling.decompiler.vineflower.feature/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from org.sf.feeling.decompiler.quiltflower.feature/.settings/org.eclipse.core.resources.prefs rename to org.sf.feeling.decompiler.vineflower.feature/.settings/org.eclipse.core.resources.prefs diff --git a/org.sf.feeling.decompiler.quiltflower.feature/.settings/org.eclipse.core.runtime.prefs b/org.sf.feeling.decompiler.vineflower.feature/.settings/org.eclipse.core.runtime.prefs similarity index 100% rename from org.sf.feeling.decompiler.quiltflower.feature/.settings/org.eclipse.core.runtime.prefs rename to org.sf.feeling.decompiler.vineflower.feature/.settings/org.eclipse.core.runtime.prefs diff --git a/org.sf.feeling.decompiler.quiltflower.feature/build.properties b/org.sf.feeling.decompiler.vineflower.feature/build.properties similarity index 100% rename from org.sf.feeling.decompiler.quiltflower.feature/build.properties rename to org.sf.feeling.decompiler.vineflower.feature/build.properties diff --git a/org.sf.feeling.decompiler.quiltflower.feature/eclipse_update_120.jpg b/org.sf.feeling.decompiler.vineflower.feature/eclipse_update_120.jpg similarity index 100% rename from org.sf.feeling.decompiler.quiltflower.feature/eclipse_update_120.jpg rename to org.sf.feeling.decompiler.vineflower.feature/eclipse_update_120.jpg diff --git a/org.sf.feeling.decompiler.quiltflower.feature/epl-v10.html b/org.sf.feeling.decompiler.vineflower.feature/epl-v10.html similarity index 100% rename from org.sf.feeling.decompiler.quiltflower.feature/epl-v10.html rename to org.sf.feeling.decompiler.vineflower.feature/epl-v10.html diff --git a/org.sf.feeling.decompiler.quiltflower.feature/feature.properties b/org.sf.feeling.decompiler.vineflower.feature/feature.properties similarity index 99% rename from org.sf.feeling.decompiler.quiltflower.feature/feature.properties rename to org.sf.feeling.decompiler.vineflower.feature/feature.properties index 8f99608f..a11e8c93 100644 --- a/org.sf.feeling.decompiler.quiltflower.feature/feature.properties +++ b/org.sf.feeling.decompiler.vineflower.feature/feature.properties @@ -13,7 +13,7 @@ # This file should be translated. # "featureName" property - name of the feature -featureName=Enhanced Class Decompiler Quiltflower Extension (Optional) +featureName=Enhanced Class Decompiler Vineflower Extension (Optional) # "providerName" property - name of the company that provides the feature providerName=ECD project contributors @@ -22,7 +22,7 @@ providerName=ECD project contributors updateSiteName=Enhanced Class Decompiler Updates # "description" property - description of the feature -description=Enhanced Class Decompiler integrates JD, FernFlower, Quiltflower, CFR, Procyon with Eclipse seamlessly. \ +description=Enhanced Class Decompiler integrates JD, FernFlower, Vineflower, CFR, Procyon with Eclipse seamlessly. \ It allows Java developers to debug class files without source code directly. copyrightURL=https://ecd-plugin.github.io diff --git a/org.sf.feeling.decompiler.quiltflower.feature/feature.xml b/org.sf.feeling.decompiler.vineflower.feature/feature.xml similarity index 90% rename from org.sf.feeling.decompiler.quiltflower.feature/feature.xml rename to org.sf.feeling.decompiler.vineflower.feature/feature.xml index aa0e42a2..4207075a 100644 --- a/org.sf.feeling.decompiler.quiltflower.feature/feature.xml +++ b/org.sf.feeling.decompiler.vineflower.feature/feature.xml @@ -1,10 +1,10 @@ + plugin="org.sf.feeling.decompiler.vineflower"> %description @@ -43,7 +43,7 @@ com.github.ecd-plugin.features - org.sf.feeling.decompiler.quiltflower + org.sf.feeling.decompiler.vineflower eclipse-feature diff --git a/org.sf.feeling.decompiler.quiltflower/.classpath b/org.sf.feeling.decompiler.vineflower/.classpath similarity index 85% rename from org.sf.feeling.decompiler.quiltflower/.classpath rename to org.sf.feeling.decompiler.vineflower/.classpath index af9f0f5e..8bda4fe8 100644 --- a/org.sf.feeling.decompiler.quiltflower/.classpath +++ b/org.sf.feeling.decompiler.vineflower/.classpath @@ -7,6 +7,6 @@ - + diff --git a/org.sf.feeling.decompiler.quiltflower/.project b/org.sf.feeling.decompiler.vineflower/.project similarity index 93% rename from org.sf.feeling.decompiler.quiltflower/.project rename to org.sf.feeling.decompiler.vineflower/.project index 84ee2b79..4f88522e 100644 --- a/org.sf.feeling.decompiler.quiltflower/.project +++ b/org.sf.feeling.decompiler.vineflower/.project @@ -1,6 +1,6 @@ - org.sf.feeling.decompiler.quiltflower + org.sf.feeling.decompiler.vineflower diff --git a/org.sf.feeling.decompiler.quiltflower/.settings/org.eclipse.core.resources.prefs b/org.sf.feeling.decompiler.vineflower/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from org.sf.feeling.decompiler.quiltflower/.settings/org.eclipse.core.resources.prefs rename to org.sf.feeling.decompiler.vineflower/.settings/org.eclipse.core.resources.prefs diff --git a/org.sf.feeling.decompiler.quiltflower/.settings/org.eclipse.core.runtime.prefs b/org.sf.feeling.decompiler.vineflower/.settings/org.eclipse.core.runtime.prefs similarity index 100% rename from org.sf.feeling.decompiler.quiltflower/.settings/org.eclipse.core.runtime.prefs rename to org.sf.feeling.decompiler.vineflower/.settings/org.eclipse.core.runtime.prefs diff --git a/org.sf.feeling.decompiler.quiltflower/.settings/org.eclipse.jdt.core.prefs b/org.sf.feeling.decompiler.vineflower/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.sf.feeling.decompiler.quiltflower/.settings/org.eclipse.jdt.core.prefs rename to org.sf.feeling.decompiler.vineflower/.settings/org.eclipse.jdt.core.prefs diff --git a/org.sf.feeling.decompiler.quiltflower/.settings/org.eclipse.jdt.ui.prefs b/org.sf.feeling.decompiler.vineflower/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from org.sf.feeling.decompiler.quiltflower/.settings/org.eclipse.jdt.ui.prefs rename to org.sf.feeling.decompiler.vineflower/.settings/org.eclipse.jdt.ui.prefs diff --git a/org.sf.feeling.decompiler.quiltflower/.settings/org.eclipse.m2e.core.prefs b/org.sf.feeling.decompiler.vineflower/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from org.sf.feeling.decompiler.quiltflower/.settings/org.eclipse.m2e.core.prefs rename to org.sf.feeling.decompiler.vineflower/.settings/org.eclipse.m2e.core.prefs diff --git a/org.sf.feeling.decompiler.quiltflower/META-INF/MANIFEST.MF b/org.sf.feeling.decompiler.vineflower/META-INF/MANIFEST.MF similarity index 65% rename from org.sf.feeling.decompiler.quiltflower/META-INF/MANIFEST.MF rename to org.sf.feeling.decompiler.vineflower/META-INF/MANIFEST.MF index b09db1e1..072dff9e 100644 --- a/org.sf.feeling.decompiler.quiltflower/META-INF/MANIFEST.MF +++ b/org.sf.feeling.decompiler.vineflower/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Enhanced Class Decompiler Quiltflower Extension -Bundle-SymbolicName: org.sf.feeling.decompiler.quiltflower;singleton:=true +Bundle-Name: Enhanced Class Decompiler Vineflower Extension +Bundle-SymbolicName: org.sf.feeling.decompiler.vineflower;singleton:=true Bundle-Version: 3.5.5 -Bundle-Activator: org.sf.feeling.decompiler.quiltflower.QuiltflowerDecompilerPlugin +Bundle-Activator: org.sf.feeling.decompiler.vineflower.VineflowerDecompilerPlugin Require-Bundle: org.eclipse.core.runtime, org.sf.feeling.decompiler, org.eclipse.core.resources, @@ -24,7 +24,7 @@ Require-Bundle: org.eclipse.core.runtime, Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Bundle-Vendor: ECD Project Team -Export-Package: org.sf.feeling.decompiler.quiltflower.actions, - org.sf.feeling.decompiler.quiltflower.decompiler +Export-Package: org.sf.feeling.decompiler.vineflower.actions, + org.sf.feeling.decompiler.vineflower.decompiler Bundle-ClassPath: ., - lib/quiltflower-1.9.3.jar + lib/vineflower-1.9.3.jar diff --git a/org.sf.feeling.decompiler.quiltflower/build.properties b/org.sf.feeling.decompiler.vineflower/build.properties similarity index 76% rename from org.sf.feeling.decompiler.quiltflower/build.properties rename to org.sf.feeling.decompiler.vineflower/build.properties index 42d95577..c9c42316 100644 --- a/org.sf.feeling.decompiler.quiltflower/build.properties +++ b/org.sf.feeling.decompiler.vineflower/build.properties @@ -4,4 +4,4 @@ bin.includes = META-INF/,\ .,\ plugin.xml,\ icons/,\ - lib/quiltflower-1.9.3.jar \ No newline at end of file + lib/vineflower-1.9.3.jar \ No newline at end of file diff --git a/org.sf.feeling.decompiler.quiltflower/icons/LICENSE.txt b/org.sf.feeling.decompiler.vineflower/icons/LICENSE.txt similarity index 100% rename from org.sf.feeling.decompiler.quiltflower/icons/LICENSE.txt rename to org.sf.feeling.decompiler.vineflower/icons/LICENSE.txt diff --git a/org.sf.feeling.decompiler.quiltflower/icons/pluginIcon.svg b/org.sf.feeling.decompiler.vineflower/icons/pluginIcon.svg similarity index 100% rename from org.sf.feeling.decompiler.quiltflower/icons/pluginIcon.svg rename to org.sf.feeling.decompiler.vineflower/icons/pluginIcon.svg diff --git a/org.sf.feeling.decompiler.quiltflower/icons/pluginIcon.txt b/org.sf.feeling.decompiler.vineflower/icons/pluginIcon.txt similarity index 100% rename from org.sf.feeling.decompiler.quiltflower/icons/pluginIcon.txt rename to org.sf.feeling.decompiler.vineflower/icons/pluginIcon.txt diff --git a/org.sf.feeling.decompiler.vineflower/icons/vineflower_16.png b/org.sf.feeling.decompiler.vineflower/icons/vineflower_16.png new file mode 100644 index 0000000000000000000000000000000000000000..ea5eb4a20137f6f7c03320ffa1caad9852c7d1e9 GIT binary patch literal 1107 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Lb6AYF9SoB8UsT^3j@P1pisjL z28L1t28LG&3=CE?7#PG0=IjczVPIg~9N-h;`oHHiP|c42G5@>Hyj{7T;XjZaedt}z zhLeX^E&9KD<^Roh=WM#Z9HRAcv({LR3Kv`M3YX%k?XdzAD)FH4W_4 zsO`T}fdLLOe8Z=;+n#R!owEMuskOWAZ~v3D{_weNpNszg|F2%Sza1E7btOT5peRQG zNpTJ)>4R(ig1HQPC-O7eKe_k8ChSq4*ZE6tZ*Nl4fB4xx;`O_~-(LH79pYniyYMeo z>|z;f^W#~}K0jW@{Ccc5buF9Zm4C@%*Q!@V{`$MdlF8xIvm@^wUYF%P`04&Ufs)rB zZFQb^M|VmxxBtAPnNVXe?@O31(0axsZ+Djo6`sfb8Zd}HUR_vIy<1y zdrud~5Q)pl2?-CLCNnU(xv42U5Kl-D5D^j+6isIMcvMwosl<}hl&2|AMI{<)T$fs< zsMm&5<~MhpoN)8L#)T6%c4`_6PmYY8yOUM8dFj;B+U8ze?#Xj&W9Kpp z3o|z_o?M(fxm$bk?CQDgW*!ZVS1+%=dAt4O_MJ!1&+iq~I3OnwAub{#bnBMbv4baB z%O<$Q##XqbREL!K=(s58?bB1-xY$_JQdLxG!nC;Scdp)@JaOh!ULl6ACs(e1{q}U( zlc&XwtXy2LU;XOt^7c|>>hVc^Dq1=<^iE7nOpgGgTKB72QEGA%fZ-8r%<%N~PdA{~ zRZCnWN>UO_QmvAUQh^kMk%5u1uA!l>fklXcg_VJsm7$rofq|8Q0gq^9E{cZS{FKbJ rO57T1Jq}(3YS4h&P?DLOT3nKtTYy`SR_p^lpdJQKS3j3^P6 + id="org.sf.feeling.decompiler.decompile.vineflower"> + commandId="org.sf.feeling.decompiler.decompile.vineflower" + class="org.sf.feeling.decompiler.vineflower.actions.DecompileWithVineflowerHandler"> diff --git a/org.sf.feeling.decompiler.quiltflower/pom.xml b/org.sf.feeling.decompiler.vineflower/pom.xml similarity index 89% rename from org.sf.feeling.decompiler.quiltflower/pom.xml rename to org.sf.feeling.decompiler.vineflower/pom.xml index 99571603..afa3eb05 100644 --- a/org.sf.feeling.decompiler.quiltflower/pom.xml +++ b/org.sf.feeling.decompiler.vineflower/pom.xml @@ -8,7 +8,7 @@ ../pom.xml - org.sf.feeling.decompiler.quiltflower + org.sf.feeling.decompiler.vineflower eclipse-plugin @@ -34,8 +34,8 @@ - com.github.QuiltMC - quiltflower + org.vineflower + vineflower true lib @@ -61,8 +61,8 @@ - com.github.QuiltMC - quiltflower + org.vineflower + vineflower com.eclipsesource.minimal-json diff --git a/org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower/QuiltflowerDecompilerPlugin.java b/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/VineflowerDecompilerPlugin.java similarity index 75% rename from org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower/QuiltflowerDecompilerPlugin.java rename to org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/VineflowerDecompilerPlugin.java index da3f05f3..935d3cf0 100644 --- a/org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower/QuiltflowerDecompilerPlugin.java +++ b/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/VineflowerDecompilerPlugin.java @@ -1,5 +1,5 @@ -package org.sf.feeling.decompiler.quiltflower; +package org.sf.feeling.decompiler.vineflower; import java.net.MalformedURLException; import java.net.URL; @@ -12,17 +12,17 @@ import org.osgi.framework.BundleContext; import org.sf.feeling.decompiler.JavaDecompilerPlugin; -public class QuiltflowerDecompilerPlugin extends AbstractUIPlugin implements IPropertyChangeListener { +public class VineflowerDecompilerPlugin extends AbstractUIPlugin implements IPropertyChangeListener { - public static final String PLUGIN_ID = "org.sf.feeling.decompiler.quiltflower"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.sf.feeling.decompiler.vineflower"; //$NON-NLS-1$ - public static final String CMD = "org.sf.feeling.decompiler.quiltflower.cmd"; //$NON-NLS-1$ + public static final String CMD = "org.sf.feeling.decompiler.vineflower.cmd"; //$NON-NLS-1$ - public static final String decompilerType = "Quiltflower"; //$NON-NLS-1$ + public static final String decompilerType = "Vineflower"; //$NON-NLS-1$ public static final String decompilerVersion = "1.9"; //$NON-NLS-1$ - private static QuiltflowerDecompilerPlugin plugin; + private static VineflowerDecompilerPlugin plugin; private IPreferenceStore preferenceStore; @@ -64,16 +64,16 @@ public IPreferenceStore getPreferenceStore() { return preferenceStore; } - public static QuiltflowerDecompilerPlugin getDefault() { + public static VineflowerDecompilerPlugin getDefault() { return plugin; } - public QuiltflowerDecompilerPlugin() { + public VineflowerDecompilerPlugin() { plugin = this; } public static ImageDescriptor getImageDescriptor(String path) { - URL base = QuiltflowerDecompilerPlugin.getDefault().getBundle().getEntry("/"); //$NON-NLS-1$ + URL base = VineflowerDecompilerPlugin.getDefault().getBundle().getEntry("/"); //$NON-NLS-1$ URL url = null; try { url = new URL(base, path); // $NON-NLS-1$ diff --git a/org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower/actions/DecompileWithQuiltflowerCoreAction.java b/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/actions/DecompileWithVineflowerCoreAction.java similarity index 63% rename from org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower/actions/DecompileWithQuiltflowerCoreAction.java rename to org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/actions/DecompileWithVineflowerCoreAction.java index f09b0446..0afb5904 100644 --- a/org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower/actions/DecompileWithQuiltflowerCoreAction.java +++ b/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/actions/DecompileWithVineflowerCoreAction.java @@ -6,25 +6,25 @@ * https://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.sf.feeling.decompiler.quiltflower.actions; +package org.sf.feeling.decompiler.vineflower.actions; import org.eclipse.core.commands.ExecutionException; import org.eclipse.jface.action.Action; -import org.sf.feeling.decompiler.quiltflower.QuiltflowerDecompilerPlugin; -import org.sf.feeling.decompiler.quiltflower.i18n.Messages; +import org.sf.feeling.decompiler.vineflower.VineflowerDecompilerPlugin; +import org.sf.feeling.decompiler.vineflower.i18n.Messages; import org.sf.feeling.decompiler.util.UIUtil; -public class DecompileWithQuiltflowerCoreAction extends Action { +public class DecompileWithVineflowerCoreAction extends Action { - public DecompileWithQuiltflowerCoreAction() { - super(Messages.getString("JavaDecompilerActionBarContributor.Action.DecompileWithQuiltflower")); //$NON-NLS-1$ - this.setImageDescriptor(QuiltflowerDecompilerPlugin.getImageDescriptor("icons/quiltflower_16.png")); //$NON-NLS-1$ + public DecompileWithVineflowerCoreAction() { + super(Messages.getString("JavaDecompilerActionBarContributor.Action.DecompileWithVineflower")); //$NON-NLS-1$ + this.setImageDescriptor(VineflowerDecompilerPlugin.getImageDescriptor("icons/vineflower_16.png")); //$NON-NLS-1$ } @Override public void run() { try { - new DecompileWithQuiltflowerCoreHandler().execute(null); + new DecompileWithVineflowerCoreHandler().execute(null); } catch (ExecutionException e) { } } diff --git a/org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower/actions/DecompileWithQuiltflowerCoreHandler.java b/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/actions/DecompileWithVineflowerCoreHandler.java similarity index 72% rename from org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower/actions/DecompileWithQuiltflowerCoreHandler.java rename to org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/actions/DecompileWithVineflowerCoreHandler.java index 9a73d2d6..4d160f5e 100644 --- a/org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower/actions/DecompileWithQuiltflowerCoreHandler.java +++ b/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/actions/DecompileWithVineflowerCoreHandler.java @@ -6,18 +6,18 @@ * https://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.sf.feeling.decompiler.quiltflower.actions; +package org.sf.feeling.decompiler.vineflower.actions; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.sf.feeling.decompiler.actions.BaseDecompilerHandler; -import org.sf.feeling.decompiler.quiltflower.QuiltflowerDecompilerPlugin; +import org.sf.feeling.decompiler.vineflower.VineflowerDecompilerPlugin; -public class DecompileWithQuiltflowerCoreHandler extends BaseDecompilerHandler { +public class DecompileWithVineflowerCoreHandler extends BaseDecompilerHandler { @Override public Object execute(ExecutionEvent event) throws ExecutionException { - return handleDecompile(QuiltflowerDecompilerPlugin.decompilerType); + return handleDecompile(VineflowerDecompilerPlugin.decompilerType); } } \ No newline at end of file diff --git a/org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower/decompiler/QuiltflowerDecompiler.java b/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/decompiler/VineflowerDecompiler.java similarity index 95% rename from org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower/decompiler/QuiltflowerDecompiler.java rename to org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/decompiler/VineflowerDecompiler.java index 257278d1..f96267a3 100644 --- a/org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower/decompiler/QuiltflowerDecompiler.java +++ b/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/decompiler/VineflowerDecompiler.java @@ -6,7 +6,7 @@ * https://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.sf.feeling.decompiler.quiltflower.decompiler; +package org.sf.feeling.decompiler.vineflower.decompiler; import java.io.ByteArrayOutputStream; import java.io.File; @@ -33,7 +33,7 @@ import org.sf.feeling.decompiler.util.JarClassExtractor; import org.sf.feeling.decompiler.util.UnicodeUtil; -public class QuiltflowerDecompiler implements IDecompiler { +public class VineflowerDecompiler implements IDecompiler { private String source = ""; // $NON-NLS-1$ private long time, start; @@ -42,7 +42,7 @@ public class QuiltflowerDecompiler implements IDecompiler { ByteArrayOutputStream loggerStream; /** - * Performs a Runtime.exec() on Quiltflower executable with + * Performs a Runtime.exec() on Vineflower executable with * selected options. * * @see IDecompiler#decompile(String, String, String) @@ -76,7 +76,7 @@ public void decompile(String root, String packege, final String className) { File tmpDir; try { - tmpDir = Files.createTempDirectory("ecd_quiltflower").toFile(); + tmpDir = Files.createTempDirectory("ecd_vineflower").toFile(); } catch (IOException e) { throw new RuntimeException("Failed to create temporary working directory", e); //$NON-NLS-1$ } @@ -148,7 +148,7 @@ public boolean accept(File dir, String name) { } /** - * Quiltflower doesn't support decompilation from archives. This method extracts + * Vineflower doesn't support decompilation from archives. This method extracts * request class file from the specified archive into temp directory and then * calls decompile. * diff --git a/org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower/decompiler/QuiltflowerDecompilerDescriptor.java b/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/decompiler/VineflowerDecompilerDescriptor.java similarity index 52% rename from org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower/decompiler/QuiltflowerDecompilerDescriptor.java rename to org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/decompiler/VineflowerDecompilerDescriptor.java index 7653378d..04907f96 100644 --- a/org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower/decompiler/QuiltflowerDecompilerDescriptor.java +++ b/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/decompiler/VineflowerDecompilerDescriptor.java @@ -1,33 +1,33 @@ -package org.sf.feeling.decompiler.quiltflower.decompiler; +package org.sf.feeling.decompiler.vineflower.decompiler; import org.eclipse.jface.action.Action; import org.eclipse.jface.resource.ImageDescriptor; import org.sf.feeling.decompiler.editor.BaseDecompilerSourceMapper; import org.sf.feeling.decompiler.editor.IDecompiler; import org.sf.feeling.decompiler.editor.IDecompilerDescriptor; -import org.sf.feeling.decompiler.quiltflower.QuiltflowerDecompilerPlugin; -import org.sf.feeling.decompiler.quiltflower.actions.DecompileWithQuiltflowerCoreAction; -import org.sf.feeling.decompiler.quiltflower.i18n.Messages; +import org.sf.feeling.decompiler.vineflower.VineflowerDecompilerPlugin; +import org.sf.feeling.decompiler.vineflower.actions.DecompileWithVineflowerCoreAction; +import org.sf.feeling.decompiler.vineflower.i18n.Messages; -public class QuiltflowerDecompilerDescriptor implements IDecompilerDescriptor { - private QuiltflowerDecompiler decompiler = null; - private QuiltflowerSourceMapper sourceMapper = null; +public class VineflowerDecompilerDescriptor implements IDecompilerDescriptor { + private VineflowerDecompiler decompiler = null; + private VineflowerSourceMapper sourceMapper = null; private Action decompileAction; @Override public String getDecompilerType() { - return QuiltflowerDecompilerPlugin.decompilerType; + return VineflowerDecompilerPlugin.decompilerType; } @Override public String getDecompilerPreferenceLabel() { - return Messages.getString("QuiltflowerDecompilerDescriptor.PreferenceLabel"); //$NON-NLS-1$ + return Messages.getString("VineflowerDecompilerDescriptor.PreferenceLabel"); //$NON-NLS-1$ } @Override public IDecompiler getDecompiler() { if (decompiler == null) { - decompiler = new QuiltflowerDecompiler(); + decompiler = new VineflowerDecompiler(); } return decompiler; @@ -36,7 +36,7 @@ public IDecompiler getDecompiler() { @Override public BaseDecompilerSourceMapper getDecompilerSourceMapper() { if (sourceMapper == null) { - sourceMapper = new QuiltflowerSourceMapper(); + sourceMapper = new VineflowerSourceMapper(); } return sourceMapper; } @@ -44,7 +44,7 @@ public BaseDecompilerSourceMapper getDecompilerSourceMapper() { @Override public Action getDecompileAction() { if (decompileAction == null) { - decompileAction = new DecompileWithQuiltflowerCoreAction(); + decompileAction = new DecompileWithVineflowerCoreAction(); } return decompileAction; } @@ -61,7 +61,7 @@ public boolean isDefault() { @Override public ImageDescriptor getDecompilerIcon() { - return QuiltflowerDecompilerPlugin.getImageDescriptor("icons/quiltflower_16.png"); //$NON-NLS-1$ + return VineflowerDecompilerPlugin.getImageDescriptor("icons/vineflower_16.png"); //$NON-NLS-1$ } } diff --git a/org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower/decompiler/QuiltflowerSourceMapper.java b/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/decompiler/VineflowerSourceMapper.java similarity index 78% rename from org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower/decompiler/QuiltflowerSourceMapper.java rename to org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/decompiler/VineflowerSourceMapper.java index 35e77f81..88f9959b 100644 --- a/org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower/decompiler/QuiltflowerSourceMapper.java +++ b/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/decompiler/VineflowerSourceMapper.java @@ -6,19 +6,19 @@ * https://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.sf.feeling.decompiler.quiltflower.decompiler; +package org.sf.feeling.decompiler.vineflower.decompiler; import java.util.Collection; import org.eclipse.core.runtime.Path; import org.sf.feeling.decompiler.editor.BaseDecompilerSourceMapper; -import org.sf.feeling.decompiler.quiltflower.QuiltflowerDecompilerPlugin; +import org.sf.feeling.decompiler.vineflower.VineflowerDecompilerPlugin; -public class QuiltflowerSourceMapper extends BaseDecompilerSourceMapper { +public class VineflowerSourceMapper extends BaseDecompilerSourceMapper { - public QuiltflowerSourceMapper() { + public VineflowerSourceMapper() { super(new Path("."), ""); //$NON-NLS-1$ //$NON-NLS-2$ - origionalDecompiler = new QuiltflowerDecompiler(); + origionalDecompiler = new VineflowerDecompiler(); } @Override @@ -38,9 +38,9 @@ protected void printDecompileReport(StringBuffer source, String fileLocation, Co exceptions.addAll(origionalDecompiler.getExceptions()); logExceptions(exceptions, source); source.append("\n\tDecompiled with "); //$NON-NLS-1$ - source.append(QuiltflowerDecompilerPlugin.decompilerType); + source.append(VineflowerDecompilerPlugin.decompilerType); source.append(" version "); //$NON-NLS-1$ - source.append(QuiltflowerDecompilerPlugin.decompilerVersion); + source.append(VineflowerDecompilerPlugin.decompilerVersion); source.append(".\n*/"); //$NON-NLS-1$ } diff --git a/org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower/i18n/Messages.java b/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/i18n/Messages.java similarity index 90% rename from org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower/i18n/Messages.java rename to org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/i18n/Messages.java index 07faaac6..e2f916c4 100644 --- a/org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower/i18n/Messages.java +++ b/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/i18n/Messages.java @@ -1,5 +1,5 @@ -package org.sf.feeling.decompiler.quiltflower.i18n; +package org.sf.feeling.decompiler.vineflower.i18n; import java.nio.charset.StandardCharsets; import java.text.MessageFormat; @@ -8,7 +8,7 @@ public class Messages { - private static final String BUNDLE_NAME = "org.sf.feeling.decompiler.quiltflower.i18n.messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.sf.feeling.decompiler.vineflower.i18n.messages"; //$NON-NLS-1$ private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME); diff --git a/org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower/i18n/messages.properties b/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/i18n/messages.properties similarity index 77% rename from org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower/i18n/messages.properties rename to org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/i18n/messages.properties index 48a694d3..1de73054 100644 --- a/org.sf.feeling.decompiler.quiltflower/src/org/sf/feeling/decompiler/quiltflower/i18n/messages.properties +++ b/org.sf.feeling.decompiler.vineflower/src/org/sf/feeling/decompiler/vineflower/i18n/messages.properties @@ -6,5 +6,5 @@ # https://www.eclipse.org/legal/epl-v10.html ############################################################################### -QuiltflowerDecompilerDescriptor.PreferenceLabel=Quiltflower -JavaDecompilerActionBarContributor.Action.DecompileWithQuiltflower=&Quiltflower \ No newline at end of file +VineflowerDecompilerDescriptor.PreferenceLabel=Vineflower +JavaDecompilerActionBarContributor.Action.DecompileWithVineflower=&Vineflower \ No newline at end of file diff --git a/org.sf.feeling.decompiler/about.properties b/org.sf.feeling.decompiler/about.properties index e4736c19..dcb701de 100644 --- a/org.sf.feeling.decompiler/about.properties +++ b/org.sf.feeling.decompiler/about.properties @@ -31,4 +31,4 @@ Used libraries by this feature and optional subprojects:\n\ * Nexus Restlet1x Model: Eclipse Public License v1.0 - https://www.eclipse.org/legal/epl-v10.html\n\ * Plexus Utils: Copyright The Codehaus Foundation, Apache License V2.0 - https://www.apache.org/licenses/LICENSE-2.0.html\n\ * JD-Core: Copyright Emmanuel Dupuy, GPL 3 - https://www.gnu.org/licenses/gpl-3.0-standalone.html -* Quiltflower: Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.html\n\ \ No newline at end of file +* Vineflower: Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.html\n\ \ No newline at end of file diff --git a/pom.xml b/pom.xml index 42a7df73..5d7724b6 100644 --- a/pom.xml +++ b/pom.xml @@ -27,8 +27,8 @@ org.sf.feeling.decompiler.jd.feature org.sf.feeling.decompiler.procyon org.sf.feeling.decompiler.procyon.feature - org.sf.feeling.decompiler.quiltflower - org.sf.feeling.decompiler.quiltflower.feature + org.sf.feeling.decompiler.vineflower + org.sf.feeling.decompiler.vineflower.feature org.sf.feeling.decompiler.source.attach org.sf.feeling.decompiler.source.feature org.sf.feeling.decompiler.assembly @@ -314,8 +314,8 @@ 1.2.26 - com.github.QuiltMC - quiltflower + org.vineflower + vineflower 1.9.3 diff --git a/site.xml b/site.xml index 2a0f258d..c7602f8f 100644 --- a/site.xml +++ b/site.xml @@ -15,11 +15,11 @@ - - - + + + - +