[nobug] increment features for 3.22, update references to IPluginRegistry

4 files changed, 5 insertions, 38 deletions

diff --git a/core/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF b/core/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF
index 7b9b2121a4..3699371ca0 100755
--- a/core/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF
+++ b/core/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.sse.ui; singleton:=true
-Bundle-Version: 1.7.100.qualifier
+Bundle-Version: 1.7.200.qualifier
 Bundle-Activator: org.eclipse.wst.sse.ui.internal.SSEUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -74,3 +74,4 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.14.0,4.0.0)",
 Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.wst.sse.ui.internal.propertytester"
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.wst.sse.ui
diff --git a/core/bundles/org.eclipse.wst.sse.ui/pom.xml b/core/bundles/org.eclipse.wst.sse.ui/pom.xml
index 1b0ccc0b80..4d49ba2d4b 100644
--- a/core/bundles/org.eclipse.wst.sse.ui/pom.xml
+++ b/core/bundles/org.eclipse.wst.sse.ui/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.sse.ui</artifactId>
-  <version>1.7.100-SNAPSHOT</version>
+  <version>1.7.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build> 
diff --git a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/extension/RegistryReader.java b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/extension/RegistryReader.java
index db112f65b1..5d73ff4d1e 100644
--- a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/extension/RegistryReader.java
+++ b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/extension/RegistryReader.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
+ * Copyright (c) 2001, 2021 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -14,17 +14,13 @@
  *******************************************************************************/
 package org.eclipse.wst.sse.ui.internal.extension;
 
-
-
 import org.eclipse.core.runtime.IConfigurationElement;
 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;
 
-
 /**
  * Template implementation of a registry reader that creates objects
  * representing registry contents. Typically, an extension contains one
@@ -148,19 +144,6 @@ public abstract class RegistryReader {
 	protected void readExtension(IExtension extension) {
 		readElements(extension.getConfigurationElements());
 	}
-
-	/**
-	 * @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
diff --git a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/util/RegistryReader.java b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/util/RegistryReader.java
index 99baf06f39..925fee0780 100644
--- a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/util/RegistryReader.java
+++ b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/util/RegistryReader.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
+ * Copyright (c) 2001, 2021 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -14,16 +14,12 @@
  *******************************************************************************/
 package org.eclipse.wst.sse.ui.internal.util;
 
-
-
 import org.eclipse.core.runtime.IConfigurationElement;
 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;
 
-
 /**
  * Template implementation of a registry reader that creates objects
  * representing registry contents. Typically, an extension contains one
@@ -147,19 +143,6 @@ public abstract class RegistryReader {
 	protected void readExtension(IExtension extension) {
 		readElements(extension.getConfigurationElements());
 	}
-
-	/**
-	 * @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