Skip to content

Commit

Permalink
quiltflower -> vineflower
Browse files Browse the repository at this point in the history
  • Loading branch information
nbauma109 committed Jan 21, 2024
1 parent ce8094e commit 9336d53
Show file tree
Hide file tree
Showing 45 changed files with 98 additions and 98 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

<p align="center"><img src="https://ecd-plugin.github.io/ecd/doc/o_debug_class.png"></p>

## 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).
Expand Down Expand Up @@ -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

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions org.sf.feeling.decompiler.assembly/assembly.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<include>com.github.ecd-plugin.features:org.sf.feeling.decompiler</include>
<include>com.github.ecd-plugin.features:org.sf.feeling.decompiler.cfr</include>
<include>com.github.ecd-plugin.features:org.sf.feeling.decompiler.jd</include>
<include>com.github.ecd-plugin.features:org.sf.feeling.decompiler.quiltflower</include>
<include>com.github.ecd-plugin.features:org.sf.feeling.decompiler.vineflower</include>
<include>com.github.ecd-plugin.features:org.sf.feeling.decompiler.procyon</include>
<include>com.github.ecd-plugin.features:org.sf.feeling.decompiler.source</include>
</includes>
Expand All @@ -49,7 +49,7 @@
<include>com.github.ecd-plugin:org.sf.feeling.decompiler</include>
<include>com.github.ecd-plugin:org.sf.feeling.decompiler.cfr</include>
<include>com.github.ecd-plugin:org.sf.feeling.decompiler.jd</include>
<include>com.github.ecd-plugin:org.sf.feeling.decompiler.quiltflower</include>
<include>com.github.ecd-plugin:org.sf.feeling.decompiler.vineflower</include>
<include>com.github.ecd-plugin:org.sf.feeling.decompiler.procyon</include>
<include>com.github.ecd-plugin:org.sf.feeling.decompiler.source.attach</include>
</includes>
Expand Down
2 changes: 1 addition & 1 deletion org.sf.feeling.decompiler.cfr.feature/feature.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion org.sf.feeling.decompiler.feature/feature.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion org.sf.feeling.decompiler.jd.feature/feature.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file not shown.
2 changes: 1 addition & 1 deletion org.sf.feeling.decompiler.source.feature/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
generate.plugin@org.sf.feeling.decompiler.vineflower.source = org.sf.feeling.decompiler.vineflower
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.sf.feeling.decompiler.quiltflower.feature</name>
<name>org.sf.feeling.decompiler.vineflower.feature</name>
<comment></comment>
<projects>
</projects>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.sf.feeling.decompiler.quiltflower"
id="org.sf.feeling.decompiler.vineflower"
label="%featureName"
version="3.5.5"
provider-name="%providerName"
plugin="org.sf.feeling.decompiler.quiltflower">
plugin="org.sf.feeling.decompiler.vineflower">

<description url="%aboutURL">
%description
Expand Down Expand Up @@ -43,7 +43,7 @@
</requires>

<plugin
id="org.sf.feeling.decompiler.quiltflower"
id="org.sf.feeling.decompiler.vineflower"
download-size="0"
install-size="0"
version="3.5.5"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
</parent>

<groupId>com.github.ecd-plugin.features</groupId>
<artifactId>org.sf.feeling.decompiler.quiltflower</artifactId>
<artifactId>org.sf.feeling.decompiler.vineflower</artifactId>
<packaging>eclipse-feature</packaging>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry exported="true" kind="lib" path="lib/quiltflower-1.9.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/vineflower-1.9.3.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.sf.feeling.decompiler.quiltflower</name>
<name>org.sf.feeling.decompiler.vineflower</name>
<comment></comment>
<projects>
</projects>
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ bin.includes = META-INF/,\
.,\
plugin.xml,\
icons/,\
lib/quiltflower-1.9.3.jar
lib/vineflower-1.9.3.jar
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,25 @@
<plugin>
<extension point="org.eclipse.ui.commands">
<command
name="Decompile With Quiltflower"
name="Decompile With Vineflower"
categoryId="org.sf.feeling.decompiler"
id="org.sf.feeling.decompiler.decompile.quiltflower">
id="org.sf.feeling.decompiler.decompile.vineflower">
</command>
</extension>
<extension
point="org.eclipse.ui.handlers">
<handler
commandId="org.sf.feeling.decompiler.decompile.quiltflower"
class="org.sf.feeling.decompiler.quiltflower.actions.DecompileWithQuiltflowerHandler">
commandId="org.sf.feeling.decompiler.decompile.vineflower"
class="org.sf.feeling.decompiler.vineflower.actions.DecompileWithVineflowerHandler">
</handler>
</extension>
<extension
point="org.sf.feeling.decompiler.decompilerAdapters">
<adaptable
class="org.sf.feeling.decompiler.JavaDecompilerPlugin">
<adapter
class="org.sf.feeling.decompiler.quiltflower.decompiler.QuiltflowerDecompilerDescriptor"
id="org.sf.feeling.decompiler.quiltflower.QuiltflowerDecompilerAdapter"
class="org.sf.feeling.decompiler.vineflower.decompiler.VineflowerDecompilerDescriptor"
id="org.sf.feeling.decompiler.vineflower.VineflowerDecompilerAdapter"
singleton="true"
type="org.sf.feeling.decompiler.editor.IDecompilerDescriptor">
</adapter>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>org.sf.feeling.decompiler.quiltflower</artifactId>
<artifactId>org.sf.feeling.decompiler.vineflower</artifactId>
<packaging>eclipse-plugin</packaging>

<properties>
Expand All @@ -34,8 +34,8 @@
<configuration>
<artifactItems>
<artifactItem>
<groupId>com.github.QuiltMC</groupId>
<artifactId>quiltflower</artifactId>
<groupId>org.vineflower</groupId>
<artifactId>vineflower</artifactId>
<overWrite>true</overWrite>
<outputDirectory>lib</outputDirectory>
</artifactItem>
Expand All @@ -61,8 +61,8 @@
</build>
<dependencies>
<dependency>
<groupId>com.github.QuiltMC</groupId>
<artifactId>quiltflower</artifactId>
<groupId>org.vineflower</groupId>
<artifactId>vineflower</artifactId>
</dependency>
<dependency>
<groupId>com.eclipsesource.minimal-json</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

package org.sf.feeling.decompiler.quiltflower;
package org.sf.feeling.decompiler.vineflower;

import java.net.MalformedURLException;
import java.net.URL;
Expand All @@ -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;

Expand Down Expand Up @@ -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$
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

}
Loading

0 comments on commit 9336d53

Please sign in to comment.