* fixed sound play in bytecode and webstart version

* updated README file with supported set of SMT solvers
KeYProject · Nov 30, 2007 · 0723d1d · 0723d1d
1 parent b3bc476
commit 0723d1d
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 39 deletions.
diff --git a/README.install.bytecode b/README.install.bytecode
@@ -20,7 +20,7 @@ Needed additional Libraries:
 	antlr.jar Version >= 2.7.2: parser generator
 	dresden-ocl-demo.jar: ocl parser
 	xerces.jar version 1.4.4: used by tudresden.jar
-	recoder.jar version 0.75_KeY_TypeResolutionInMethodFrameFixed: 
+	recoder.jar version 0.75_KeY_TypeResolutionInMethodFrameFixed:
                  a transformation framework for java patched by the KeY group
 	jargs.jar
 	log4j.jar
@@ -29,7 +29,7 @@ Needed additional Libraries:
 Optionally, KeY can make use of the following binaries:
 	Grammatical Framework
 	ESC Java's decision procedure `Simplify�
-        SMT-LIB provers: bindings exist currently for Yices, CVSLite and SVC
+        SMT-LIB provers: bindings exist currently for Yices, CVCLite, CVC3 and SVC
               (export to SMT input file possible)        
 
 (2) Contents of the KeY-Distribution

diff --git a/README.install.source b/README.install.source
@@ -28,7 +28,7 @@ Needed additional Libraries:
 Optionally, KeY can make use of the following binaries:
 	Grammatical Framework
 	ESC Java's decision procedure `Simplify�
-        SMT-LIB provers: bindings exist currently for Yices, CVSLite and SVC
+        SMT-LIB provers: bindings exist currently for Yices, CVCLite, CVC3 and SVC
               (export to SMT input file possible)        
 
 (2) Contents of the KeY-Distribution

