Tony Mancill pushed to branch master at Debian Java Maintainers / eclipse-wtp
Commits: f2b349c8 by tony mancill at 2023-02-04T20:44:00-08:00 Replace IPluginRegistry with IExtensionRegistry (Closes: #1026494) - - - - - f6015d92 by tony mancill at 2023-02-04T20:50:18-08:00 Prepare changelog for upload - - - - - 3 changed files: - debian/changelog - + debian/patches/ftbfs-IPluginRegistry-FTBFS.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +eclipse-wtp (3.18-6) unstable; urgency=medium + + * Team upload. + * Replace IPluginRegistry with IExtensionRegistry (Closes: #1026494) + + -- tony mancill <tmanc...@debian.org> Sat, 04 Feb 2023 20:49:16 -0800 + eclipse-wtp (3.18-5) unstable; urgency=medium * Fix FTBFS cannot find symbol. (Closes: #972993) ===================================== debian/patches/ftbfs-IPluginRegistry-FTBFS.patch ===================================== @@ -0,0 +1,87 @@ +Description: Replace IPluginRegistry with IExtensionRegistry +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1026494 +Forwarded: not-needed +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/util/RegistryReader.java ++++ b/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/util/RegistryReader.java +@@ -59,7 +59,7 @@ + * @deprecated Use RegistryReader(plugin, extensionPoint) instead. The registry passed in is ignored. + * @since 1.0.0 + */ +- public RegistryReader(IPluginRegistry registry, String pluginID, String extensionPoint) { ++ public RegistryReader(IExtensionRegistry registry, String pluginID, String extensionPoint) { + this(pluginID, extensionPoint); + } + +--- a/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/RegistryReader.java ++++ b/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/RegistryReader.java +@@ -51,7 +51,7 @@ + * @deprecated Use RegistryReader(plugin, extensionPoint) instead. The registry passed in is ignored. + * @since 1.0.0 + */ +- public RegistryReader(IPluginRegistry registry, String pluginID, String extensionPoint) { ++ public RegistryReader(IExtensionRegistry registry, String pluginID, String extensionPoint) { + this(pluginID, extensionPoint); + } + +--- a/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/extension/RegistryReader.java ++++ b/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/extension/RegistryReader.java +@@ -20,7 +20,6 @@ + import org.eclipse.core.runtime.IExtension; + import org.eclipse.core.runtime.IExtensionPoint; + import org.eclipse.core.runtime.IExtensionRegistry; +-import org.eclipse.core.runtime.IPluginRegistry; + import org.eclipse.wst.sse.ui.internal.Logger; + import org.eclipse.wst.sse.ui.internal.util.Sorter; + +@@ -150,19 +149,6 @@ + } + + /** +- * @deprecated use readRegistry(IExtensionRegistry registry, String pluginId, String extensionPoint) +- */ +- protected void readRegistry(IPluginRegistry registry, String pluginId, String extensionPoint) { +- IExtensionPoint point = registry.getExtensionPoint(pluginId, extensionPoint); +- if (point != null) { +- IExtension[] extensions = point.getExtensions(); +- extensions = orderExtensions(extensions); +- for (int i = 0; i < extensions.length; i++) +- readExtension(extensions[i]); +- } +- } +- +- /** + * Start the registry reading process using the supplied plugin ID and + * extension point. + */ +--- a/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/util/RegistryReader.java ++++ b/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/util/RegistryReader.java +@@ -20,7 +20,6 @@ + import org.eclipse.core.runtime.IExtension; + import org.eclipse.core.runtime.IExtensionPoint; + import org.eclipse.core.runtime.IExtensionRegistry; +-import org.eclipse.core.runtime.IPluginRegistry; + import org.eclipse.wst.sse.ui.internal.Logger; + + +@@ -149,19 +148,6 @@ + } + + /** +- * @deprecated use readRegistry(IExtensionRegistry registry, String pluginId, String extensionPoint) +- */ +- protected void readRegistry(IPluginRegistry registry, String pluginId, String extensionPoint) { +- IExtensionPoint point = registry.getExtensionPoint(pluginId, extensionPoint); +- if (point != null) { +- IExtension[] extensions = point.getExtensions(); +- extensions = orderExtensions(extensions); +- for (int i = 0; i < extensions.length; i++) +- readExtension(extensions[i]); +- } +- } +- +- /** + * Start the registry reading process using the supplied plugin ID and + * extension point. + */ ===================================== debian/patches/series ===================================== @@ -7,3 +7,4 @@ versionless.patch 0001-528191-Replace-uses-of-org.eclipse.jface.util.Assert.patch fix_jface_text.patch 0002-528191-Replace-uses-of-org.eclipse.jface.util.Assert.patch +ftbfs-IPluginRegistry-FTBFS.patch View it on GitLab: https://salsa.debian.org/java-team/eclipse-wtp/-/compare/1c0406d435b4de02ae1257dde5b7abe6a2a1aef0...f6015d92f4a23624c503d43aedef3ee330073e64 -- View it on GitLab: https://salsa.debian.org/java-team/eclipse-wtp/-/compare/1c0406d435b4de02ae1257dde5b7abe6a2a1aef0...f6015d92f4a23624c503d43aedef3ee330073e64 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
