You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2009/10/12 00:00:56 UTC
svn commit: r824184 [6/34] - in /harmony/enhanced/classlib/branches/java6:
./ depends/build/ doc/ doc/security/ make/
modules/accessibility/src/main/java/javax/accessibility/
modules/accessibility/src/test/api/java/common/javax/accessibility/
modules/a...
Modified: harmony/enhanced/classlib/branches/java6/modules/auth/src/test/java/windows/org/apache/harmony/auth/module/NTLoginModuleTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/auth/src/test/java/windows/org/apache/harmony/auth/module/NTLoginModuleTest.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/auth/src/test/java/windows/org/apache/harmony/auth/module/NTLoginModuleTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/auth/src/test/java/windows/org/apache/harmony/auth/module/NTLoginModuleTest.java Sun Oct 11 21:59:47 2009
@@ -17,7 +17,6 @@
/**
* @author Alexander V. Astapchuk
- * @version $Revision$
*/
package org.apache.harmony.auth.module;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/AWTError.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/AWTError.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/AWTError.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/AWTError.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Michael Danilov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/AWTEvent.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/AWTEvent.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/AWTEvent.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/AWTEvent.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Dmitry A. Durnev, Michael Danilov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/AWTException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/AWTException.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/AWTException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/AWTException.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Michael Danilov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/AWTKeyStroke.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/AWTKeyStroke.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/AWTKeyStroke.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/AWTKeyStroke.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Dmitry A. Durnev
- * @version $Revision$
*/
package java.awt;
import java.awt.event.InputEvent;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/AWTPermission.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/AWTPermission.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/AWTPermission.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/AWTPermission.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/ActiveEvent.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/ActiveEvent.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/ActiveEvent.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/ActiveEvent.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Michael Danilov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Adjustable.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Adjustable.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Adjustable.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Adjustable.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/AlphaComposite.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/AlphaComposite.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/AlphaComposite.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/AlphaComposite.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Igor V. Stolyarov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/BasicStroke.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/BasicStroke.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/BasicStroke.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/BasicStroke.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Denis M. Kishenko
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/BorderLayout.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/BorderLayout.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/BorderLayout.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/BorderLayout.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Michael Danilov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/BufferCapabilities.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/BufferCapabilities.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/BufferCapabilities.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/BufferCapabilities.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Alexey A. Petrenko
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Canvas.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Canvas.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Canvas.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Canvas.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Dmitry A. Durnev
- * @version $Revision$
*/
package java.awt;
@@ -25,6 +24,8 @@
import javax.accessibility.AccessibleContext;
import javax.accessibility.AccessibleRole;
+import org.apache.harmony.luni.util.NotImplementedException;
+
public class Canvas extends Component implements Accessible {
private static final long serialVersionUID = -2284879212465893870L;
@@ -74,28 +75,12 @@
}
}
- public void createBufferStrategy(int a0) throws org.apache.harmony.luni.util.NotImplementedException {
- toolkit.lockAWT();
- try {
- } finally {
- toolkit.unlockAWT();
- }
- if (true) {
- throw new RuntimeException("Method is not implemented"); //TODO: implement //$NON-NLS-1$
- }
- return;
+ public void createBufferStrategy(int a0) throws NotImplementedException {
+ throw new NotImplementedException();
}
- public void createBufferStrategy(int a0, BufferCapabilities a1) throws AWTException, org.apache.harmony.luni.util.NotImplementedException {
- toolkit.lockAWT();
- try {
- } finally {
- toolkit.unlockAWT();
- }
- if (true) {
- throw new RuntimeException("Method is not implemented"); //TODO: implement //$NON-NLS-1$
- }
- return;
+ public void createBufferStrategy(int a0, BufferCapabilities a1) throws AWTException, NotImplementedException {
+ throw new NotImplementedException();
}
@Override
@@ -103,16 +88,8 @@
return super.getAccessibleContext();
}
- public BufferStrategy getBufferStrategy() throws org.apache.harmony.luni.util.NotImplementedException {
- toolkit.lockAWT();
- try {
- } finally {
- toolkit.unlockAWT();
- }
- if (true) {
- throw new RuntimeException("Method is not implemented"); //TODO: implement //$NON-NLS-1$
- }
- return null;
+ public BufferStrategy getBufferStrategy() throws NotImplementedException {
+ throw new NotImplementedException();
}
@Override
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/CardLayout.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/CardLayout.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/CardLayout.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/CardLayout.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Michael Danilov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/CheckboxGroup.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/CheckboxGroup.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/CheckboxGroup.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/CheckboxGroup.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Dmitry A. Durnev
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Color.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Color.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Color.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Color.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Oleg V. Khaschansky
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/ComponentBehavior.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/ComponentBehavior.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/ComponentBehavior.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/ComponentBehavior.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Dmitry A. Durnev
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/ComponentOrientation.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/ComponentOrientation.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/ComponentOrientation.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/ComponentOrientation.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Michael Danilov, Dmitry A. Durnev
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Composite.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Composite.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Composite.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Composite.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Igor V. Stolyarov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/CompositeContext.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/CompositeContext.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/CompositeContext.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/CompositeContext.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Igor V. Stolyarov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Container.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Container.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Container.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Container.java Sun Oct 11 21:59:47 2009
@@ -507,10 +507,6 @@
}
}
- /**
- * @deprecated
- */
- @SuppressWarnings("deprecation")
@Deprecated
@Override
public void deliverEvent(Event evt) {
@@ -729,10 +725,6 @@
}
}
- /**
- * @deprecated
- */
- @SuppressWarnings("deprecation")
@Deprecated
@Override
public Dimension minimumSize() {
@@ -765,10 +757,6 @@
}
}
- /**
- * @deprecated
- */
- @SuppressWarnings("deprecation")
@Deprecated
@Override
public Dimension preferredSize() {
@@ -883,7 +871,6 @@
@Deprecated
@Override
- @SuppressWarnings("deprecation")
public void layout() {
toolkit.lockAWT();
try {
@@ -897,7 +884,6 @@
@Deprecated
@Override
- @SuppressWarnings("deprecation")
public Component locate(int x, int y) {
toolkit.lockAWT();
try {
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Cursor.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Cursor.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Cursor.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Cursor.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Dmitry A. Durnev
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/DefaultFocusTraversalPolicy.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/DefaultFocusTraversalPolicy.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/DefaultFocusTraversalPolicy.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/DefaultFocusTraversalPolicy.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Dmitry A. Durnev
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/DefaultKeyboardFocusManager.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/DefaultKeyboardFocusManager.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/DefaultKeyboardFocusManager.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/DefaultKeyboardFocusManager.java Sun Oct 11 21:59:47 2009
@@ -18,11 +18,8 @@
package java.awt;
import java.awt.event.FocusEvent;
-import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import java.awt.event.WindowEvent;
-import java.util.Collections;
-import java.util.HashSet;
import java.util.Set;
public class DefaultKeyboardFocusManager extends KeyboardFocusManager {
@@ -452,7 +449,7 @@
// associated KEY_TYPED event,
// will be consumed, and will not be dispatched to any Component
- Set[] sets = { back, forward, up, down };
+ Set<?>[] sets = { back, forward, up, down };
consume(e, sets);
if (back.contains(ks)) {
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/DefaultMouseDragGestureRecognizer.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/DefaultMouseDragGestureRecognizer.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/DefaultMouseDragGestureRecognizer.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/DefaultMouseDragGestureRecognizer.java Sun Oct 11 21:59:47 2009
@@ -26,6 +26,8 @@
import java.util.ArrayList;
class DefaultMouseDragGestureRecognizer extends MouseDragGestureRecognizer {
+ private static final long serialVersionUID = 1L;
+
private boolean active;
protected DefaultMouseDragGestureRecognizer(DragSource ds, Component c, int act,
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Dialog.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Dialog.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Dialog.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Dialog.java Sun Oct 11 21:59:47 2009
@@ -212,7 +212,6 @@
}
}
- @SuppressWarnings("deprecation")
@Deprecated
@Override
public void hide() {
@@ -234,7 +233,6 @@
}
}
- @SuppressWarnings("deprecation")
@Deprecated
@Override
public void show() {
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Dimension.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Dimension.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Dimension.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Dimension.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Denis M. Kishenko
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Dispatcher.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Dispatcher.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Dispatcher.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Dispatcher.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Michael Danilov, Dmitry A. Durnev
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/DisplayMode.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/DisplayMode.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/DisplayMode.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/DisplayMode.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Alexey A. Petrenko
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/EmbeddedWindow.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/EmbeddedWindow.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/EmbeddedWindow.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/EmbeddedWindow.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Event.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Event.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Event.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Event.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Dmitry A. Durnev
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/EventDispatchThread.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/EventDispatchThread.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/EventDispatchThread.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/EventDispatchThread.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Michael Danilov, Pavel Dolgov
- * @version $Revision$
*/
package java.awt;
@@ -26,6 +25,8 @@
class EventDispatchThread extends Thread {
private static final class MarkerEvent extends AWTEvent {
+ private static final long serialVersionUID = 1L;
+
MarkerEvent(Object source, int id) {
super(source, id);
}
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/EventQueue.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/EventQueue.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/EventQueue.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/EventQueue.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Michael Danilov, Pavel Dolgov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/EventQueueCore.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/EventQueueCore.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/EventQueueCore.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/EventQueueCore.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/EventQueueThread.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/EventQueueThread.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/EventQueueThread.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/EventQueueThread.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision$
*/
package java.awt;
@@ -28,6 +27,8 @@
final class EventQueueThread extends Thread {
private static final class StopThreadEvent extends ActionEvent {
+ private static final long serialVersionUID = 1L;
+
StopThreadEvent(Thread thread) {
super(thread, ACTION_PERFORMED, "stopThread"); //$NON-NLS-1$
}
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/FileDialog.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/FileDialog.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/FileDialog.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/FileDialog.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov, Dmitry A. Durnev
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/FlowLayout.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/FlowLayout.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/FlowLayout.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/FlowLayout.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Michael Danilov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/FocusDispatcher.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/FocusDispatcher.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/FocusDispatcher.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/FocusDispatcher.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Dmitry A. Durnev
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/FocusTraversalPolicy.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/FocusTraversalPolicy.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/FocusTraversalPolicy.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/FocusTraversalPolicy.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Dmitry A. Durnev
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Font.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Font.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Font.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Font.java Sun Oct 11 21:59:47 2009
@@ -250,10 +250,9 @@
if (!FontManager.IS_FONTLIB) {
//TODO implement true code point support
return canDisplay((char)i);
- } else {
- FontPeerImpl peer = (FontPeerImpl)this.getPeer();
- return peer.canDisplay(peer.getUnicodeByIndex(i));
}
+ FontPeerImpl peer = (FontPeerImpl)this.getPeer();
+ return peer.canDisplay(peer.getUnicodeByIndex(i));
}
public int canDisplayUpTo(char[] text, int start, int limit) {
@@ -963,13 +962,12 @@
}
return ((FLFontManager)FontManager.getInstance()).embedFont(fontFile.getAbsolutePath(), fontFormat);
- } else {
- InputStream is = new FileInputStream(fontFile);
- try {
- return createFont(fontFormat, is);
- } finally {
- is.close();
- }
+ }
+ InputStream is = new FileInputStream(fontFile);
+ try {
+ return createFont(fontFormat, is);
+ } finally {
+ is.close();
}
}
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/FontFormatException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/FontFormatException.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/FontFormatException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/FontFormatException.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Ilya S. Okomin
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/FontMetrics.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/FontMetrics.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/FontMetrics.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/FontMetrics.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Ilya S. Okomin
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Frame.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Frame.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Frame.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Frame.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Dmitry A. Durnev
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GradientPaintContext.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GradientPaintContext.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GradientPaintContext.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GradientPaintContext.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Denis M. Kishenko
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Graphics.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Graphics.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Graphics.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Graphics.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Alexey A. Petrenko
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GraphicsConfigTemplate.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GraphicsConfigTemplate.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GraphicsConfigTemplate.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GraphicsConfigTemplate.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Alexey A. Petrenko
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GraphicsConfiguration.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GraphicsConfiguration.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GraphicsConfiguration.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GraphicsConfiguration.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Alexey A. Petrenko
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GraphicsDevice.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GraphicsDevice.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GraphicsDevice.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GraphicsDevice.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Alexey A. Petrenko
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GraphicsEnvironment.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GraphicsEnvironment.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GraphicsEnvironment.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GraphicsEnvironment.java Sun Oct 11 21:59:47 2009
@@ -16,14 +16,11 @@
*/
/**
* @author Oleg V. Khaschansky
- * @version $Revision$
*/
package java.awt;
import java.awt.image.BufferedImage;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
import java.util.Locale;
import org.apache.harmony.awt.ContextStorage;
@@ -39,13 +36,13 @@
public static GraphicsEnvironment getLocalGraphicsEnvironment() {
synchronized(ContextStorage.getContextLock()) {
if (ContextStorage.getGraphicsEnvironment() == null) {
- if (isHeadless()) {
- ContextStorage.setGraphicsEnvironment(new HeadlessGraphicsEnvironment());
+ if (isHeadless()) {
+ ContextStorage.setGraphicsEnvironment(new HeadlessGraphicsEnvironment());
} else {
- CommonGraphics2DFactory g2df =
- (CommonGraphics2DFactory) Toolkit.getDefaultToolkit().getGraphicsFactory();
-
- ContextStorage.setGraphicsEnvironment(
+ final CommonGraphics2DFactory g2df =
+ (CommonGraphics2DFactory) Toolkit.getDefaultToolkit().getGraphicsFactory();
+
+ ContextStorage.setGraphicsEnvironment(
g2df.createGraphicsEnvironment(ContextStorage.getWindowFactory())
);
}
@@ -61,9 +58,9 @@
public static boolean isHeadless() {
if (isHeadless == null) {
- isHeadless = "true".equals(org.apache.harmony.awt.Utils.getSystemProperty("java.awt.headless")); //$NON-NLS-1$ //$NON-NLS-2$
+ isHeadless = Boolean.valueOf(org.apache.harmony.awt.Utils.getSystemProperty("java.awt.headless")); //$NON-NLS-1$
}
-
+
return isHeadless.booleanValue();
}
@@ -72,7 +69,7 @@
}
public Point getCenterPoint() throws HeadlessException {
- Rectangle mwb = getMaximumWindowBounds();
+ final Rectangle mwb = getMaximumWindowBounds();
return new Point(mwb.width >> 1, mwb.height >> 1);
}
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GridBagConstraints.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GridBagConstraints.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GridBagConstraints.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GridBagConstraints.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Michael Danilov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GridBagLayoutInfo.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GridBagLayoutInfo.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GridBagLayoutInfo.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GridBagLayoutInfo.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Michael Danilov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GridLayout.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GridLayout.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GridLayout.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/GridLayout.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Michael Danilov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/HWBehavior.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/HWBehavior.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/HWBehavior.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/HWBehavior.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Dmitry A. Durnev
- * @version $Revision$
*
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/HeadlessEventDispatchThread.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/HeadlessEventDispatchThread.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/HeadlessEventDispatchThread.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/HeadlessEventDispatchThread.java Sun Oct 11 21:59:47 2009
@@ -34,6 +34,7 @@
}
}
+ @Override
void runModalLoop(ModalContext context) {
long lastPaintTime = System.currentTimeMillis();
while (!shutdownPending && (context == null || context.isModalLoopRunning())) {
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/HeadlessException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/HeadlessException.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/HeadlessException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/HeadlessException.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Alexey A. Petrenko
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/HeadlessToolkit.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/HeadlessToolkit.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/HeadlessToolkit.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/HeadlessToolkit.java Sun Oct 11 21:59:47 2009
@@ -26,9 +26,24 @@
import java.awt.dnd.peer.DragSourceContextPeer;
import java.awt.im.InputMethodHighlight;
import java.awt.image.ColorModel;
-import java.awt.peer.*;
-import java.beans.PropertyChangeSupport;
-import java.util.HashMap;
+import java.awt.peer.ButtonPeer;
+import java.awt.peer.CheckboxMenuItemPeer;
+import java.awt.peer.CheckboxPeer;
+import java.awt.peer.ChoicePeer;
+import java.awt.peer.DialogPeer;
+import java.awt.peer.FileDialogPeer;
+import java.awt.peer.FramePeer;
+import java.awt.peer.LabelPeer;
+import java.awt.peer.ListPeer;
+import java.awt.peer.MenuBarPeer;
+import java.awt.peer.MenuItemPeer;
+import java.awt.peer.MenuPeer;
+import java.awt.peer.PopupMenuPeer;
+import java.awt.peer.ScrollPanePeer;
+import java.awt.peer.ScrollbarPeer;
+import java.awt.peer.TextAreaPeer;
+import java.awt.peer.TextFieldPeer;
+import java.awt.peer.WindowPeer;
import java.util.Map;
import java.util.Properties;
@@ -63,6 +78,7 @@
throw new HeadlessException();
}
+ @Override
public Cursor createCustomCursor(Image img, Point hotSpot, String name)
throws HeadlessException {
throw new HeadlessException();
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/IllegalComponentStateException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/IllegalComponentStateException.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/IllegalComponentStateException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/IllegalComponentStateException.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Michael Danilov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Image.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Image.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Image.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Image.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Igor V. Stolyarov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/ImageCapabilities.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/ImageCapabilities.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/ImageCapabilities.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/ImageCapabilities.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Alexey A. Petrenko
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Insets.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Insets.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Insets.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Insets.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Dmitry A. Durnev
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/ItemSelectable.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/ItemSelectable.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/ItemSelectable.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/ItemSelectable.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Michael Danilov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/JobAttributes.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/JobAttributes.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/JobAttributes.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/JobAttributes.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Igor A. Pyankov
- * @version $Revision$
*/
package java.awt;
@@ -293,13 +292,14 @@
public void setPageRanges(int[][] pr) {
// awt.157=Invalid value for pageRanges
String msg = Messages.getString("awt.157"); //$NON-NLS-1$
- int n1 = 0;
- int n2 = 0;
- int prl = pr.length;
if(pr == null) {
throw new IllegalArgumentException(msg);
}
+
+ int n1 = 0;
+ int n2 = 0;
+ int prl = pr.length;
for(int k = 0; k < prl; k++) {
if(pr[k] == null || pr[k].length != 2
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/KeyEventDispatcher.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/KeyEventDispatcher.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/KeyEventDispatcher.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/KeyEventDispatcher.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Michael Danilov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/KeyEventPostProcessor.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/KeyEventPostProcessor.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/KeyEventPostProcessor.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/KeyEventPostProcessor.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Michael Danilov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/KeyboardFocusManager.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/KeyboardFocusManager.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/KeyboardFocusManager.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/KeyboardFocusManager.java Sun Oct 11 21:59:47 2009
@@ -115,6 +115,7 @@
DEFAULT_BWD_KS = Collections.unmodifiableSet(s);
}
+ @SuppressWarnings("unchecked")
public KeyboardFocusManager() {
traversalKeys = new Set[4];
traversalKeys[0] = DEFAULT_FWD_KS;
@@ -214,7 +215,6 @@
}
}
- @SuppressWarnings("unchecked")
public Set<AWTKeyStroke> getDefaultFocusTraversalKeys(int id) {
checkTraversalKeyId(id, 3);
@@ -613,10 +613,8 @@
// }
wnd.setRequestedFocus(c);
setFocus(c, wnd, true, actualPrevFocusOwner, temporary, callCB);
- if (wnd != null) {
- wnd.setFocusOwner(c);
- wnd.setRequestedFocus(null);
- }
+ wnd.setFocusOwner(c);
+ wnd.setRequestedFocus(null);
return true;
}
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/LWBehavior.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/LWBehavior.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/LWBehavior.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/LWBehavior.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Dmitry A. Durnev
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Label.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Label.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Label.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Label.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Dmitry A. Durnev
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/LayoutManager.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/LayoutManager.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/LayoutManager.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/LayoutManager.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Michael Danilov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/LayoutManager2.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/LayoutManager2.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/LayoutManager2.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/LayoutManager2.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Michael Danilov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/List.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/List.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/List.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/List.java Sun Oct 11 21:59:47 2009
@@ -790,9 +790,6 @@
}
}
- /**
- * @deprecated
- */
@Deprecated
public void clear() {
toolkit.lockAWT();
@@ -926,10 +923,6 @@
}
}
- /**
- * @deprecated
- */
- @SuppressWarnings("deprecation")
@Deprecated
@Override
public Dimension minimumSize() {
@@ -944,9 +937,6 @@
}
}
- /**
- * @deprecated
- */
@Deprecated
public Dimension minimumSize(int rows) {
toolkit.lockAWT();
@@ -957,9 +947,6 @@
}
}
- /**
- * @deprecated
- */
@Deprecated
public Dimension preferredSize(int rows) {
toolkit.lockAWT();
@@ -970,10 +957,6 @@
}
}
- /**
- * @deprecated
- */
- @SuppressWarnings("deprecation")
@Deprecated
@Override
public Dimension preferredSize() {
@@ -999,9 +982,6 @@
}
}
- /**
- * @deprecated
- */
@Deprecated
public void addItem(String item) {
toolkit.lockAWT();
@@ -1013,9 +993,6 @@
return;
}
- /**
- * @deprecated
- */
@Deprecated
public void addItem(String item, int index) {
toolkit.lockAWT();
@@ -1027,9 +1004,6 @@
return;
}
- /**
- * @deprecated
- */
@Deprecated
public boolean allowsMultipleSelections() {
toolkit.lockAWT();
@@ -1040,9 +1014,6 @@
}
}
- /**
- * @deprecated
- */
@Deprecated
public int countItems() {
toolkit.lockAWT();
@@ -1053,9 +1024,6 @@
}
}
- /**
- * @deprecated
- */
@Deprecated
public void delItem(int position) {
toolkit.lockAWT();
@@ -1066,9 +1034,6 @@
}
}
- /**
- * @deprecated
- */
@Deprecated
public void delItems(int start, int end) {
toolkit.lockAWT();
@@ -1217,9 +1182,6 @@
}
}
- /**
- * @deprecated
- */
@Deprecated
public boolean isSelected(int pos) {
toolkit.lockAWT();
@@ -1305,9 +1267,6 @@
}
}
- /**
- * @deprecated
- */
@Deprecated
public void setMultipleSelections(boolean mm) {
toolkit.lockAWT();
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MediaTracker.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MediaTracker.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MediaTracker.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MediaTracker.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Igor V. Stolyarov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MenuBar.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MenuBar.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MenuBar.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MenuBar.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MenuComponent.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MenuComponent.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MenuComponent.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MenuComponent.java Sun Oct 11 21:59:47 2009
@@ -31,6 +31,7 @@
import org.apache.harmony.awt.gl.MultiRectArea;
import org.apache.harmony.awt.state.MenuItemState;
import org.apache.harmony.awt.state.MenuState;
+import org.apache.harmony.luni.util.NotImplementedException;
public abstract class MenuComponent implements Serializable {
private static final long serialVersionUID = -4536902356223894379L;
@@ -434,27 +435,15 @@
}
}
- /**
- * @deprecated
- */
@Deprecated
- public MenuComponentPeer getPeer() throws org.apache.harmony.luni.util.NotImplementedException {
- toolkit.lockAWT();
- try {
- } finally {
- toolkit.unlockAWT();
- }
- if (true) {
- throw new RuntimeException("Method is not implemented"); //TODO: implement //$NON-NLS-1$
- }
- return null;
+ public MenuComponentPeer getPeer() throws NotImplementedException {
+ throw new NotImplementedException();
}
protected final Object getTreeLock() {
return toolkit.awtTreeLock;
}
- @SuppressWarnings("deprecation")
@Deprecated
public boolean postEvent(Event e) {
toolkit.lockAWT();
@@ -633,7 +622,7 @@
}
/**
- * @return The sub-menu of currently selecetd item,
+ * @return The sub-menu of currently selected item,
* or null if such a sub-menu is not available
*/
Menu getSelectedSubmenu() {
@@ -720,7 +709,7 @@
}
/**
- * @return - the menu bar which is the root of crrent menu's hierarchy;
+ * @return - the menu bar which is the root of current menu's hierarchy;
* or null if the hierarchy root is not a menu bar
*/
MenuBar getMenuBar() {
@@ -745,7 +734,7 @@
/**
* Determine the clip region when menu selection is changed
* from index1 to index2
- * @param index1 - old selected intem
+ * @param index1 - old selected item
* @param index2 - new selected item
* @return - the region to repaint
*/
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MenuContainer.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MenuContainer.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MenuContainer.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MenuContainer.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MenuShortcut.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MenuShortcut.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MenuShortcut.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MenuShortcut.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/ModalContext.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/ModalContext.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/ModalContext.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/ModalContext.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MouseDispatcher.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MouseDispatcher.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MouseDispatcher.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MouseDispatcher.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Dmitry A. Durnev, Michael Danilov, Pavel Dolgov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MouseInfo.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MouseInfo.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MouseInfo.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/MouseInfo.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Dmitry A. Durnev, Pavel Dolgov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/PageAttributes.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/PageAttributes.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/PageAttributes.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/PageAttributes.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Igor A. Pyankov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Paint.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Paint.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Paint.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Paint.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Alexey A. Petrenko
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/PaintContext.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/PaintContext.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/PaintContext.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/PaintContext.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Alexey A. Petrenko
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Panel.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Panel.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Panel.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Panel.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Dmitry A. Durnev
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Point.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Point.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Point.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Point.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Denis M. Kishenko
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/PointerInfo.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/PointerInfo.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/PointerInfo.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/PointerInfo.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Dmitry A. Durnev
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Polygon.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Polygon.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Polygon.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Polygon.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Denis M. Kishenko
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/PopupBox.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/PopupBox.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/PopupBox.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/PopupBox.java Sun Oct 11 21:59:47 2009
@@ -17,7 +17,6 @@
/**
* @author Pavel Dolgov
*
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/PopupMenu.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/PopupMenu.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/PopupMenu.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/PopupMenu.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/PrintGraphics.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/PrintGraphics.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/PrintGraphics.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/PrintGraphics.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Igor A. Pyankov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/PrintJob.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/PrintJob.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/PrintJob.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/PrintJob.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Igor A. Pyankov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Rectangle.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Rectangle.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Rectangle.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Rectangle.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Denis M. Kishenko
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/RedrawManager.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/RedrawManager.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/RedrawManager.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/RedrawManager.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/RenderingHints.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/RenderingHints.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/RenderingHints.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/RenderingHints.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Alexey A. Petrenko
- * @version $Revision$
*/
package java.awt;
@@ -166,7 +165,7 @@
@Override
public boolean equals(Object o) {
- if (!(o instanceof Map)) {
+ if (!(o instanceof Map<?, ?>)) {
return false;
}
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Robot.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Robot.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Robot.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Robot.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov, Dmitry A. Durnev
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/ScrollPane.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/ScrollPane.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/ScrollPane.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/ScrollPane.java Sun Oct 11 21:59:47 2009
@@ -256,7 +256,6 @@
}
}
- @SuppressWarnings("deprecation")
@Deprecated
@Override
public void layout() {
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Shape.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Shape.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Shape.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Shape.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Alexey A. Petrenko
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Stroke.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Stroke.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Stroke.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/Stroke.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Alexey A. Petrenko
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/SystemColor.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/SystemColor.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/SystemColor.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/SystemColor.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision$
*/
package java.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/TextArea.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/TextArea.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/TextArea.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/java/awt/TextArea.java Sun Oct 11 21:59:47 2009
@@ -484,18 +484,11 @@
}
}
- /**
- * @deprecated
- */
@Deprecated
public void insertText(String str, int pos) {
insert(str, pos);
}
- /**
- * @deprecated
- */
- @SuppressWarnings("deprecation")
@Deprecated
@Override
public Dimension minimumSize() {
@@ -510,10 +503,6 @@
}
}
- /**
- * @deprecated
- */
- @SuppressWarnings("deprecation")
@Deprecated
public Dimension minimumSize(int rows, int columns) {
toolkit.lockAWT();
@@ -558,10 +547,6 @@
}
}
- /**
- * @deprecated
- */
- @SuppressWarnings("deprecation")
@Deprecated
@Override
public Dimension preferredSize() {
@@ -576,10 +561,6 @@
}
}
- /**
- * @deprecated
- */
- @SuppressWarnings("deprecation")
@Deprecated
public Dimension preferredSize(int rows, int columns) {
toolkit.lockAWT();