Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@harmony.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r499372 - in
 /harmony/enhanced/classlib/trunk/modules/awt/src:
 main/java/common/java/awt/DefaultKeyboardFocusManager.java
 test/api/java/common/java/awt/DefaultKeyboardFocusManagerTest.java
Date: Wed, 24 Jan 2007 11:52:02 -0000
To: commits@harmony.apache.org
From: ayza@apache.org
Message-Id: <20070124115202.8168D1A981A@eris.apache.org>

Author: ayza
Date: Wed Jan 24 03:52:00 2007
New Revision: 499372

URL: http://svn.apache.org/viewvc?view=rev&rev=499372
Log:
Applying patch from HARMONY-2445 ([classlib][awt] java.awt.DefaultKeyboardFocusManager.dispatchEvent(null) does not throw NPE)

Added:
    harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/DefaultKeyboardFocusManagerTest.java   (with props)
Modified:
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/DefaultKeyboardFocusManager.java

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/DefaultKeyboardFocusManager.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/DefaultKeyboardFocusManager.java?view=diff&rev=499372&r1=499371&r2=499372
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/DefaultKeyboardFocusManager.java (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/DefaultKeyboardFocusManager.java Wed Jan 24 03:52:00 2007
@@ -14,10 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-/**
- * @author Dmitry A. Durnev
- * @version $Revision$
- */
+
 package java.awt;
 
 import java.awt.event.FocusEvent;
@@ -75,6 +72,8 @@
         } else if (e instanceof WindowEvent) {
             WindowEvent we = (WindowEvent) e;
             return dispatchWindowEvent(we);
+        } else if (e == null) {
+            throw new NullPointerException();
         }
         return false;
     }

Added: harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/DefaultKeyboardFocusManagerTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/DefaultKeyboardFocusManagerTest.java?view=auto&rev=499372
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/DefaultKeyboardFocusManagerTest.java (added)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/DefaultKeyboardFocusManagerTest.java Wed Jan 24 03:52:00 2007
@@ -0,0 +1,36 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package java.awt;
+
+import junit.framework.TestCase;
+
+public class DefaultKeyboardFocusManagerTest extends TestCase {
+
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(DefaultKeyboardFocusManagerTest.class);
+    }
+
+    public void testDispatchEvent() {
+        try {
+            new DefaultKeyboardFocusManager().dispatchEvent(null);
+            fail("NPE expected"); //$NON-NLS-1$
+        } catch (NullPointerException e) {
+            // expected
+        }
+   }
+}

Propchange: harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/DefaultKeyboardFocusManagerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native