Don't use static access in ArchetypeCatalogsWriter

Fix #971

Author: laeubi

org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/archetype/ArchetypeCatalogsWriter.java

@@ -45,7 +45,6 @@
 import org.eclipse.osgi.util.NLS;
 
 import org.eclipse.m2e.core.internal.Messages;
-import org.eclipse.m2e.core.ui.internal.M2EUIPluginActivator;
 import org.eclipse.m2e.core.ui.internal.archetype.ArchetypeCatalogFactory.LocalCatalogFactory;
 import org.eclipse.m2e.core.ui.internal.archetype.ArchetypeCatalogFactory.RemoteCatalogFactory;
 
@@ -78,13 +77,13 @@ public class ArchetypeCatalogsWriter {
 
   public static final String ATT_CATALOG_ENABLED = "enabled";
 
-  public Collection<ArchetypeCatalogFactory> readArchetypeCatalogs(InputStream is,
-      Map<String, ArchetypeCatalogFactory> existingCatalogs) throws IOException {
+  Collection<ArchetypeCatalogFactory> readArchetypeCatalogs(InputStream is,
+      Map<String, ArchetypeCatalogFactory> existingCatalogs, ArchetypePlugin plugin) throws IOException {
     Collection<ArchetypeCatalogFactory> catalogs = new ArrayList<>();
     try {
       SAXParserFactory parserFactory = SAXParserFactory.newInstance();
       SAXParser parser = parserFactory.newSAXParser();
-      parser.parse(is, new ArchetypeCatalogsContentHandler(catalogs, existingCatalogs));
+      parser.parse(is, new ArchetypeCatalogsContentHandler(catalogs, existingCatalogs, plugin));
     } catch(SAXException ex) {
       String msg = Messages.ArchetypeCatalogsWriter_error_parse;
       log.error(msg, ex);
@@ -159,9 +158,12 @@ static class ArchetypeCatalogsContentHandler extends DefaultHandler {
 
     private final Map<String, ArchetypeCatalogFactory> existingCatalogs;
 
+    private ArchetypePlugin plugin;
+
     public ArchetypeCatalogsContentHandler(Collection<ArchetypeCatalogFactory> catalogs,
-        Map<String, ArchetypeCatalogFactory> existingCatalogs) {
+        Map<String, ArchetypeCatalogFactory> existingCatalogs, ArchetypePlugin plugin) {
       this.catalogs = catalogs;
+      this.plugin = plugin;
       this.existingCatalogs = existingCatalogs == null ? Collections.emptyMap() : existingCatalogs;
     }
 
@@ -175,14 +177,14 @@ public void startElement(String uri, String localName, String qName, Attributes
           String path = attributes.getValue(ATT_CATALOG_LOCATION);
           if(path != null) {
             String description = attributes.getValue(ATT_CATALOG_DESCRIPTION);
-            catalogs.add(M2EUIPluginActivator.getDefault().getArchetypePlugin().newLocalCatalogFactory(path,
+            catalogs.add(plugin.newLocalCatalogFactory(path,
                 description, true, enabled));
           }
         } else if(TYPE_REMOTE.equals(type)) {
           String url = attributes.getValue(ATT_CATALOG_LOCATION);
           if(url != null) {
             String description = attributes.getValue(ATT_CATALOG_DESCRIPTION);
-            catalogs.add(M2EUIPluginActivator.getDefault().getArchetypePlugin().newRemoteCatalogFactory(url,
+            catalogs.add(plugin.newRemoteCatalogFactory(url,
                 description, true, enabled));
           }
         } else {

org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/archetype/ArchetypePlugin.java

@@ -24,7 +24,6 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.stream.Collectors;
 
 import org.osgi.service.component.annotations.Activate;
@@ -104,7 +103,7 @@ public ArchetypePlugin() {
   }
 
   @Activate
-  void activate() throws IOException, PlexusContainerException, ComponentLookupException {
+  void activate() throws PlexusContainerException, ComponentLookupException {
     final Module logginModule = new AbstractModule() {
       @Override
       protected void configure() {
@@ -119,18 +118,18 @@ protected void configure() {
     container = new DefaultPlexusContainer(cc, logginModule);
     archetypeArtifactManager = container.lookup(ArchetypeArtifactManager.class);
     archetypeDataSourceMap = container.lookupMap(ArchetypeDataSource.class);
-    for(Entry<String, ArchetypeDataSource> entry : archetypeDataSourceMap.entrySet()) {
-      System.out.println(entry.getKey() + " :: " + entry.getValue());
-    }
-    System.out.println(archetypeArtifactManager);
     addArchetypeCatalogFactory(
         new ArchetypeCatalogFactory.InternalCatalogFactory(archetypeDataSourceMap.get("internal-catalog")));
     addArchetypeCatalogFactory(
         new ArchetypeCatalogFactory.DefaultLocalCatalogFactory(maven, archetypeDataSourceMap.get("catalog")));
     for(ArchetypeCatalogFactory archetypeCatalogFactory : ExtensionReader.readArchetypeExtensions(this)) {
       addArchetypeCatalogFactory(archetypeCatalogFactory);
     }
-    readCatalogs();
+    try {
+      readCatalogs();
+    } catch(IOException e) {
+      M2EUIPluginActivator.getDefault().getLog().error("Can't read catalogs!", e);
+    }
   }
 
   @Deactivate
@@ -185,7 +184,7 @@ public ArchetypeCatalogFactory getArchetypeCatalogFactory(String catalogId) {
   public void readCatalogs() throws IOException {
     if(configFile.exists()) {
       try (InputStream is = new FileInputStream(configFile)) {
-        Collection<ArchetypeCatalogFactory> userDefinedCatalogs = writer.readArchetypeCatalogs(is, catalogs);
+        Collection<ArchetypeCatalogFactory> userDefinedCatalogs = writer.readArchetypeCatalogs(is, catalogs, this);
         for(ArchetypeCatalogFactory it : userDefinedCatalogs) {
           addArchetypeCatalogFactory(it);
         }
@@ -229,8 +228,7 @@ public List<RequiredProperty> getRequiredProperties(IArchetype archetype, IProgr
         ArchetypeDescriptor descriptor;
         try {
           descriptor = archetypeArtifactManager.getFileSetArchetypeDescriptor(groupId, artifactId, version, null,
-              localRepository,
-              repositories, context.newProjectBuildingRequest());
+              localRepository, repositories, context.newProjectBuildingRequest());
         } catch(UnknownArchetype ex) {
           throw new CoreException(Status.error("UnknownArchetype", ex));
         }