functional/appBundlerTestsJDK9/appBundlerTestsJDK9/src/com/oracle/appbundlers/utils/BundlingManager.java

*** 28,38 ****
  
      private boolean installed = false;
  
      private final AbstractBundlerUtils bundlerUtils;
      protected AppWrapper app;
-     protected ExtensionType extensionType;
  
      public BundlingManager(AbstractBundlerUtils bundlerUtils) {
          this.bundlerUtils = bundlerUtils;
      }
  
--- 28,37 ----
*** 44,55 ****
  
      public Path execute(Map<String, Object> params, AppWrapper app)
              throws IOException {
          this.app = app;
          LOG.log(Level.INFO, "Bundling with params: {0}.", params);
!         Path bundlesDir = app.getBundlesDir();
!         return execute(params, bundlesDir.toFile()).toPath();
      }
  
      public Bundler getBundler() {
          return bundlerUtils.getBundler();
      }
--- 43,53 ----
  
      public Path execute(Map<String, Object> params, AppWrapper app)
              throws IOException {
          this.app = app;
          LOG.log(Level.INFO, "Bundling with params: {0}.", params);
!         return execute(params, app.getBundlesDir().toFile()).toPath();
      }
  
      public Bundler getBundler() {
          return bundlerUtils.getBundler();
      }
*** 122,146 ****
  
      public abstract String getShortName();
  
      @Override
      public String toString() {
!         return getShortName() + "-" + getExtensionType() + "-"
!                 + getBundler().getID();
      }
  
      public Path getAppCDSCacheFile(AppWrapper app, String appName) {
          return bundlerUtils.getAppCDSCacheFile(app, appName);
      }
  
      public AbstractBundlerUtils getBundlerUtils() {
          return bundlerUtils;
      }
- 
-     public ExtensionType getExtensionType() {
-         return this.extensionType;
-     }
- 
-     public void setExtensionType(ExtensionType extensionType) {
-         this.extensionType = extensionType;
-     }
  }
--- 120,135 ----
  
      public abstract String getShortName();
  
      @Override
      public String toString() {
!         return getBundler().getID() + "-" + getShortName();
      }
  
      public Path getAppCDSCacheFile(AppWrapper app, String appName) {
          return bundlerUtils.getAppCDSCacheFile(app, appName);
      }
  
      public AbstractBundlerUtils getBundlerUtils() {
          return bundlerUtils;
      }
  }