[Nmedit-cvs] nmedit/libs/nordmodular/src/net/sf/nmedit/jtheme/clavia/nordmodular/store MultiEnvDisplayStore.java, 1.2, 1.3 EqShelveDisplayStore.java, 1.2, 1.3 AbstractEnvelopeStore.java, 1.2, 1.3 CompressorDisplayStore.java, 1.2, 1.3 FilterFDisplayStore.java, 1.2, 1.3 VocoderDisplayStore.java, 1.1, 1.2 NoteVelScaleDisplayStore.java, 1.2, 1.3 EqMidDisplayStore.java, 1.2, 1.3 FilterEDisplayStore.java, 1.3, 1.4 NoteSeqEditorStore.java, 1.2, 1.3 LFODisplayStore.java, 1.2, 1.3 PhaserDisplayStore.java, 1.2, 1.3

[Christian S. <ch...@us...>]

Update of /cvsroot/nmedit/nmedit/libs/nordmodular/src/net/sf/nmedit/jtheme/clavia/nordmodular/store
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17430/nordmodular/src/net/sf/nmedit/jtheme/clavia/nordmodular/store

Modified Files:
	MultiEnvDisplayStore.java EqShelveDisplayStore.java 
	AbstractEnvelopeStore.java CompressorDisplayStore.java 
	FilterFDisplayStore.java VocoderDisplayStore.java 
	NoteVelScaleDisplayStore.java EqMidDisplayStore.java 
	FilterEDisplayStore.java NoteSeqEditorStore.java 
	LFODisplayStore.java PhaserDisplayStore.java 
Log Message:


Index: EqShelveDisplayStore.java
===================================================================
RCS file: /cvsroot/nmedit/nmedit/libs/nordmodular/src/net/sf/nmedit/jtheme/clavia/nordmodular/store/EqShelveDisplayStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EqShelveDisplayStore.java	28 May 2007 23:00:20 -0000	1.2
--- EqShelveDisplayStore.java	28 May 2007 23:49:55 -0000	1.3
***************
*** 47,51 ****
      }
  
!     protected void initDescriptors(Element element)
      {
          parameterId = lookupChildElementComponentId("frequency");
--- 47,51 ----
      }
  
!     protected void initDescriptors()
      {
          parameterId = lookupChildElementComponentId("frequency");

Index: VocoderDisplayStore.java
===================================================================
RCS file: /cvsroot/nmedit/nmedit/libs/nordmodular/src/net/sf/nmedit/jtheme/clavia/nordmodular/store/VocoderDisplayStore.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VocoderDisplayStore.java	28 May 2007 23:00:19 -0000	1.1
--- VocoderDisplayStore.java	28 May 2007 23:49:55 -0000	1.2
***************
*** 40,44 ****
      {
          super(element);
!         initDescriptors(element);
      }
  
--- 40,44 ----
      {
          super(element);
!         initDescriptors();
      }
  
***************
*** 49,55 ****
      }
      
!     protected void initDescriptors(Element element)
      {
!         for (Object oelement : element.getChildren("parameter"))
          {
              Element e = (Element) oelement;
--- 49,55 ----
      }
      
!     protected void initDescriptors()
      {
!         for (Object oelement : getElement().getChildren("parameter"))
          {
              Element e = (Element) oelement;

Index: LFODisplayStore.java
===================================================================
RCS file: /cvsroot/nmedit/nmedit/libs/nordmodular/src/net/sf/nmedit/jtheme/clavia/nordmodular/store/LFODisplayStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LFODisplayStore.java	28 May 2007 23:00:19 -0000	1.2
--- LFODisplayStore.java	28 May 2007 23:49:55 -0000	1.3
***************
*** 44,53 ****
      }
  
!     protected void initDescriptors(Element element)
      {
          phaseDescriptorId = lookupChildElementComponentId("phase");
          shapeDescriptorId = lookupChildElementComponentId("shape");
          
!         Element wv = element.getChild("waveform");
          String wvvalue = wv != null ? wv.getAttributeValue("value") : null;
          if (wvvalue != null)
--- 44,53 ----
      }
  
!     protected void initDescriptors()
      {
          phaseDescriptorId = lookupChildElementComponentId("phase");
          shapeDescriptorId = lookupChildElementComponentId("shape");
          
!         Element wv = getElement().getChild("waveform");
          String wvvalue = wv != null ? wv.getAttributeValue("value") : null;
          if (wvvalue != null)
***************
*** 91,95 ****
              disp.setWaveForm(waveform);
  
!         if (phase != null) disp.setPhaseAdapter(new JTParameterControlAdapter(phase));
          if (shape != null) disp.setWaveAdapter(new JTParameterControlAdapter(shape));
      }
--- 91,98 ----
              disp.setWaveForm(waveform);
  
!         if (phase == null)
!             throw new JTException("parameter phase not found [id="+phaseDescriptorId+"] in "+module);
!         
!         disp.setPhaseAdapter(new JTParameterControlAdapter(phase));
          if (shape != null) disp.setWaveAdapter(new JTParameterControlAdapter(shape));
      }

Index: FilterEDisplayStore.java
===================================================================
RCS file: /cvsroot/nmedit/nmedit/libs/nordmodular/src/net/sf/nmedit/jtheme/clavia/nordmodular/store/FilterEDisplayStore.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FilterEDisplayStore.java	28 May 2007 23:00:18 -0000	1.3
--- FilterEDisplayStore.java	28 May 2007 23:49:55 -0000	1.4
***************
*** 49,53 ****
      }
  
!     protected void initDescriptors(Element element)
      {
          parameterId = lookupChildElementComponentId("cutoff");
--- 49,53 ----
      }
  
