[Jsynthlib-cvs] JSynthLib/core PatchEdit.java,1.15,1.16

[<dqu...@us...>]

Update of /cvsroot/jsynthlib/JSynthLib/core
In directory sc8-pr-cvs1:/tmp/cvs-serv26946

Modified Files:
	PatchEdit.java 
Log Message:
Action classes in public, use PatchContainer in MIDI input loop to avoid classcastexception on jinternalframe that don't extends PatchEditorFrame.


Index: PatchEdit.java
===================================================================
RCS file: /cvsroot/jsynthlib/JSynthLib/core/PatchEdit.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** PatchEdit.java	10 Apr 2003 20:37:09 -0000	1.15
--- PatchEdit.java	11 Aug 2003 10:06:45 -0000	1.16
***************
*** 63,66 ****
--- 63,67 ----
      DocumentationWindow documentationWindow; 
     public static PatchEdit instance;                        // ph...@mu...
+    
  
      // Initialize Application:                                  *
***************
*** 597,601 ****
     the menubar, popup menu or toolbar.*/
      
!      class ReassignAction extends AbstractAction
       {
           public ReassignAction ()
--- 598,602 ----
     the menubar, popup menu or toolbar.*/
      
!      public class ReassignAction extends AbstractAction
       {
           public ReassignAction ()
***************
*** 614,618 ****
       }
      
!     class PlayAction extends AbstractAction
      {
          public PlayAction ()
--- 615,619 ----
       }
      
!     public class PlayAction extends AbstractAction
      {
          public PlayAction ()
***************
*** 631,635 ****
      }
      
!     class StoreAction extends AbstractAction
      {
          public StoreAction ()
--- 632,636 ----
      }
      
!     public class StoreAction extends AbstractAction
      {
          public StoreAction ()
***************
*** 649,653 ****
      }
      
!     class SendAction extends AbstractAction
      {
          public SendAction ()
--- 650,654 ----
      }
      
!     public class SendAction extends AbstractAction
      {
          public SendAction ()
***************
*** 667,671 ****
      }
      
!      class SendToAction extends AbstractAction
       {
           public SendToAction ()
--- 668,672 ----
      }
      
!      public class SendToAction extends AbstractAction
       {
           public SendToAction ()
***************
*** 685,689 ****
       }
       
!     class DeleteAction extends AbstractAction
      {
          public DeleteAction ()
--- 686,690 ----
       }
       
!     public class DeleteAction extends AbstractAction
      {
          public DeleteAction ()
***************
*** 704,708 ****
      }
      
!     class CopyAction extends AbstractAction
      {
          public CopyAction ()
--- 705,709 ----
      }
      
!     public class CopyAction extends AbstractAction
      {
          public CopyAction ()
***************
*** 722,726 ****
      }
      
!     class CutAction extends AbstractAction
      {
          public CutAction ()
--- 723,727 ----
      }
      
!     public class CutAction extends AbstractAction
      {
          public CutAction ()
***************
*** 741,745 ****
      }
      
!     class PasteAction extends AbstractAction
      {
          public PasteAction ()
--- 742,746 ----
      }
      
!     public class PasteAction extends AbstractAction
      {
          public PasteAction ()
***************
*** 759,763 ****
      }
      
!     class EditAction extends AbstractAction
      {
          public EditAction ()
--- 760,764 ----
      }
      
!     public class EditAction extends AbstractAction
      {
          public EditAction ()
***************
*** 796,800 ****
      
      
!     class ExportAction extends AbstractAction
      {
          public ExportAction ()
--- 797,801 ----
      
      
!     public class ExportAction extends AbstractAction
      {
          public ExportAction ()
***************
*** 831,835 ****
  //======================================================================================================================
  
!   class GetAction extends AbstractAction {
  
  //----------------------------------------------------------------------------------------------------------------------
--- 832,836 ----
  //======================================================================================================================
  
!   public class GetAction extends AbstractAction {
  
  //----------------------------------------------------------------------------------------------------------------------
***************
*** 857,861 ****
  //------ End ph...@mu...
  
!     class ImportAction extends AbstractAction
      {
          public ImportAction ()
--- 858,864 ----
  //------ End ph...@mu...
  
! // denis: mis en public toutes les classes Action
! 
!     public class ImportAction extends AbstractAction
      {
          public ImportAction ()
***************
*** 892,896 ****
      }
      
!     class NewAction extends AbstractAction
      {
          public NewAction ()
--- 895,899 ----
      }
      
!     public class NewAction extends AbstractAction
      {
          public NewAction ()
***************
*** 903,907 ****
      }
  
!     class NewSceneAction extends AbstractAction
      {
          public NewSceneAction ()
--- 906,910 ----
      }
  
!     public class NewSceneAction extends AbstractAction
      {
          public NewSceneAction ()
***************
*** 917,921 ****
      
  
!    class TransferSceneAction extends AbstractAction
      {
          public TransferSceneAction ()
--- 920,924 ----
      
  
!    public class TransferSceneAction extends AbstractAction
      {
          public TransferSceneAction ()
***************
*** 934,938 ****
          }
      }
!     class OpenAction extends AbstractAction
      {
          public OpenAction ()
--- 937,941 ----
          }
      }
!     public class OpenAction extends AbstractAction
      {
          public OpenAction ()
***************
*** 955,959 ****
          }
      }
!     class SaveAction extends AbstractAction
      {
          public SaveAction ()
--- 958,962 ----
          }
      }
!     public class SaveAction extends AbstractAction
      {
          public SaveAction ()
***************
*** 968,972 ****
          }
      }
!     class ExitAction extends AbstractAction
      {
          public ExitAction ()
--- 971,975 ----
          }
      }
!     public class ExitAction extends AbstractAction
      {
          public ExitAction ()
***************
*** 981,985 ****
      }
      
!     class ExtractAction extends AbstractAction
      {
          public ExtractAction ()
--- 984,988 ----
      }
      
!     public class ExtractAction extends AbstractAction
      {
          public ExtractAction ()
***************
*** 998,1002 ****
          }
      }
!     class SortAction extends AbstractAction
      {
          public SortAction ()
--- 1001,1005 ----
          }
      }
!     public class SortAction extends AbstractAction
      {
          public SortAction ()
***************
*** 1017,1021 ****
      }
      
!     class SearchAction extends AbstractAction
      {
          public SearchAction ()
--- 1020,1024 ----
      }
      
!     public class SearchAction extends AbstractAction
      {
          public SearchAction ()
***************
*** 1037,1041 ****
      
      
!     class ImportAllAction extends AbstractAction
      {
          public ImportAllAction ()
--- 1040,1044 ----
      
      
!     public class ImportAllAction extends AbstractAction
      {
          public ImportAllAction ()
***************
*** 1067,1071 ****
          }
      }
!     class DeleteDuplicatesAction extends AbstractAction
      {
          public DeleteDuplicatesAction ()
--- 1070,1074 ----
          }
      }
!     public class DeleteDuplicatesAction extends AbstractAction
      {
          public DeleteDuplicatesAction ()
***************
*** 1104,1108 ****
      
      
!     class NewPatchAction extends AbstractAction
      {
          public NewPatchAction ()
--- 1107,1111 ----
      
      
!     public class NewPatchAction extends AbstractAction
      {
          public NewPatchAction ()
***************
*** 1127,1131 ****
      
      
!     class PrefsAction extends AbstractAction
      {
          public PrefsAction ()
--- 1130,1134 ----
      
      
!     public class PrefsAction extends AbstractAction
      {
          public PrefsAction ()
***************
*** 1140,1144 ****
          }
      }
!     class NoteChooserAction extends AbstractAction
      {
          public NoteChooserAction ()
--- 1143,1147 ----
          }
      }
!     public class NoteChooserAction extends AbstractAction
      {
          public NoteChooserAction ()
***************
*** 1164,1168 ****
          }
      }
!     class CrossBreedAction extends AbstractAction
      {
          public CrossBreedAction ()
--- 1167,1171 ----
          }
      }
!     public class CrossBreedAction extends AbstractAction
      {
          public CrossBreedAction ()
***************
*** 1181,1185 ****
          }
      }
