src/java.desktop/share/classes/com/sun/media/sound/SimpleSoundbank.java

*** 20,29 ****
--- 20,30 ----
   *
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
+ 
  package com.sun.media.sound;
  
  import java.util.ArrayList;
  import java.util.Arrays;
  import java.util.List;
*** 42,66 ****
  
      String name = "";
      String version = "";
      String vendor = "";
      String description = "";
!     List<SoundbankResource> resources = new ArrayList<SoundbankResource>();
!     List<Instrument> instruments = new ArrayList<Instrument>();
  
      public String getName() {
          return name;
      }
  
      public String getVersion() {
          return version;
      }
  
      public String getVendor() {
          return vendor;
      }
  
      public String getDescription() {
          return description;
      }
  
      public void setDescription(String description) {
--- 43,71 ----
  
      String name = "";
      String version = "";
      String vendor = "";
      String description = "";
!     List<SoundbankResource> resources = new ArrayList<>();
!     List<Instrument> instruments = new ArrayList<>();
  
+     @Override
      public String getName() {
          return name;
      }
  
+     @Override
      public String getVersion() {
          return version;
      }
  
+     @Override
      public String getVendor() {
          return vendor;
      }
  
+     @Override
      public String getDescription() {
          return description;
      }
  
      public void setDescription(String description) {
*** 77,97 ****
--- 82,105 ----
  
      public void setVersion(String version) {
          this.version = version;
      }
  
+     @Override
      public SoundbankResource[] getResources() {
          return resources.toArray(new SoundbankResource[resources.size()]);
      }
  
+     @Override
      public Instrument[] getInstruments() {
          Instrument[] inslist_array
                  = instruments.toArray(new Instrument[resources.size()]);
          Arrays.sort(inslist_array, new ModelInstrumentComparator());
          return inslist_array;
      }
  
+     @Override
      public Instrument getInstrument(Patch patch) {
          int program = patch.getProgram();
          int bank = patch.getBank();
          boolean percussion = false;
          if (patch instanceof ModelPatch)
*** 118,128 ****
              resources.add(resource);
      }
  
      public void removeResource(SoundbankResource resource) {
          if (resource instanceof Instrument)
!             instruments.remove((Instrument) resource);
          else
              resources.remove(resource);
      }
  
      public void addInstrument(Instrument resource) {
--- 126,136 ----
              resources.add(resource);
      }
  
      public void removeResource(SoundbankResource resource) {
          if (resource instanceof Instrument)
!             instruments.remove(resource);
          else
              resources.remove(resource);
      }
  
      public void addInstrument(Instrument resource) {