124c124
< public class NbCatalogManager extends CatalogManager {
---
> public class CatalogManager {
134c134
<   private static NbCatalogManager staticManager = new NbCatalogManager();
---
>   private static CatalogManager staticManager = new CatalogManager();
206,207c206
<   public NbCatalogManager() {
<       System.out.println("## patched CatalogManager.constructor1");
---
>   public CatalogManager() {
216,222c215,216
<   /**
<    * Constructor that specifies an explicit property file.
<    * @param propertyFile path to poperty file (e.g. com/resources/CatalogManager).
<    * <code>null</code> means that no property file is consulted at all.
<    */
<   public NbCatalogManager(String propertyFile) {
<       System.out.println("## patched CatalogManager.constructor2");
---
>   /** Constructor that specifies an explicit property file. */
>   public CatalogManager(String propertyFile) {
248d241
<       if (propertyFile == null) return;
250c243
<       propertyFileURI = NbCatalogManager.class.getResource("/"+propertyFile);
---
>       propertyFileURI = CatalogManager.class.getResource("/"+propertyFile);
252c245
< 	NbCatalogManager.class.getResourceAsStream("/"+propertyFile);
---
> 	CatalogManager.class.getResourceAsStream("/"+propertyFile);
255c248
<         debug.message(2, "Cannot find "+propertyFile);
---
> 	  System.err.println("Cannot find "+propertyFile);