Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix compatibility with 2024-03 #164

Merged
merged 2 commits into from
Apr 13, 2024
Merged

fix compatibility with 2024-03 #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63ae5bb
Update ClassImportContainer.java
nbauma109 Apr 13, 2024
7f1342c
fix compatibility with 2024-03
Apr 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions org.sf.feeling.decompiler.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,13 @@
<import plugin="org.eclipse.ui.views"/>
<import plugin="org.eclipse.search"/>
<import plugin="org.eclipse.help.base"/>
<import plugin="org.eclipse.core.runtime" version="3.14.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.resources" version="3.13.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.workbench" version="3.111.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.core" version="3.14.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.debug" version="3.11.100" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.expressions" version="3.6.100" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.filesystem" version="1.7.100" match="greaterOrEqual"/>
<import plugin="org.apache.commons.codec" version="1.9.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime" version="3.31.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.resources" version="3.20.100" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.workbench" version="3.131.100" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.core" version="3.37.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.debug" version="3.21.300" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.expressions" version="3.9.300" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.filesystem" version="1.10.300" match="greaterOrEqual"/>
</requires>

<plugin
Expand Down
4 changes: 2 additions & 2 deletions org.sf.feeling.decompiler.source.attach/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ Require-Bundle: org.eclipse.ui,
org.apache.ant,
org.eclipse.jgit;resolution:=optional,
com.jcraft.jsch;resolution:=optional,
org.eclipse.m2e.jdt;resolution:=optional,
org.apache.commons.io
org.eclipse.m2e.jdt;resolution:=optional
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-ActivationPolicy: lazy
Bundle-Vendor: ECD Project Team
Expand Down Expand Up @@ -52,6 +51,7 @@ Bundle-ClassPath: lib/cvsclient-20060125.jar,
lib/jaxb-impl-2.3.8.jar,
lib/jaxb-runtime-2.3.3.jar,
lib/activation-1.1.1.jar,
lib/commons-io-2.16.0.jar,
.
Export-Package: org.sf.feeling.decompiler.source.attach,
org.sf.feeling.decompiler.source.attach.attacher,
Expand Down
1 change: 1 addition & 0 deletions org.sf.feeling.decompiler.source.attach/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ bin.includes = META-INF/,\
plugin.xml,\
lib/,\
plugin.properties,\
lib/commons-io-2.16.0.jar,\
lib/nexus-indexer-lucene-model-2.14.20-02.jar,\
lib/jaxb-api-2.3.1.jar,\
lib/activation-1.1.1.jar,\
Expand Down
10 changes: 10 additions & 0 deletions org.sf.feeling.decompiler.source.attach/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,12 @@
<overWrite>true</overWrite>
<outputDirectory>lib</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<overWrite>true</overWrite>
<outputDirectory>lib</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
Expand Down Expand Up @@ -326,6 +332,10 @@
<groupId>org.sonatype.nexus.plugins</groupId>
<artifactId>nexus-restlet1x-model</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
</dependencies>

</project>
3 changes: 1 addition & 2 deletions org.sf.feeling.decompiler/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.search,
org.eclipse.core.filesystem,
org.eclipse.equinox.p2.metadata;resolution:=optional,
org.eclipse.help.base,
org.apache.commons.codec
org.eclipse.help.base
Bundle-Vendor: ECD Project Team
Bundle-Version: 2024.3.0
Bundle-ManifestVersion: 2
Expand Down
1 change: 0 additions & 1 deletion org.sf.feeling.decompiler/src/org/sf/feeling/decompiler/editor/ClassImportContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,5 @@ public class ClassImportContainer extends ImportContainer {

protected ClassImportContainer(ClassFile parent) {
super(null);
setParent(parent);
}
}
4 changes: 2 additions & 2 deletions org.sf.feeling.decompiler/src/org/sf/feeling/decompiler/editor/DecompilerSourceMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public abstract class DecompilerSourceMapper extends SourceMapper {

protected boolean isAttachedSource;

public DecompilerSourceMapper(IPath sourcePath, String rootPath, Map options) {
protected DecompilerSourceMapper(IPath sourcePath, String rootPath, Map options) {
super(sourcePath, rootPath, options);
}

Expand All @@ -58,7 +58,7 @@ public char[] findSource(IType type) throws JavaModelException {
}
IBinaryType info = null;

info = (IBinaryType) declType.getElementInfo();
info = (IBinaryType) declType.getElementInfo(null);

if (info == null) {
return null;
Expand Down
Loading