harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apetre...@apache.org
Subject svn commit: r504467 - in /harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common: javax/swing/text/DefaultCaret.java org/apache/harmony/x/swing/internal/nls/messages.properties
Date Wed, 07 Feb 2007 09:03:41 GMT
Author: apetrenko
Date: Wed Feb  7 01:03:40 2007
New Revision: 504467

URL: http://svn.apache.org/viewvc?view=rev&rev=504467
Log:
The patch for HARMONY-1750 has been reverted.
The issue covered by more general patch of HARMONY-2782

Modified:
    harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/DefaultCaret.java
    harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/org/apache/harmony/x/swing/internal/nls/messages.properties

Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/DefaultCaret.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/DefaultCaret.java?view=diff&rev=504467&r1=504466&r2=504467
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/DefaultCaret.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/DefaultCaret.java
Wed Feb  7 01:03:40 2007
@@ -33,20 +33,21 @@
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
-import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.EventListener;
+
 import javax.swing.AbstractAction;
 import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
 import javax.swing.Timer;
-import javax.swing.event.DocumentListener;
-import javax.swing.event.DocumentEvent;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
 import javax.swing.event.EventListenerList;
 import javax.swing.text.Position.Bias;
 
@@ -57,8 +58,6 @@
 import org.apache.harmony.awt.text.TextUtils;
 import org.apache.harmony.x.swing.StringConstants;
 
-import org.apache.harmony.x.swing.internal.nls.Messages;
-
 public class DefaultCaret extends Rectangle implements Caret, FocusListener,
         MouseListener, MouseMotionListener {
 
@@ -678,9 +677,6 @@
      * selectionColor.
      */
     public void install(final JTextComponent c) {
-        if (c == null) { // Fix for HARMONY-1750, for compatiblity with RI
-            throw new NullPointerException(Messages.getString("swing.05")); //$NON-NLS-1$
-        }
         setComponent(c);
 
         component.addMouseListener(this);

Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/org/apache/harmony/x/swing/internal/nls/messages.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/org/apache/harmony/x/swing/internal/nls/messages.properties?view=diff&rev=504467&r1=504466&r2=504467
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/org/apache/harmony/x/swing/internal/nls/messages.properties
(original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/org/apache/harmony/x/swing/internal/nls/messages.properties
Wed Feb  7 01:03:40 2007
@@ -20,5 +20,3 @@
 swing.02=Invalid verticalScrollBarPolicy
 swing.03=Invalid horizontalScrollBarPolicy
 swing.04=ComboBox is null
-swing.05=Component is null
-



Mime
View raw message