Patch: Organize Imports in "cacio-shared"
Roman Kennke
roman at kennke.org
Mon Jan 23 11:33:14 PST 2012
Sorry for the late reply. I think the change is ok. I guess we should
wait for checking the contribution status of aicas and try to get you
Mercurial access.
Cheers, Roman
Am Mittwoch, den 11.01.2012, 16:42 +0100 schrieb Ralf Heini:
> Some imports are obsolete and show warnings in Eclipse. Used Eclipse to organize the imports. Called "mvn clean install" to test the changes.
>
> Unterschiede zwischen Dateien-Anlage (cacio-shared-imports.diff)
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/BlitClipHelper.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/BlitClipHelper.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/BlitClipHelper.java Wed Jan 11 16:38:35 2012 +0100
> @@ -26,7 +26,7 @@
> package sun.awt.peer.cacio;
>
> import java.awt.Composite;
> -import java.awt.Rectangle;
> +
> import sun.java2d.SurfaceData;
> import sun.java2d.pipe.Region;
> import sun.java2d.pipe.SpanIterator;
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/CacioCanvasPeer.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioCanvasPeer.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioCanvasPeer.java Wed Jan 11 16:38:35 2012 +0100
> @@ -29,6 +29,7 @@
> import java.awt.Graphics;
> import java.awt.GraphicsConfiguration;
> import java.awt.peer.CanvasPeer;
> +
> import javax.swing.JPanel;
>
> class CacioCanvasPeer extends CacioComponentPeer<Canvas, JPanel>
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/CacioCheckboxMenuItemPeer.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioCheckboxMenuItemPeer.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioCheckboxMenuItemPeer.java Wed Jan 11 16:38:35 2012 +0100
> @@ -30,6 +30,7 @@
> import java.awt.event.ItemEvent;
> import java.awt.event.ItemListener;
> import java.awt.peer.CheckboxMenuItemPeer;
> +
> import javax.swing.JCheckBoxMenuItem;
>
> class CacioCheckboxMenuItemPeer extends CacioMenuItemPeer
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/CacioChoicePeer.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioChoicePeer.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioChoicePeer.java Wed Jan 11 16:38:35 2012 +0100
> @@ -29,6 +29,7 @@
> import java.awt.event.ItemEvent;
> import java.awt.event.ItemListener;
> import java.awt.peer.ChoicePeer;
> +
> import javax.swing.ComboBoxModel;
> import javax.swing.JComboBox;
> import javax.swing.MutableComboBoxModel;
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/CacioComponentPeer.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioComponentPeer.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioComponentPeer.java Wed Jan 11 16:38:35 2012 +0100
> @@ -43,34 +43,27 @@
> import java.awt.Point;
> import java.awt.Rectangle;
> import java.awt.Toolkit;
> -import java.awt.Transparency;
> -import java.awt.Window;
> -
> import java.awt.event.FocusEvent;
> import java.awt.event.KeyEvent;
> import java.awt.event.MouseEvent;
> import java.awt.event.PaintEvent;
> -
> import java.awt.image.ColorModel;
> import java.awt.image.ImageObserver;
> import java.awt.image.ImageProducer;
> import java.awt.image.VolatileImage;
> -import java.awt.image.WritableRaster;
> -
> import java.awt.peer.ComponentPeer;
> import java.awt.peer.ContainerPeer;
>
> import javax.swing.JComponent;
>
> +import sun.awt.CausedFocusEvent.Cause;
> +import sun.awt.AWTAccessor;
> +import sun.awt.ConstrainableGraphics;
> +import sun.awt.PaintEventDispatcher;
> +import sun.awt.RepaintArea;
> import sun.awt.SunToolkit;
> -import sun.awt.CausedFocusEvent.Cause;
> -import sun.awt.*;
> -
> -import sun.awt.RepaintArea;
> import sun.awt.event.IgnorePaintEvent;
> -import sun.awt.image.OffScreenImage;
> import sun.font.FontDesignMetrics;
> -
> import sun.java2d.pipe.Region;
>
> /**
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/CacioContainerPeer.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioContainerPeer.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioContainerPeer.java Wed Jan 11 16:38:35 2012 +0100
> @@ -35,9 +35,10 @@
> import java.awt.event.PaintEvent;
> import java.awt.peer.ComponentPeer;
> import java.awt.peer.ContainerPeer;
> +
> import javax.swing.JComponent;
>
> -import sun.awt.*;
> +import sun.awt.AWTAccessor;
>
> abstract class CacioContainerPeer<AWTComponentType extends Component, SwingComponentType extends JComponent>
> extends CacioComponentPeer<AWTComponentType, SwingComponentType>
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/CacioDialogPeer.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioDialogPeer.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioDialogPeer.java Wed Jan 11 16:38:35 2012 +0100
> @@ -33,7 +33,7 @@
>
> import javax.swing.JRootPane;
>
> -import sun.awt.*;
> +import sun.awt.AWTAccessor;
>
> class CacioDialogPeer extends CacioWindowPeer implements DialogPeer {
>
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/CacioEventPump.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioEventPump.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioEventPump.java Wed Jan 11 16:38:35 2012 +0100
> @@ -26,17 +26,16 @@
> package sun.awt.peer.cacio;
>
> import java.awt.AWTEvent;
> -
> +import java.awt.Component;
> import java.awt.Window;
> -import java.awt.Component;
> import java.awt.event.ComponentEvent;
> import java.awt.event.FocusEvent;
> import java.awt.event.KeyEvent;
> import java.awt.event.MouseEvent;
> import java.awt.event.PaintEvent;
> import java.awt.event.WindowEvent;
> +
> import sun.awt.AWTAutoShutdown;
> -
> import sun.awt.PaintEventDispatcher;
>
> /**
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/CacioFileDialogPeer.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioFileDialogPeer.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioFileDialogPeer.java Wed Jan 11 16:38:35 2012 +0100
> @@ -29,6 +29,7 @@
> import java.awt.peer.FileDialogPeer;
> import java.io.File;
> import java.io.FilenameFilter;
> +
> import javax.swing.JFileChooser;
> import javax.swing.filechooser.FileFilter;
>
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/CacioFramePeer.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioFramePeer.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioFramePeer.java Wed Jan 11 16:38:35 2012 +0100
> @@ -29,8 +29,8 @@
> import java.awt.MenuBar;
> import java.awt.Rectangle;
> import java.awt.peer.FramePeer;
> +import java.awt.peer.MenuBarPeer;
>
> -import java.awt.peer.MenuBarPeer;
> import javax.swing.JMenuBar;
> import javax.swing.JRootPane;
>
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/CacioKeyboardFocusManagerPeer.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioKeyboardFocusManagerPeer.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioKeyboardFocusManagerPeer.java Wed Jan 11 16:38:35 2012 +0100
> @@ -27,9 +27,11 @@
>
> import java.awt.AWTEvent;
> import java.awt.Component;
> +import java.awt.KeyboardFocusManager;
> import java.awt.Window;
> import java.awt.event.FocusEvent;
> import java.awt.peer.KeyboardFocusManagerPeer;
> +
> import sun.awt.AppContext;
> import sun.awt.CausedFocusEvent;
> import sun.awt.CausedFocusEvent.Cause;
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/CacioMenuBarPeer.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioMenuBarPeer.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioMenuBarPeer.java Wed Jan 11 16:38:35 2012 +0100
> @@ -29,6 +29,7 @@
> import java.awt.MenuBar;
> import java.awt.peer.MenuBarPeer;
> import java.awt.peer.MenuPeer;
> +
> import javax.swing.JMenu;
> import javax.swing.JMenuBar;
>
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/CacioMenuComponentPeer.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioMenuComponentPeer.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioMenuComponentPeer.java Wed Jan 11 16:38:35 2012 +0100
> @@ -28,6 +28,7 @@
> import java.awt.Font;
> import java.awt.MenuComponent;
> import java.awt.peer.MenuComponentPeer;
> +
> import javax.swing.JComponent;
>
> class CacioMenuComponentPeer<AWTMenuComponentType extends MenuComponent,
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/CacioMenuItemPeer.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioMenuItemPeer.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioMenuItemPeer.java Wed Jan 11 16:38:35 2012 +0100
> @@ -29,6 +29,7 @@
> import java.awt.event.ActionEvent;
> import java.awt.event.ActionListener;
> import java.awt.peer.MenuItemPeer;
> +
> import javax.swing.JMenuItem;
>
> class CacioMenuItemPeer extends CacioMenuComponentPeer<MenuItem,JMenuItem>
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/CacioMenuPeer.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioMenuPeer.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioMenuPeer.java Wed Jan 11 16:38:35 2012 +0100
> @@ -29,6 +29,7 @@
> import java.awt.MenuItem;
> import java.awt.peer.MenuItemPeer;
> import java.awt.peer.MenuPeer;
> +
> import javax.swing.JMenu;
> import javax.swing.JMenuItem;
>
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/CacioPopupMenuPeer.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioPopupMenuPeer.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioPopupMenuPeer.java Wed Jan 11 16:38:35 2012 +0100
> @@ -29,6 +29,7 @@
> import java.awt.Event;
> import java.awt.PopupMenu;
> import java.awt.peer.PopupMenuPeer;
> +
> import javax.swing.JMenu;
> import javax.swing.JPopupMenu;
>
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/CacioScrollBarPeer.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioScrollBarPeer.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioScrollBarPeer.java Wed Jan 11 16:38:35 2012 +0100
> @@ -27,6 +27,7 @@
>
> import java.awt.Scrollbar;
> import java.awt.peer.ScrollbarPeer;
> +
> import javax.swing.JScrollBar;
>
> class CacioScrollBarPeer extends CacioComponentPeer<Scrollbar,JScrollBar>
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/CacioScrollPanePeer.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioScrollPanePeer.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioScrollPanePeer.java Wed Jan 11 16:38:35 2012 +0100
> @@ -28,15 +28,14 @@
> import java.awt.Adjustable;
> import java.awt.Component;
> import java.awt.Dimension;
> -import java.awt.Graphics;
> import java.awt.ScrollPane;
> import java.awt.peer.ComponentPeer;
> import java.awt.peer.ScrollPanePeer;
> +
> import javax.swing.JPanel;
> import javax.swing.JScrollBar;
> -import javax.swing.JScrollPane;
>
> -import sun.awt.*;
> +import sun.awt.AWTAccessor;
>
> class CacioScrollPanePeer extends CacioContainerPeer<ScrollPane, JPanel>
> implements ScrollPanePeer {
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/CacioSwingComponent.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioSwingComponent.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioSwingComponent.java Wed Jan 11 16:38:35 2012 +0100
> @@ -25,6 +25,7 @@
>
> package sun.awt.peer.cacio;
>
> +import java.awt.Component;
> import java.awt.event.FocusEvent;
> import java.awt.event.KeyEvent;
> import java.awt.event.MouseEvent;
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/CacioTextAreaPeer.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioTextAreaPeer.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioTextAreaPeer.java Wed Jan 11 16:38:35 2012 +0100
> @@ -25,16 +25,11 @@
>
> package sun.awt.peer.cacio;
>
> -import java.awt.AWTEvent;
> import java.awt.Dimension;
> import java.awt.Font;
> import java.awt.FontMetrics;
> -import java.awt.Graphics;
> -import java.awt.Paint;
> import java.awt.TextArea;
> -import java.awt.event.PaintEvent;
> import java.awt.im.InputMethodRequests;
> -import java.awt.peer.ContainerPeer;
> import java.awt.peer.TextAreaPeer;
>
> import javax.swing.JScrollPane;
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/CacioTextFieldPeer.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioTextFieldPeer.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioTextFieldPeer.java Wed Jan 11 16:38:35 2012 +0100
> @@ -2,12 +2,9 @@
>
> import java.awt.Dimension;
> import java.awt.TextField;
> -
> import java.awt.event.ActionEvent;
> import java.awt.event.ActionListener;
> -
> import java.awt.im.InputMethodRequests;
> -
> import java.awt.peer.TextFieldPeer;
>
> import javax.swing.JPasswordField;
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/CacioWindowPeer.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioWindowPeer.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/CacioWindowPeer.java Wed Jan 11 16:38:35 2012 +0100
> @@ -48,7 +48,7 @@
> import javax.swing.UIManager;
> import javax.swing.border.Border;
>
> -import sun.awt.*;
> +import sun.awt.AWTAccessor;
>
> class CacioWindowPeer extends CacioContainerPeer<Window, JRootPane>
> implements WindowPeer {
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/KFMHelper.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/KFMHelper.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/KFMHelper.java Wed Jan 11 16:38:35 2012 +0100
> @@ -27,8 +27,8 @@
>
> import java.awt.Component;
> import java.awt.KeyboardFocusManager;
> +import java.lang.reflect.InvocationTargetException;
> import java.lang.reflect.Method;
> -import java.lang.reflect.InvocationTargetException;
> import java.security.AccessController;
> import java.security.PrivilegedActionException;
> import java.security.PrivilegedExceptionAction;
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/PlatformToplevelWindow.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/PlatformToplevelWindow.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/PlatformToplevelWindow.java Wed Jan 11 16:38:35 2012 +0100
> @@ -25,8 +25,10 @@
>
> package sun.awt.peer.cacio;
>
> +import java.awt.Dialog;
> import java.awt.Frame;
> import java.awt.Rectangle;
> +import java.awt.peer.WindowPeer;
>
> public interface PlatformToplevelWindow extends PlatformWindow {
>
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/PlatformWindow.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/PlatformWindow.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/PlatformWindow.java Wed Jan 11 16:38:35 2012 +0100
> @@ -27,16 +27,16 @@
>
> import java.awt.AWTException;
> import java.awt.BufferCapabilities;
> +import java.awt.BufferCapabilities.FlipContents;
> import java.awt.Color;
> import java.awt.Component;
> import java.awt.Font;
> import java.awt.Graphics2D;
> +import java.awt.GraphicsConfiguration;
> import java.awt.Image;
> import java.awt.Insets;
> import java.awt.Point;
> import java.awt.Rectangle;
> -import java.awt.BufferCapabilities.FlipContents;
> -import java.awt.GraphicsConfiguration;
> import java.awt.image.ColorModel;
> import java.awt.peer.ComponentPeer;
> import java.awt.peer.ContainerPeer;
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/PlatformWindowFactory.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/PlatformWindowFactory.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/PlatformWindowFactory.java Wed Jan 11 16:38:35 2012 +0100
> @@ -25,8 +25,6 @@
>
> package sun.awt.peer.cacio;
>
> -import java.awt.GraphicsDevice;
> -
> /**
> * Creates {@link PlatformWindow} instances for use by the component peers.
> */
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/ProxyWindow.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/ProxyWindow.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/ProxyWindow.java Wed Jan 11 16:38:35 2012 +0100
> @@ -33,6 +33,7 @@
> import java.awt.event.MouseEvent;
> import java.lang.reflect.Field;
> import java.lang.reflect.Method;
> +
> import javax.swing.JComponent;
>
> /**
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/ProxyWindowPeer.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/ProxyWindowPeer.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/ProxyWindowPeer.java Wed Jan 11 16:38:35 2012 +0100
> @@ -50,6 +50,7 @@
> import java.awt.peer.ComponentPeer;
> import java.awt.peer.ContainerPeer;
> import java.awt.peer.WindowPeer;
> +
> import sun.awt.CausedFocusEvent.Cause;
> import sun.java2d.pipe.Region;
>
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/WindowClippedGraphics.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/WindowClippedGraphics.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/WindowClippedGraphics.java Wed Jan 11 16:38:35 2012 +0100
> @@ -37,9 +37,9 @@
> import java.awt.Polygon;
> import java.awt.Rectangle;
> import java.awt.RenderingHints;
> +import java.awt.RenderingHints.Key;
> import java.awt.Shape;
> import java.awt.Stroke;
> -import java.awt.RenderingHints.Key;
> import java.awt.font.FontRenderContext;
> import java.awt.font.GlyphVector;
> import java.awt.geom.AffineTransform;
> @@ -53,6 +53,7 @@
> import java.awt.image.renderable.RenderableImage;
> import java.text.AttributedCharacterIterator;
> import java.util.Map;
> +
> import sun.awt.ConstrainableGraphics;
>
> public class WindowClippedGraphics extends Graphics2D
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/managed/AbstractManagedWindowContainer.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/managed/AbstractManagedWindowContainer.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/managed/AbstractManagedWindowContainer.java Wed Jan 11 16:38:35 2012 +0100
> @@ -30,11 +30,12 @@
> import java.awt.Graphics2D;
> import java.awt.Point;
> import java.awt.Rectangle;
> +import java.awt.event.KeyEvent;
> import java.awt.event.MouseEvent;
> -import java.awt.event.KeyEvent;
> import java.awt.geom.Rectangle2D;
> +import java.util.Iterator;
> import java.util.LinkedList;
> -import java.util.Iterator;
> +
> import sun.awt.peer.cacio.CacioComponent;
>
> /**
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/managed/EventData.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/managed/EventData.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/managed/EventData.java Wed Jan 11 16:38:35 2012 +0100
> @@ -28,7 +28,11 @@
> import java.awt.AWTEvent;
> import java.awt.Component;
> import java.awt.Rectangle;
> -import java.awt.event.*;
> +import java.awt.event.ComponentEvent;
> +import java.awt.event.KeyEvent;
> +import java.awt.event.MouseEvent;
> +import java.awt.event.MouseWheelEvent;
> +import java.awt.event.PaintEvent;
>
> public class EventData {
>
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/managed/FocusManager.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/managed/FocusManager.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/managed/FocusManager.java Wed Jan 11 16:38:35 2012 +0100
> @@ -25,13 +25,14 @@
>
> package sun.awt.peer.cacio.managed;
>
> -import sun.awt.peer.cacio.*;
> -import sun.security.action.*;
> -
> import java.awt.Component;
> import java.awt.event.FocusEvent;
> -import java.security.*;
> -import java.util.logging.*;
> +import java.security.AccessController;
> +import java.util.logging.Level;
> +import java.util.logging.Logger;
> +
> +import sun.awt.peer.cacio.CacioComponent;
> +import sun.security.action.GetPropertyAction;
>
> public class FocusManager {
>
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/managed/FullScreenEventPump.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/managed/FullScreenEventPump.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/managed/FullScreenEventPump.java Wed Jan 11 16:38:35 2012 +0100
> @@ -25,7 +25,8 @@
>
> package sun.awt.peer.cacio.managed;
>
> -import sun.awt.peer.cacio.*;
> +import sun.awt.peer.cacio.CacioEventPump;
> +import sun.awt.peer.cacio.CacioEventSource;
>
> public class FullScreenEventPump extends CacioEventPump<EventData> {
>
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/managed/FullScreenWindowFactory.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/managed/FullScreenWindowFactory.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/managed/FullScreenWindowFactory.java Wed Jan 11 16:38:35 2012 +0100
> @@ -27,7 +27,6 @@
>
> import java.awt.Dimension;
> import java.awt.GraphicsConfiguration;
> -import java.awt.GraphicsDevice;
> import java.security.AccessController;
> import java.util.Collections;
> import java.util.HashMap;
> diff -r 5601f95ef66a cacio-shared/src/main/java/sun/awt/peer/cacio/managed/ManagedWindow.java
> --- a/cacio-shared/src/main/java/sun/awt/peer/cacio/managed/ManagedWindow.java Fri Dec 30 17:09:13 2011 +0100
> +++ b/cacio-shared/src/main/java/sun/awt/peer/cacio/managed/ManagedWindow.java Wed Jan 11 16:38:35 2012 +0100
> @@ -25,10 +25,10 @@
>
> package sun.awt.peer.cacio.managed;
>
> -import sun.awt.peer.cacio.*;
> import java.awt.AWTEvent;
> import java.awt.AWTException;
> import java.awt.BufferCapabilities;
> +import java.awt.BufferCapabilities.FlipContents;
> import java.awt.Color;
> import java.awt.Component;
> import java.awt.Font;
> @@ -38,11 +38,10 @@
> import java.awt.Insets;
> import java.awt.Point;
> import java.awt.Rectangle;
> -import java.awt.BufferCapabilities.FlipContents;
> import java.awt.event.MouseEvent;
> import java.awt.event.PaintEvent;
> +import java.awt.image.ColorModel;
> import java.awt.peer.ContainerPeer;
> -import java.awt.image.ColorModel;
> import java.util.Deque;
> import java.util.Iterator;
> import java.util.LinkedList;
> @@ -50,6 +49,9 @@
>
> import sun.awt.CausedFocusEvent.Cause;
> import sun.awt.ConstrainableGraphics;
> +import sun.awt.peer.cacio.CacioComponent;
> +import sun.awt.peer.cacio.PlatformToplevelWindow;
> +import sun.awt.peer.cacio.PlatformWindow;
> import sun.java2d.pipe.Region;
>
> /**
More information about the caciocavallo-dev
mailing list