AbstractGraphicsState.java (clone): Handle CloneNotSupportedException.
2003-07-20 Anthony Green <green@redhat.com> * gnu/awt/j2d/AbstractGraphicsState.java (clone): Handle CloneNotSupportedException. * gnu/gcj/xlib/WindowAttributes.java (clone): Ditto. * gnu/gcj/xlib/WMSizeHints.java (clone): Ditto. * gnu/gcj/xlib/GC.java (clone): Ditto. * gnu/awt/xlib/XGraphics.java (clone): Ditto. * gnu/awt/j2d/Graphics2DImpl.java (clone): Ditto. * gnu/awt/xlib/XEventLoop.java (postNextEvent): Remove unreachable handler. * gnu/gcj/runtime/NameFinder.java (NameFinder): Ditto. From-SVN: r69623
This commit is contained in:
committed by
Anthony Green
parent
8ec880749f
commit
49e58846cf
@@ -128,6 +128,14 @@ public abstract class AbstractGraphicsState implements Cloneable
|
||||
|
||||
public Object clone ()
|
||||
{
|
||||
return super.clone ();
|
||||
try
|
||||
{
|
||||
return super.clone ();
|
||||
}
|
||||
catch (CloneNotSupportedException ex)
|
||||
{
|
||||
// This should never happen.
|
||||
throw new InternalError ();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -105,12 +105,20 @@ public class Graphics2DImpl extends Graphics2D implements Cloneable
|
||||
|
||||
public Object clone()
|
||||
{
|
||||
Graphics2DImpl gfxCopy = (Graphics2DImpl) super.clone();
|
||||
AbstractGraphicsState stateCopy =
|
||||
(AbstractGraphicsState) state.clone();
|
||||
gfxCopy.setState(stateCopy);
|
||||
|
||||
return gfxCopy;
|
||||
try
|
||||
{
|
||||
Graphics2DImpl gfxCopy = (Graphics2DImpl) super.clone();
|
||||
AbstractGraphicsState stateCopy =
|
||||
(AbstractGraphicsState) state.clone();
|
||||
gfxCopy.setState(stateCopy);
|
||||
|
||||
return gfxCopy;
|
||||
}
|
||||
catch (CloneNotSupportedException ex)
|
||||
{
|
||||
// This should never happen.
|
||||
throw new InternalError ();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -48,17 +48,8 @@ public class XEventLoop implements Runnable
|
||||
|
||||
void postNextEvent()
|
||||
{
|
||||
try
|
||||
{
|
||||
AWTEvent evt = getNextEvent();
|
||||
queue.postEvent(evt);
|
||||
|
||||
}
|
||||
catch (InterruptedException ie)
|
||||
{
|
||||
// FIXME: what now?
|
||||
System.err.println(ie);
|
||||
}
|
||||
AWTEvent evt = getNextEvent();
|
||||
queue.postEvent(evt);
|
||||
}
|
||||
|
||||
/** get next event. Will block until events become available. */
|
||||
|
||||
@@ -46,10 +46,18 @@ public class XGraphics implements Cloneable, DirectRasterGraphics
|
||||
|
||||
public Object clone()
|
||||
{
|
||||
XGraphics gfxCopy = (XGraphics) super.clone();
|
||||
gfxCopy.context = context.create();
|
||||
|
||||
return gfxCopy;
|
||||
try
|
||||
{
|
||||
XGraphics gfxCopy = (XGraphics) super.clone();
|
||||
gfxCopy.context = context.create();
|
||||
|
||||
return gfxCopy;
|
||||
}
|
||||
catch (CloneNotSupportedException ex)
|
||||
{
|
||||
// This should never happen.
|
||||
throw new InternalError ();
|
||||
}
|
||||
}
|
||||
|
||||
public void dispose()
|
||||
|
||||
@@ -154,18 +154,10 @@ public class NameFinder
|
||||
|
||||
if (addr2line != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
addr2lineIn = new BufferedReader
|
||||
(new InputStreamReader(addr2line.getInputStream()));
|
||||
addr2lineOut = new BufferedWriter
|
||||
(new OutputStreamWriter(addr2line.getOutputStream()));
|
||||
}
|
||||
catch (IOException ioe)
|
||||
{
|
||||
addr2line.destroy();
|
||||
addr2line = null;
|
||||
}
|
||||
addr2lineIn = new BufferedReader
|
||||
(new InputStreamReader(addr2line.getInputStream()));
|
||||
addr2lineOut = new BufferedWriter
|
||||
(new OutputStreamWriter(addr2line.getOutputStream()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -36,15 +36,23 @@ public class GC implements Cloneable
|
||||
*/
|
||||
public Object clone()
|
||||
{
|
||||
GC gcClone = target.getGCFromCache ();
|
||||
if (gcClone==null)
|
||||
{
|
||||
gcClone = (GC) super.clone();
|
||||
gcClone.structure = null;
|
||||
}
|
||||
gcClone.initStructure(this);
|
||||
gcClone.updateClip();
|
||||
return gcClone;
|
||||
try
|
||||
{
|
||||
GC gcClone = target.getGCFromCache ();
|
||||
if (gcClone==null)
|
||||
{
|
||||
gcClone = (GC) super.clone();
|
||||
gcClone.structure = null;
|
||||
}
|
||||
gcClone.initStructure(this);
|
||||
gcClone.updateClip();
|
||||
return gcClone;
|
||||
}
|
||||
catch (CloneNotSupportedException ex)
|
||||
{
|
||||
// This should never happen.
|
||||
throw new InternalError ();
|
||||
}
|
||||
}
|
||||
|
||||
private native void initStructure(GC copyFrom);
|
||||
|
||||
@@ -27,12 +27,20 @@ public class WMSizeHints implements Cloneable
|
||||
protected native void finalize();
|
||||
|
||||
public Object clone() {
|
||||
WMSizeHints hints = (WMSizeHints) super.clone();
|
||||
// In case of an exception before the stucture is copied.
|
||||
hints.structure = null;
|
||||
|
||||
hints.init(this);
|
||||
return hints;
|
||||
try
|
||||
{
|
||||
WMSizeHints hints = (WMSizeHints) super.clone();
|
||||
// In case of an exception before the stucture is copied.
|
||||
hints.structure = null;
|
||||
|
||||
hints.init(this);
|
||||
return hints;
|
||||
}
|
||||
catch (CloneNotSupportedException ex)
|
||||
{
|
||||
// This should never happen.
|
||||
throw new InternalError ();
|
||||
}
|
||||
}
|
||||
|
||||
public native void applyNormalHints(Window window);
|
||||
|
||||
@@ -43,15 +43,23 @@ public class WindowAttributes
|
||||
|
||||
public Object clone()
|
||||
{
|
||||
WindowAttributes attributes = (WindowAttributes) super.clone();
|
||||
// In case of an exception before the stucture is copied.
|
||||
attributes.in = null;
|
||||
attributes.out = null;
|
||||
|
||||
// FIXME: do anything else?
|
||||
try
|
||||
{
|
||||
WindowAttributes attributes = (WindowAttributes) super.clone();
|
||||
// In case of an exception before the stucture is copied.
|
||||
attributes.in = null;
|
||||
attributes.out = null;
|
||||
|
||||
attributes.init(this);
|
||||
return attributes;
|
||||
// FIXME: do anything else?
|
||||
|
||||
attributes.init(this);
|
||||
return attributes;
|
||||
}
|
||||
catch (CloneNotSupportedException ex)
|
||||
{
|
||||
// This should never happen.
|
||||
throw new InternalError ();
|
||||
}
|
||||
}
|
||||
|
||||
public native void setBackground(long pixel);
|
||||
|
||||
Reference in New Issue
Block a user