!     class NextFaderAction extends AbstractAction
      {
          public NextFaderAction ()
--- 1184,1188 ----
          }
      }
!     public class NextFaderAction extends AbstractAction
      {
          public NextFaderAction ()
***************
*** 1194,1198 ****
          }
      }
!     class DocsAction extends AbstractAction
      {
          public DocsAction ()
--- 1197,1201 ----
          }
      }
!     public class DocsAction extends AbstractAction
      {
          public DocsAction ()
***************
*** 1211,1215 ****
          }
      }
!     class MonitorAction extends AbstractAction
      {
          public MonitorAction ()
--- 1214,1218 ----
          }
      }
!     public class MonitorAction extends AbstractAction
      {
          public MonitorAction ()
***************
*** 1251,1255 ****
          return (ImageIcon)icon;
      }
!     // This function sets up a Timer event to echo Midi Input to Midi Output
      protected void beginEcho ()
      {
--- 1254,1259 ----
          return (ImageIcon)icon;
      }
! 
! 	
      protected void beginEcho ()
      {
***************
*** 1282,1286 ****
--- 1286,1298 ----
                          }
                          else 
+ 						if (desktop.getSelectedFrame() instanceof PatchEditorFrame)
+ 						{
                              Clipboard=((PatchEditorFrame)desktop.getSelectedFrame ()).p;
+ 						}
+ 						else 
+ 						if (desktop.getSelectedFrame() instanceof PatchContainer)
+ 						{
+                             Clipboard=((PatchContainer)desktop.getSelectedFrame ()).getPatch();
+ 						}
                          //   port=(PatchEdit.deviceList.get (Clipboard.deviceNum)).
                          port=appConfig.getDevice(Clipboard.deviceNum).getPort();
***************
*** 1308,1312 ****
          }
          );
!         echoTimer.start ();
      }
      
--- 1320,1324 ----
          }
          );
!         echoTimer.start (); 
      }