!     protected void initDescriptors()
      {
          parameterId = lookupChildElementComponentId("cutoff");

Index: PhaserDisplayStore.java
===================================================================
RCS file: /cvsroot/nmedit/nmedit/libs/nordmodular/src/net/sf/nmedit/jtheme/clavia/nordmodular/store/PhaserDisplayStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PhaserDisplayStore.java	28 May 2007 23:00:16 -0000	1.2
--- PhaserDisplayStore.java	28 May 2007 23:49:55 -0000	1.3
***************
*** 48,52 ****
      }
  
!     protected void initDescriptors(Element element)
      {
          parameterId = lookupChildElementComponentId("feedback");
--- 48,52 ----
      }
  
!     protected void initDescriptors()
      {
          parameterId = lookupChildElementComponentId("feedback");

Index: NoteSeqEditorStore.java
===================================================================
RCS file: /cvsroot/nmedit/nmedit/libs/nordmodular/src/net/sf/nmedit/jtheme/clavia/nordmodular/store/NoteSeqEditorStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NoteSeqEditorStore.java	28 May 2007 23:00:15 -0000	1.2
--- NoteSeqEditorStore.java	28 May 2007 23:49:55 -0000	1.3
***************
*** 46,50 ****
      }
      
!     protected void initDescriptors(Element element)
      {
          idlist = new String[16];
--- 46,50 ----
      }
      
!     protected void initDescriptors()
      {
          idlist = new String[16];

Index: CompressorDisplayStore.java
===================================================================
RCS file: /cvsroot/nmedit/nmedit/libs/nordmodular/src/net/sf/nmedit/jtheme/clavia/nordmodular/store/CompressorDisplayStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CompressorDisplayStore.java	28 May 2007 23:00:18 -0000	1.2
--- CompressorDisplayStore.java	28 May 2007 23:49:55 -0000	1.3
***************
*** 50,54 ****
      }
  
!     protected void initDescriptors(Element element)
      {
          parameterId = lookupChildElementComponentId("threshold");
--- 50,54 ----
      }
  
!     protected void initDescriptors()
      {
          parameterId = lookupChildElementComponentId("threshold");

Index: AbstractEnvelopeStore.java
===================================================================
RCS file: /cvsroot/nmedit/nmedit/libs/nordmodular/src/net/sf/nmedit/jtheme/clavia/nordmodular/store/AbstractEnvelopeStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AbstractEnvelopeStore.java	28 May 2007 23:00:18 -0000	1.2
--- AbstractEnvelopeStore.java	28 May 2007 23:49:55 -0000	1.3
***************
*** 45,49 ****
      }
  
!     protected void initDescriptors(Element element)
      {
          parameterId = lookupChildElementComponentId("attack");
--- 45,49 ----
      }
  
!     protected void initDescriptors()
      {
          parameterId = lookupChildElementComponentId("attack");

Index: FilterFDisplayStore.java
===================================================================
RCS file: /cvsroot/nmedit/nmedit/libs/nordmodular/src/net/sf/nmedit/jtheme/clavia/nordmodular/store/FilterFDisplayStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FilterFDisplayStore.java	28 May 2007 23:00:17 -0000	1.2
--- FilterFDisplayStore.java	28 May 2007 23:49:55 -0000	1.3
***************
*** 48,52 ****
      }
  
!     protected void initDescriptors(Element element)
      {
          parameterId = lookupChildElementComponentId("cutoff");
--- 48,52 ----
      }
  
!     protected void initDescriptors()
      {
          parameterId = lookupChildElementComponentId("cutoff");

Index: NoteVelScaleDisplayStore.java
===================================================================
RCS file: /cvsroot/nmedit/nmedit/libs/nordmodular/src/net/sf/nmedit/jtheme/clavia/nordmodular/store/NoteVelScaleDisplayStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NoteVelScaleDisplayStore.java	28 May 2007 23:00:20 -0000	1.2
--- NoteVelScaleDisplayStore.java	28 May 2007 23:49:55 -0000	1.3
***************
*** 48,52 ****
      }
  
!     protected void initDescriptors(Element element)
      {
          parameterId = lookupChildElementComponentId("left-gain");
--- 48,52 ----
      }
  
!     protected void initDescriptors()
      {
          parameterId = lookupChildElementComponentId("left-gain");

Index: MultiEnvDisplayStore.java
===================================================================
RCS file: /cvsroot/nmedit/nmedit/libs/nordmodular/src/net/sf/nmedit/jtheme/clavia/nordmodular/store/MultiEnvDisplayStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MultiEnvDisplayStore.java	28 May 2007 23:00:20 -0000	1.2
--- MultiEnvDisplayStore.java	28 May 2007 23:49:55 -0000	1.3
***************
*** 49,53 ****
      }
  
!     protected void initDescriptors(Element element)
      {
          parameterId = lookupChildElementComponentId("sustain");
--- 49,53 ----
      }
  
!     protected void initDescriptors()
      {
          parameterId = lookupChildElementComponentId("sustain");

Index: EqMidDisplayStore.java
===================================================================
RCS file: /cvsroot/nmedit/nmedit/libs/nordmodular/src/net/sf/nmedit/jtheme/clavia/nordmodular/store/EqMidDisplayStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EqMidDisplayStore.java	28 May 2007 23:00:18 -0000	1.2
--- EqMidDisplayStore.java	28 May 2007 23:49:55 -0000	1.3
***************
*** 48,52 ****
      }
  
!     protected void initDescriptors(Element element)
      {
          parameterId = lookupChildElementComponentId("frequency");
--- 48,52 ----
      }
  
!     protected void initDescriptors()
      {
          parameterId = lookupChildElementComponentId("frequency");