From 3b22fca205e3bddad3c8587dcee4bed6cbe8c3fd Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Fri, 10 Jan 2025 20:15:25 +0300 Subject: [PATCH] [#134] Fix connector runtime * import required packages * accept null for revision adapter --- .../META-INF/MANIFEST.MF | 11 +++++++++++ .../internal/adapt/svjhl/RevisionAdapter.java | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/bundles/ru.arsysop.svn.connector.svnkit1_10/META-INF/MANIFEST.MF b/bundles/ru.arsysop.svn.connector.svnkit1_10/META-INF/MANIFEST.MF index 642c293..8a9743e 100644 --- a/bundles/ru.arsysop.svn.connector.svnkit1_10/META-INF/MANIFEST.MF +++ b/bundles/ru.arsysop.svn.connector.svnkit1_10/META-INF/MANIFEST.MF @@ -7,6 +7,17 @@ Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: de.regnis.q.sequence.line;version="1.0.4", + net.jpountz.lz4, + net.jpountz.util, + net.jpountz.util.darwin.x86_64, + net.jpountz.util.linux.aarch64, + net.jpountz.util.linux.amd64, + net.jpountz.util.linux.i386, + net.jpountz.util.linux.ppc64le, + net.jpountz.util.linux.s390x, + net.jpountz.util.win32.amd64, + net.jpountz.xxhash, + org.antlr.runtime;version="[3.5.0,4.0.0)", org.apache.subversion.javahl;version="1.10.11", org.apache.subversion.javahl.callback;version="1.10.11", org.apache.subversion.javahl.types;version="1.10.11", diff --git a/bundles/ru.arsysop.svn.connector.svnkit1_10/src/ru/arsysop/svn/connector/internal/adapt/svjhl/RevisionAdapter.java b/bundles/ru.arsysop.svn.connector.svnkit1_10/src/ru/arsysop/svn/connector/internal/adapt/svjhl/RevisionAdapter.java index 06dc00c..9f09ff1 100644 --- a/bundles/ru.arsysop.svn.connector.svnkit1_10/src/ru/arsysop/svn/connector/internal/adapt/svjhl/RevisionAdapter.java +++ b/bundles/ru.arsysop.svn.connector.svnkit1_10/src/ru/arsysop/svn/connector/internal/adapt/svjhl/RevisionAdapter.java @@ -26,16 +26,16 @@ import org.apache.subversion.javahl.types.Revision; import org.eclipse.team.svn.core.connector.SVNRevision; -import ru.arsysop.svn.connector.internal.adapt.SvnTypeConstructor; +import ru.arsysop.svn.connector.internal.adapt.SvnNullableConstructor; -public final class RevisionAdapter extends SvnTypeConstructor { +public final class RevisionAdapter extends SvnNullableConstructor { public RevisionAdapter(SVNRevision revision) { super(revision); } @Override - public org.apache.subversion.javahl.types.Revision adapt() { + public org.apache.subversion.javahl.types.Revision adapt(SVNRevision source) { switch (source.getKind()) { case BASE: return org.apache.subversion.javahl.types.Revision.BASE;