From 09bddb920989d91a3ce487d1f9a709a86160a93c Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Thu, 23 Sep 2004 18:24:00 +0000 Subject: [PATCH] AppletContext.java, [...]: Jalopied and checkstyle clean. 2004-09-23 Michael Koch * java/applet/AppletContext.java, java/applet/Applet.java, java/applet/AppletStub.java, java/applet/AudioClip.java: Jalopied and checkstyle clean. From-SVN: r87972 --- libjava/ChangeLog | 8 ++++++++ libjava/java/applet/Applet.java | 17 +++++++++-------- libjava/java/applet/AppletContext.java | 4 ++-- libjava/java/applet/AppletStub.java | 3 ++- libjava/java/applet/AudioClip.java | 3 ++- 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index eec4c73d3bb..acc03bfb717 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +2004-09-23 Michael Koch + + * java/applet/AppletContext.java, + java/applet/Applet.java, + java/applet/AppletStub.java, + java/applet/AudioClip.java: + Jalopied and checkstyle clean. + 2004-09-23 Mark Wielaard * java/util/Collections.java diff --git a/libjava/java/applet/Applet.java b/libjava/java/applet/Applet.java index 5990c6392da..4fbf17c11e3 100644 --- a/libjava/java/applet/Applet.java +++ b/libjava/java/applet/Applet.java @@ -1,5 +1,5 @@ /* Applet.java -- Java base applet class - Copyright (C) 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -48,6 +48,7 @@ import java.io.ObjectInputStream; import java.net.MalformedURLException; import java.net.URL; import java.util.Locale; + import javax.accessibility.AccessibleContext; import javax.accessibility.AccessibleRole; import javax.accessibility.AccessibleState; @@ -228,11 +229,11 @@ public class Applet extends Panel { try { - return getImage(new URL(url, name)); + return getImage(new URL(url, name)); } catch (MalformedURLException e) { - return null; + return null; } } @@ -284,11 +285,11 @@ public class Applet extends Panel { try { - return getAudioClip(new URL(url, name)); + return getAudioClip(new URL(url, name)); } catch (MalformedURLException e) { - return null; + return null; } } @@ -343,7 +344,7 @@ public class Applet extends Panel AudioClip ac = getAudioClip(url); try { - ac.play(); + ac.play(); } catch (Exception ignored) { @@ -364,7 +365,7 @@ public class Applet extends Panel { try { - getAudioClip(url, name).play(); + getAudioClip(url, name).play(); } catch (Exception ignored) { @@ -500,7 +501,7 @@ public class Applet extends Panel { AccessibleStateSet s = super.getAccessibleStateSet(); if (isActive()) - s.add(AccessibleState.ACTIVE); + s.add(AccessibleState.ACTIVE); return s; } } // class AccessibleApplet diff --git a/libjava/java/applet/AppletContext.java b/libjava/java/applet/AppletContext.java index 13c077074b3..d7f8e8ba71f 100644 --- a/libjava/java/applet/AppletContext.java +++ b/libjava/java/applet/AppletContext.java @@ -1,5 +1,5 @@ /* AppletContext.java -- access the applet's runtime environment - Copyright (C) 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -39,8 +39,8 @@ exception statement from your version. */ package java.applet; import java.awt.Image; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.net.URL; import java.util.Enumeration; import java.util.Iterator; diff --git a/libjava/java/applet/AppletStub.java b/libjava/java/applet/AppletStub.java index 7694cc822ef..44722cc6148 100644 --- a/libjava/java/applet/AppletStub.java +++ b/libjava/java/applet/AppletStub.java @@ -1,5 +1,5 @@ /* AppletStub.java -- low level interface to the browser - Copyright (C) 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,6 +35,7 @@ this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package java.applet; import java.net.URL; diff --git a/libjava/java/applet/AudioClip.java b/libjava/java/applet/AudioClip.java index 41dd3be2af5..531ab1739fb 100644 --- a/libjava/java/applet/AudioClip.java +++ b/libjava/java/applet/AudioClip.java @@ -1,5 +1,5 @@ /* AudioClip.java -- play an audio clip in an applet - Copyright (C) 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,6 +38,7 @@ exception statement from your version. */ package java.applet; + /** * This interface provides a simple mechanism for playing audio clips. * If multiple clips are played at once, the browser combines them into a -- 2.30.2