diff --git a/system/de/uka/ilkd/key/gui/notification/NotificationManager.java b/system/de/uka/ilkd/key/gui/notification/NotificationManager.java
@@ -67,6 +67,7 @@ public void setDefaultNotification(boolean sound) {
             new GeneralInformationNotification();
         final AbandonNotification an = new AbandonNotification();
         final ExitKeYNotification en = new ExitKeYNotification();
+
         if (sound) {            
             pcn.addNotificationAction(new ProofClosedSoundPlay());                                     
             gfn.addNotificationAction(new GeneralFailureSoundPlay());            
@@ -78,7 +79,7 @@ public void setDefaultNotification(boolean sound) {
         gfn.addNotificationAction(new GeneralFailureJTextPaneDisplay(mediator.mainFrame()));
         gin.addNotificationAction(new GeneralInformationJTextPaneDisplay(mediator.mainFrame()));
         pcn.addNotificationAction(new ProofClosedJTextPaneDisplay(mediator.mainFrame()));
-                
+
         addNotificationTask(pcn);
         addNotificationTask(gfn);
         addNotificationTask(gin);

diff --git a/system/de/uka/ilkd/key/gui/notification/NotificationTask.java b/system/de/uka/ilkd/key/gui/notification/NotificationTask.java
@@ -72,16 +72,16 @@ public void execute(NotificationEvent event,
         }
         // notify thread safe
         if (SwingUtilities.isEventDispatchThread()) {
-           executeImpl(event, manager);
-       } else {
-           final NotificationEvent eventObject = event;
-           final NotificationManager notManager = manager;
-           SwingUtilities.invokeLater(new Runnable() {                                    
-            public void run() {                
-                executeImpl(eventObject, notManager);
-            }               
-           });
-       }
+            executeImpl(event, manager);
+        } else {
+            final NotificationEvent eventObject = event;
+            final NotificationManager notManager = manager;
+            SwingUtilities.invokeLater(new Runnable() {                                    
+                public void run() {                
+                    executeImpl(eventObject, notManager);
+                }               
+            });
+        }
     }
 
 

diff --git a/system/de/uka/ilkd/key/gui/notification/actions/AbandonTaskSoundPlay.java b/system/de/uka/ilkd/key/gui/notification/actions/AbandonTaskSoundPlay.java
@@ -10,7 +10,6 @@
  */
 package de.uka.ilkd.key.gui.notification.actions;
 
-import java.io.File;
 import java.net.URL;
 
 import de.uka.ilkd.key.gui.notification.NotificationTask;
@@ -29,7 +28,7 @@ public AbandonTaskSoundPlay() {
             KeYResourceManager.getManager().getResourceFile
             (NotificationTask.class, "sounds/abandon.wav");
         if (internalSoundFile != null) {
-            setSoundFile(new File(internalSoundFile.getFile()));
+            setSoundURL(internalSoundFile);
         }        
     }       
 

diff --git a/system/de/uka/ilkd/key/gui/notification/actions/ExitKeYSoundPlay.java b/system/de/uka/ilkd/key/gui/notification/actions/ExitKeYSoundPlay.java
@@ -10,7 +10,6 @@
  */
 package de.uka.ilkd.key.gui.notification.actions;
 
-import java.io.File;
 import java.net.URL;
 
 import de.uka.ilkd.key.gui.notification.NotificationTask;
@@ -30,7 +29,7 @@ public ExitKeYSoundPlay() {
             KeYResourceManager.getManager().getResourceFile
             (NotificationTask.class, "sounds/exit.wav");
         if (internalSoundFile != null) {
-            setSoundFile(new File(internalSoundFile.getFile()));
+            setSoundURL(internalSoundFile);
         }     
     }
 

diff --git a/system/de/uka/ilkd/key/gui/notification/actions/GeneralFailureSoundPlay.java b/system/de/uka/ilkd/key/gui/notification/actions/GeneralFailureSoundPlay.java
@@ -10,7 +10,6 @@
  */
 package de.uka.ilkd.key.gui.notification.actions;
 
-import java.io.File;
 import java.net.URL;
 
 import de.uka.ilkd.key.gui.notification.NotificationTask;
@@ -31,7 +30,7 @@ public GeneralFailureSoundPlay() {
             KeYResourceManager.getManager().getResourceFile
         (NotificationTask.class, "sounds/error.wav");
         if (internalSoundFile != null) {
-            setSoundFile(new File(internalSoundFile.getFile()));
+            setSoundURL(internalSoundFile);
         }        
     }
 

diff --git a/system/de/uka/ilkd/key/gui/notification/actions/GeneralInformationSoundPlay.java b/system/de/uka/ilkd/key/gui/notification/actions/GeneralInformationSoundPlay.java
@@ -10,7 +10,6 @@
  */
 package de.uka.ilkd.key.gui.notification.actions;
 
-import java.io.File;
 import java.net.URL;
 
 import de.uka.ilkd.key.gui.notification.NotificationTask;
@@ -31,7 +30,7 @@ public GeneralInformationSoundPlay() {
             KeYResourceManager.getManager().getResourceFile
         (NotificationTask.class, "sounds/information.wav");
         if (internalSoundFile != null) {
-            setSoundFile(new File(internalSoundFile.getFile()));
+            setSoundURL(internalSoundFile);
         }        
     }
 

diff --git a/system/de/uka/ilkd/key/gui/notification/actions/PlaySound.java b/system/de/uka/ilkd/key/gui/notification/actions/PlaySound.java
@@ -10,8 +10,7 @@
  */
 package de.uka.ilkd.key.gui.notification.actions;
 
-import java.io.File;
-import java.net.MalformedURLException;
+import java.net.URL;
 
 import de.uka.ilkd.key.gui.notification.NotificationAction;
 import de.uka.ilkd.key.gui.notification.events.NotificationEvent;
@@ -23,32 +22,27 @@
  */
 public class PlaySound implements NotificationAction {
 
-    /** the file where the sound to play is stored */
-    private File soundFile;
+    /** the URL where to find the sound file to play */
+    private URL soundURL;
 
     public PlaySound() {        
     }
 
     /**
-     * sets the file to be played
-     * @param file the File to be played
+     * sets the URL pointing to the location of the sound to be played
+     * @param url the URL refering to the sound to be played
      */
-    public void setSoundFile(File file) {
-        this.soundFile = file;
+    public void setSoundURL(URL url) {
+        this.soundURL = url;
     }
 
     /**
      * plays the sound 
      * @see de.uka.ilkd.key.gui.notification.NotificationAction#execute(NotificationEvent)
      */
     public boolean execute(NotificationEvent event) {       
-        if (soundFile != null) {
-            try {               
-                java.applet.Applet.newAudioClip(soundFile.toURL()).play();                
-            } catch (MalformedURLException mue) {
-                Debug.out("Failure playing soundfile ", mue);
-                return false;
-            } 
+        if (soundURL != null) {       
+            java.applet.Applet.newAudioClip(soundURL).play();            
             return true;
         }
         Debug.out("No sound file found.");

diff --git a/system/de/uka/ilkd/key/gui/notification/actions/ProofClosedSoundPlay.java b/system/de/uka/ilkd/key/gui/notification/actions/ProofClosedSoundPlay.java
@@ -10,7 +10,6 @@
  */
 package de.uka.ilkd.key.gui.notification.actions;
 
-import java.io.File;
 import java.net.URL;
 
 import de.uka.ilkd.key.gui.notification.NotificationTask;
@@ -32,7 +31,7 @@ public ProofClosedSoundPlay() {
             KeYResourceManager.getManager().getResourceFile
         (NotificationTask.class, "sounds/trumpet.wav");
         if (internalSoundFile != null) {
-            setSoundFile(new File(internalSoundFile.getFile()));
+            setSoundURL(internalSoundFile);
         }        
     }       
 }