2005-07-16 00:30:23 +00:00
|
|
|
/* BasicStroke.java --
|
2006-03-10 21:46:48 +00:00
|
|
|
Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
2005-07-16 00:30:23 +00:00
|
|
|
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
|
|
any later version.
|
|
|
|
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
|
|
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
|
|
02110-1301 USA.
|
|
|
|
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
|
|
making a combined work based on this library. Thus, the terms and
|
|
|
|
conditions of the GNU General Public License cover the whole
|
|
|
|
combination.
|
|
|
|
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
|
|
permission to link this library with independent modules to produce an
|
|
|
|
executable, regardless of the license terms of these independent
|
|
|
|
modules, and to copy and distribute the resulting executable under
|
|
|
|
terms of your choice, provided that you also meet, for each linked
|
|
|
|
independent module, the terms and conditions of the license of that
|
|
|
|
module. An independent module is a module which is not derived from
|
|
|
|
or based on this library. If you modify this library, you may extend
|
|
|
|
this exception to your version of the library, but you are not
|
|
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
|
|
exception statement from your version. */
|
|
|
|
|
|
|
|
|
|
|
|
package java.awt;
|
|
|
|
|
2006-05-18 17:29:21 +00:00
|
|
|
import gnu.java.awt.java2d.CubicSegment;
|
|
|
|
import gnu.java.awt.java2d.LineSegment;
|
|
|
|
import gnu.java.awt.java2d.QuadSegment;
|
|
|
|
import gnu.java.awt.java2d.Segment;
|
|
|
|
|
|
|
|
import java.awt.geom.GeneralPath;
|
|
|
|
import java.awt.geom.PathIterator;
|
|
|
|
import java.awt.geom.Point2D;
|
2005-07-16 00:30:23 +00:00
|
|
|
import java.util.Arrays;
|
|
|
|
|
|
|
|
/**
|
2006-03-10 21:46:48 +00:00
|
|
|
* A general purpose {@link Stroke} implementation that can represent a wide
|
|
|
|
* variety of line styles for use with subclasses of {@link Graphics2D}.
|
|
|
|
* <p>
|
|
|
|
* The line cap and join styles can be set using the options illustrated
|
|
|
|
* here:
|
|
|
|
* <p>
|
|
|
|
* <img src="doc-files/capjoin.png" width="350" height="180"
|
|
|
|
* alt="Illustration of line cap and join styles" />
|
|
|
|
* <p>
|
|
|
|
* A dash array can be used to specify lines with alternating opaque and
|
|
|
|
* transparent sections.
|
2005-07-16 00:30:23 +00:00
|
|
|
*/
|
|
|
|
public class BasicStroke implements Stroke
|
|
|
|
{
|
2006-03-10 21:46:48 +00:00
|
|
|
/**
|
|
|
|
* Indicates a mitered line join style. See the class overview for an
|
|
|
|
* illustration.
|
|
|
|
*/
|
2005-07-16 00:30:23 +00:00
|
|
|
public static final int JOIN_MITER = 0;
|
2006-03-10 21:46:48 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Indicates a rounded line join style. See the class overview for an
|
|
|
|
* illustration.
|
|
|
|
*/
|
2005-07-16 00:30:23 +00:00
|
|
|
public static final int JOIN_ROUND = 1;
|
2006-03-10 21:46:48 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Indicates a bevelled line join style. See the class overview for an
|
|
|
|
* illustration.
|
|
|
|
*/
|
2005-07-16 00:30:23 +00:00
|
|
|
public static final int JOIN_BEVEL = 2;
|
|
|
|
|
2006-03-10 21:46:48 +00:00
|
|
|
/**
|
|
|
|
* Indicates a flat line cap style. See the class overview for an
|
|
|
|
* illustration.
|
|
|
|
*/
|
2005-07-16 00:30:23 +00:00
|
|
|
public static final int CAP_BUTT = 0;
|
2006-03-10 21:46:48 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Indicates a rounded line cap style. See the class overview for an
|
|
|
|
* illustration.
|
|
|
|
*/
|
2005-07-16 00:30:23 +00:00
|
|
|
public static final int CAP_ROUND = 1;
|
2006-03-10 21:46:48 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Indicates a square line cap style. See the class overview for an
|
|
|
|
* illustration.
|
|
|
|
*/
|
2005-07-16 00:30:23 +00:00
|
|
|
public static final int CAP_SQUARE = 2;
|
|
|
|
|
2006-03-10 21:46:48 +00:00
|
|
|
/** The stroke width. */
|
2005-07-16 00:30:23 +00:00
|
|
|
private final float width;
|
2006-03-10 21:46:48 +00:00
|
|
|
|
|
|
|
/** The line cap style. */
|
2005-07-16 00:30:23 +00:00
|
|
|
private final int cap;
|
2006-03-10 21:46:48 +00:00
|
|
|
|
|
|
|
/** The line join style. */
|
2005-07-16 00:30:23 +00:00
|
|
|
private final int join;
|
2006-03-10 21:46:48 +00:00
|
|
|
|
|
|
|
/** The miter limit. */
|
2005-07-16 00:30:23 +00:00
|
|
|
private final float limit;
|
2006-03-10 21:46:48 +00:00
|
|
|
|
|
|
|
/** The dash array. */
|
2005-07-16 00:30:23 +00:00
|
|
|
private final float[] dash;
|
2006-03-10 21:46:48 +00:00
|
|
|
|
|
|
|
/** The dash phase. */
|
2005-07-16 00:30:23 +00:00
|
|
|
private final float phase;
|
|
|
|
|
Imported GNU Classpath 0.92
2006-08-14 Mark Wielaard <mark@klomp.org>
Imported GNU Classpath 0.92
* HACKING: Add more importing hints. Update automake version
requirement.
* configure.ac (gconf-peer): New enable AC argument.
Add --disable-gconf-peer and --enable-default-preferences-peer
to classpath configure when gconf is disabled.
* scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
gnu/java/awt/dnd/peer/gtk to bc. Classify
gnu/java/security/Configuration.java as generated source file.
* gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
gnu/java/lang/management/VMThreadMXBeanImpl.java,
gnu/java/lang/management/VMMemoryMXBeanImpl.java,
gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
classes.
* java/lang/management/VMManagementFactory.java: Likewise.
* java/net/VMURLConnection.java: Likewise.
* gnu/java/nio/VMChannel.java: Likewise.
* java/lang/Thread.java (getState): Add stub implementation.
* java/lang/Class.java (isEnum): Likewise.
* java/lang/Class.h (isEnum): Likewise.
* gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.
* javax/naming/spi/NamingManager.java: New override for StackWalker
functionality.
* configure, sources.am, Makefile.in, gcj/Makefile.in,
include/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r116139
2006-08-14 23:12:35 +00:00
|
|
|
// The inner and outer paths of the stroke
|
2006-05-18 17:29:21 +00:00
|
|
|
private Segment start, end;
|
|
|
|
|
2005-07-16 00:30:23 +00:00
|
|
|
/**
|
2006-03-10 21:46:48 +00:00
|
|
|
* Creates a new <code>BasicStroke</code> instance with the given attributes.
|
2005-07-16 00:30:23 +00:00
|
|
|
*
|
2006-03-10 21:46:48 +00:00
|
|
|
* @param width the line width (>= 0.0f).
|
|
|
|
* @param cap the line cap style (one of {@link #CAP_BUTT},
|
|
|
|
* {@link #CAP_ROUND} or {@link #CAP_SQUARE}).
|
|
|
|
* @param join the line join style (one of {@link #JOIN_ROUND},
|
|
|
|
* {@link #JOIN_BEVEL}, or {@link #JOIN_MITER}).
|
|
|
|
* @param miterlimit the limit to trim the miter join. The miterlimit must be
|
2005-07-16 00:30:23 +00:00
|
|
|
* greater than or equal to 1.0f.
|
|
|
|
* @param dash The array representing the dashing pattern. There must be at
|
|
|
|
* least one non-zero entry.
|
|
|
|
* @param dashPhase is negative and dash is not null.
|
|
|
|
*
|
2006-03-10 21:46:48 +00:00
|
|
|
* @throws IllegalArgumentException If one input parameter doesn't meet
|
2005-07-16 00:30:23 +00:00
|
|
|
* its needs.
|
|
|
|
*/
|
|
|
|
public BasicStroke(float width, int cap, int join, float miterlimit,
|
|
|
|
float[] dash, float dashPhase)
|
|
|
|
{
|
|
|
|
if (width < 0.0f )
|
|
|
|
throw new IllegalArgumentException("width " + width + " < 0");
|
|
|
|
else if (cap < CAP_BUTT || cap > CAP_SQUARE)
|
|
|
|
throw new IllegalArgumentException("cap " + cap + " out of range ["
|
|
|
|
+ CAP_BUTT + ".." + CAP_SQUARE + "]");
|
|
|
|
else if (miterlimit < 1.0f && join == JOIN_MITER)
|
|
|
|
throw new IllegalArgumentException("miterlimit " + miterlimit
|
|
|
|
+ " < 1.0f while join == JOIN_MITER");
|
|
|
|
else if (join < JOIN_MITER || join > JOIN_BEVEL)
|
|
|
|
throw new IllegalArgumentException("join " + join + " out of range ["
|
|
|
|
+ JOIN_MITER + ".." + JOIN_BEVEL
|
|
|
|
+ "]");
|
|
|
|
else if (dashPhase < 0.0f && dash != null)
|
|
|
|
throw new IllegalArgumentException("dashPhase " + dashPhase
|
|
|
|
+ " < 0.0f while dash != null");
|
|
|
|
else if (dash != null)
|
|
|
|
if (dash.length == 0)
|
|
|
|
throw new IllegalArgumentException("dash.length is 0");
|
|
|
|
else
|
|
|
|
{
|
|
|
|
boolean allZero = true;
|
|
|
|
|
|
|
|
for ( int i = 0; i < dash.length; ++i)
|
|
|
|
{
|
|
|
|
if (dash[i] != 0.0f)
|
|
|
|
{
|
|
|
|
allZero = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (allZero)
|
|
|
|
throw new IllegalArgumentException("all dashes are 0.0f");
|
|
|
|
}
|
|
|
|
|
|
|
|
this.width = width;
|
|
|
|
this.cap = cap;
|
|
|
|
this.join = join;
|
|
|
|
limit = miterlimit;
|
|
|
|
this.dash = dash == null ? null : (float[]) dash.clone();
|
|
|
|
phase = dashPhase;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2006-03-10 21:46:48 +00:00
|
|
|
* Creates a new <code>BasicStroke</code> instance with the given attributes.
|
2005-07-16 00:30:23 +00:00
|
|
|
*
|
2006-03-10 21:46:48 +00:00
|
|
|
* @param width the line width (>= 0.0f).
|
|
|
|
* @param cap the line cap style (one of {@link #CAP_BUTT},
|
|
|
|
* {@link #CAP_ROUND} or {@link #CAP_SQUARE}).
|
|
|
|
* @param join the line join style (one of {@link #JOIN_ROUND},
|
|
|
|
* {@link #JOIN_BEVEL}, or {@link #JOIN_MITER}).
|
2005-07-16 00:30:23 +00:00
|
|
|
* @param miterlimit the limit to trim the miter join. The miterlimit must be
|
|
|
|
* greater than or equal to 1.0f.
|
|
|
|
*
|
2006-03-10 21:46:48 +00:00
|
|
|
* @throws IllegalArgumentException If one input parameter doesn't meet
|
2005-07-16 00:30:23 +00:00
|
|
|
* its needs.
|
|
|
|
*/
|
|
|
|
public BasicStroke(float width, int cap, int join, float miterlimit)
|
|
|
|
{
|
|
|
|
this(width, cap, join, miterlimit, null, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2006-03-10 21:46:48 +00:00
|
|
|
* Creates a new <code>BasicStroke</code> instance with the given attributes.
|
|
|
|
* The miter limit defaults to <code>10.0</code>.
|
2005-07-16 00:30:23 +00:00
|
|
|
*
|
2006-03-10 21:46:48 +00:00
|
|
|
* @param width the line width (>= 0.0f).
|
|
|
|
* @param cap the line cap style (one of {@link #CAP_BUTT},
|
|
|
|
* {@link #CAP_ROUND} or {@link #CAP_SQUARE}).
|
|
|
|
* @param join the line join style (one of {@link #JOIN_ROUND},
|
|
|
|
* {@link #JOIN_BEVEL}, or {@link #JOIN_MITER}).
|
2005-07-16 00:30:23 +00:00
|
|
|
*
|
2006-03-10 21:46:48 +00:00
|
|
|
* @throws IllegalArgumentException If one input parameter doesn't meet
|
2005-07-16 00:30:23 +00:00
|
|
|
* its needs.
|
|
|
|
*/
|
|
|
|
public BasicStroke(float width, int cap, int join)
|
|
|
|
{
|
|
|
|
this(width, cap, join, 10, null, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2006-03-10 21:46:48 +00:00
|
|
|
* Creates a new <code>BasicStroke</code> instance with the given line
|
|
|
|
* width. The default values are:
|
|
|
|
* <ul>
|
|
|
|
* <li>line cap style: {@link #CAP_SQUARE};</li>
|
|
|
|
* <li>line join style: {@link #JOIN_MITER};</li>
|
|
|
|
* <li>miter limit: <code>10.0f</code>.
|
|
|
|
* </ul>
|
|
|
|
*
|
|
|
|
* @param width the line width (>= 0.0f).
|
2005-07-16 00:30:23 +00:00
|
|
|
*
|
2006-03-10 21:46:48 +00:00
|
|
|
* @throws IllegalArgumentException If <code>width</code> is negative.
|
2005-07-16 00:30:23 +00:00
|
|
|
*/
|
|
|
|
public BasicStroke(float width)
|
|
|
|
{
|
|
|
|
this(width, CAP_SQUARE, JOIN_MITER, 10, null, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2006-03-10 21:46:48 +00:00
|
|
|
* Creates a new <code>BasicStroke</code> instance. The default values are:
|
|
|
|
* <ul>
|
|
|
|
* <li>line width: <code>1.0f</code>;</li>
|
|
|
|
* <li>line cap style: {@link #CAP_SQUARE};</li>
|
|
|
|
* <li>line join style: {@link #JOIN_MITER};</li>
|
|
|
|
* <li>miter limit: <code>10.0f</code>.
|
|
|
|
* </ul>
|
2005-07-16 00:30:23 +00:00
|
|
|
*/
|
|
|
|
public BasicStroke()
|
|
|
|
{
|
|
|
|
this(1, CAP_SQUARE, JOIN_MITER, 10, null, 0);
|
|
|
|
}
|
|
|
|
|
2006-03-10 21:46:48 +00:00
|
|
|
/**
|
|
|
|
* Creates a shape representing the stroked outline of the given shape.
|
|
|
|
* THIS METHOD IS NOT YET IMPLEMENTED.
|
|
|
|
*
|
|
|
|
* @param s the shape.
|
|
|
|
*/
|
2005-07-16 00:30:23 +00:00
|
|
|
public Shape createStrokedShape(Shape s)
|
|
|
|
{
|
Imported GNU Classpath 0.92
2006-08-14 Mark Wielaard <mark@klomp.org>
Imported GNU Classpath 0.92
* HACKING: Add more importing hints. Update automake version
requirement.
* configure.ac (gconf-peer): New enable AC argument.
Add --disable-gconf-peer and --enable-default-preferences-peer
to classpath configure when gconf is disabled.
* scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
gnu/java/awt/dnd/peer/gtk to bc. Classify
gnu/java/security/Configuration.java as generated source file.
* gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
gnu/java/lang/management/VMThreadMXBeanImpl.java,
gnu/java/lang/management/VMMemoryMXBeanImpl.java,
gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
classes.
* java/lang/management/VMManagementFactory.java: Likewise.
* java/net/VMURLConnection.java: Likewise.
* gnu/java/nio/VMChannel.java: Likewise.
* java/lang/Thread.java (getState): Add stub implementation.
* java/lang/Class.java (isEnum): Likewise.
* java/lang/Class.h (isEnum): Likewise.
* gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.
* javax/naming/spi/NamingManager.java: New override for StackWalker
functionality.
* configure, sources.am, Makefile.in, gcj/Makefile.in,
include/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r116139
2006-08-14 23:12:35 +00:00
|
|
|
PathIterator pi = s.getPathIterator(null);
|
2006-05-18 17:29:21 +00:00
|
|
|
|
|
|
|
if( dash == null )
|
|
|
|
return solidStroke( pi );
|
|
|
|
|
|
|
|
return dashedStroke( pi );
|
2005-07-16 00:30:23 +00:00
|
|
|
}
|
|
|
|
|
2006-03-10 21:46:48 +00:00
|
|
|
/**
|
|
|
|
* Returns the line width.
|
|
|
|
*
|
|
|
|
* @return The line width.
|
|
|
|
*/
|
2005-07-16 00:30:23 +00:00
|
|
|
public float getLineWidth()
|
|
|
|
{
|
|
|
|
return width;
|
|
|
|
}
|
|
|
|
|
2006-03-10 21:46:48 +00:00
|
|
|
/**
|
|
|
|
* Returns a code indicating the line cap style (one of {@link #CAP_BUTT},
|
|
|
|
* {@link #CAP_ROUND}, {@link #CAP_SQUARE}).
|
|
|
|
*
|
|
|
|
* @return A code indicating the line cap style.
|
|
|
|
*/
|
2005-07-16 00:30:23 +00:00
|
|
|
public int getEndCap()
|
|
|
|
{
|
|
|
|
return cap;
|
|
|
|
}
|
|
|
|
|
2006-03-10 21:46:48 +00:00
|
|
|
/**
|
|
|
|
* Returns a code indicating the line join style (one of {@link #JOIN_BEVEL},
|
|
|
|
* {@link #JOIN_MITER} or {@link #JOIN_ROUND}).
|
|
|
|
*
|
|
|
|
* @return A code indicating the line join style.
|
|
|
|
*/
|
2005-07-16 00:30:23 +00:00
|
|
|
public int getLineJoin()
|
|
|
|
{
|
|
|
|
return join;
|
|
|
|
}
|
|
|
|
|
2006-03-10 21:46:48 +00:00
|
|
|
/**
|
|
|
|
* Returns the miter limit.
|
|
|
|
*
|
|
|
|
* @return The miter limit.
|
|
|
|
*/
|
2005-07-16 00:30:23 +00:00
|
|
|
public float getMiterLimit()
|
|
|
|
{
|
|
|
|
return limit;
|
|
|
|
}
|
|
|
|
|
2006-03-10 21:46:48 +00:00
|
|
|
/**
|
|
|
|
* Returns the dash array, which defines the length of alternate opaque and
|
|
|
|
* transparent sections in lines drawn with this stroke. If
|
|
|
|
* <code>null</code>, a continuous line will be drawn.
|
|
|
|
*
|
|
|
|
* @return The dash array (possibly <code>null</code>).
|
|
|
|
*/
|
2005-07-16 00:30:23 +00:00
|
|
|
public float[] getDashArray()
|
|
|
|
{
|
|
|
|
return dash;
|
|
|
|
}
|
|
|
|
|
2006-03-10 21:46:48 +00:00
|
|
|
/**
|
|
|
|
* Returns the dash phase for the stroke. This is the offset from the start
|
|
|
|
* of a path at which the pattern defined by {@link #getDashArray()} is
|
|
|
|
* rendered.
|
|
|
|
*
|
|
|
|
* @return The dash phase.
|
|
|
|
*/
|
2005-07-16 00:30:23 +00:00
|
|
|
public float getDashPhase()
|
|
|
|
{
|
|
|
|
return phase;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the hash code for this object. The hash is calculated by
|
|
|
|
* xoring the hash, cap, join, limit, dash array and phase values
|
|
|
|
* (converted to <code>int</code> first with
|
|
|
|
* <code>Float.floatToIntBits()</code> if the value is a
|
|
|
|
* <code>float</code>).
|
2006-03-10 21:46:48 +00:00
|
|
|
*
|
|
|
|
* @return The hash code.
|
2005-07-16 00:30:23 +00:00
|
|
|
*/
|
|
|
|
public int hashCode()
|
|
|
|
{
|
|
|
|
int hash = Float.floatToIntBits(width);
|
|
|
|
hash ^= cap;
|
|
|
|
hash ^= join;
|
|
|
|
hash ^= Float.floatToIntBits(limit);
|
|
|
|
|
|
|
|
if (dash != null)
|
|
|
|
for (int i = 0; i < dash.length; i++)
|
|
|
|
hash ^= Float.floatToIntBits(dash[i]);
|
|
|
|
|
|
|
|
hash ^= Float.floatToIntBits(phase);
|
|
|
|
|
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2006-03-10 21:46:48 +00:00
|
|
|
* Compares this <code>BasicStroke</code> for equality with an arbitrary
|
|
|
|
* object. This method returns <code>true</code> if and only if:
|
|
|
|
* <ul>
|
String.java, [...]: Merge from GNU Classpath HEAD.
2006-06-09 Thomas Fitzsimmons <fitzsim@redhat.com>
* java/lang/String.java, classpath/native/jni/classpath/jcl.h,
classpath/native/jni/qt-peer/eventmethods.h,
classpath/native/jni/qt-peer/qtmenupeer.cpp,
classpath/native/jni/qt-peer/.cvsignore,
classpath/native/jni/gtk-peer/gdkdisplay.h,
classpath/native/jni/gtk-peer/cairographics2d.h,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c,
classpath/native/jni/gtk-peer/.cvsignore,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c,
classpath/native/jni/gtk-peer/gtkpeer.h,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c,
classpath/native/jni/gtk-peer/Makefile.am,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,
classpath/native/jawt/Makefile.am,
classpath/native/jawt/.cvsignore,
classpath/native/target/Linux/Makefile.in,
classpath/native/plugin/gcjwebplugin.cc,
classpath/native/plugin/Makefile.am,
classpath/native/plugin/.cvsignore,
classpath/resource/Makefile.in,
classpath/gnu/java/awt/peer/gtk/VolatileImageGraphics.java,
classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java,
classpath/gnu/java/awt/peer/gtk/CairoSurface.java,
classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java,
classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java,
classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java,
classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java,
classpath/gnu/java/awt/peer/gtk/GdkGraphics2D.java,
classpath/gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java,
classpath/gnu/java/awt/peer/gtk/GtkComponentPeer.java,
classpath/gnu/java/awt/peer/gtk/GdkGraphics.java,
classpath/gnu/java/awt/peer/gtk/GtkToolkit.java,
classpath/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java,
classpath/gnu/java/awt/peer/gtk/BufferedImageGraphics.java,
classpath/gnu/java/awt/peer/gtk/GdkTextLayout.java,
classpath/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java,
classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java,
classpath/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java,
classpath/gnu/java/awt/peer/gtk/GtkImage.java,
classpath/gnu/java/awt/peer/gtk/GtkVolatileImage.java,
classpath/gnu/java/awt/peer/gtk/GdkGlyphVector.java,
classpath/gnu/java/awt/peer/gtk/GtkCanvasPeer.java,
classpath/gnu/java/awt/peer/swing/SwingContainerPeer.java,
classpath/gnu/java/awt/peer/swing/SwingComponent.java,
classpath/gnu/java/awt/peer/swing/SwingTextFieldPeer.java,
classpath/gnu/java/awt/peer/swing/SwingMenuBarPeer.java,
classpath/gnu/java/awt/peer/swing/SwingFramePeer.java,
classpath/gnu/java/awt/peer/swing/SwingComponentPeer.java,
classpath/gnu/java/awt/peer/swing/SwingWindowPeer.java,
classpath/gnu/java/awt/print/JavaPrinterJob.java,
classpath/gnu/java/awt/print/PostScriptGraphics2D.java,
classpath/gnu/java/awt/print/SpooledDocument.java,
classpath/gnu/java/awt/print/JavaPrinterGraphics.java,
classpath/gnu/java/awt/BitwiseXORComposite.java,
classpath/gnu/java/awt/font/GNUGlyphVector.java,
classpath/gnu/java/awt/font/opentype/NameDecoder.java,
classpath/gnu/java/awt/java2d/RasterGraphics.java,
classpath/gnu/java/awt/java2d/TexturePaintContext.java,
classpath/gnu/java/awt/java2d/PolyEdge.java,
classpath/gnu/java/awt/java2d/AbstractGraphics2D.java,
classpath/gnu/java/awt/java2d/AlphaCompositeContext.java,
classpath/gnu/java/awt/java2d/ImagePaint.java,
classpath/gnu/java/awt/Buffers.java,
classpath/gnu/classpath/Configuration.java.in,
classpath/gnu/javax/swing/text/html/CombinedAttributes.java,
classpath/gnu/javax/swing/text/html/CharacterAttributeTranslator.java,
classpath/gnu/javax/swing/text/html/parser/htmlAttributeSet.java,
classpath/gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.java,
classpath/gnu/javax/swing/text/html/ImageViewIconFactory.java,
classpath/tools/toolwrapper.c,
classpath/tools/gnu/classpath/tools/native2ascii/Native2ASCII.java,
classpath/tools/gnu/classpath/tools/native2ascii/Messages.java,
classpath/tools/gnu/classpath/tools/getopt/FileArgumentCallback.java,
classpath/tools/gnu/classpath/tools/getopt/OptionGroup.java,
classpath/tools/gnu/classpath/tools/getopt/OptionException.java,
classpath/tools/gnu/classpath/tools/getopt/Messages.java,
classpath/tools/gnu/classpath/tools/getopt/Option.java,
classpath/tools/gnu/classpath/tools/getopt/Parser.java,
classpath/tools/gnu/classpath/tools/getopt/ClasspathToolParser.java,
classpath/tools/gnu/classpath/tools/jarsigner/JarSigner.java,
classpath/tools/gnu/classpath/tools/jarsigner/Main.java,
classpath/tools/gnu/classpath/tools/jarsigner/Messages.java,
classpath/tools/gnu/classpath/tools/jarsigner/package.html,
classpath/tools/gnu/classpath/tools/keytool/ListCmd.java,
classpath/tools/gnu/classpath/tools/keytool/StorePasswdCmd.java,
classpath/tools/gnu/classpath/tools/keytool/ExportCmd.java,
classpath/tools/gnu/classpath/tools/keytool/GenKeyCmd.java,
classpath/tools/gnu/classpath/tools/keytool/Messages.java,
classpath/tools/gnu/classpath/tools/keytool/package.html,
classpath/tools/gnu/classpath/tools/keytool/Command.java,
classpath/tools/gnu/classpath/tools/keytool/IdentityDBCmd.java,
classpath/tools/gnu/classpath/tools/keytool/Main.java,
classpath/tools/gnu/classpath/tools/keytool/DeleteCmd.java,
classpath/tools/gnu/classpath/tools/keytool/CertReqCmd.java,
classpath/tools/gnu/classpath/tools/keytool/SelfCertCmd.java,
classpath/tools/gnu/classpath/tools/keytool/KeyCloneCmd.java,
classpath/tools/gnu/classpath/tools/keytool/KeyPasswdCmd.java,
classpath/tools/gnu/classpath/tools/keytool/ImportCmd.java,
classpath/tools/gnu/classpath/tools/keytool/PrintCertCmd.java,
classpath/tools/gnu/classpath/tools/rmi/registry/package.html,
classpath/tools/gnu/classpath/tools/rmi/RMIC.txt,
classpath/tools/gnu/classpath/tools/rmi/RMIC.java,
classpath/tools/gnu/classpath/tools/appletviewer/ErrorApplet.java,
classpath/tools/gnu/classpath/tools/appletviewer/AppletClassLoader.java,
classpath/tools/gnu/classpath/tools/appletviewer/CommonAppletContext.java,
classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletContext.java,
classpath/tools/gnu/classpath/tools/appletviewer/AppletSecurityManager.java,
classpath/tools/gnu/classpath/tools/appletviewer/PluginAppletContext.java,
classpath/tools/gnu/classpath/tools/appletviewer/AppletWarning.java,
classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletViewer.java,
classpath/tools/gnu/classpath/tools/appletviewer/AppletTag.java,
classpath/tools/gnu/classpath/tools/appletviewer/ConsoleDialog.java,
classpath/tools/gnu/classpath/tools/appletviewer/Main.java,
classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.java,
classpath/tools/gnu/classpath/tools/appletviewer/PluginAppletViewer.java,
classpath/tools/gnu/classpath/tools/appletviewer/TagParser.java,
classpath/tools/gnu/classpath/tools/appletviewer/PluginAppletWindow.java,
classpath/tools/gnu/classpath/tools/appletviewer/CommonAppletStub.java,
classpath/tools/gnu/classpath/tools/serialver/Messages.java,
classpath/tools/gnu/classpath/tools/serialver/SerialVer.java,
classpath/tools/gnu/classpath/tools/jar/Creator.java,
classpath/tools/gnu/classpath/tools/jar/Entry.java,
classpath/tools/gnu/classpath/tools/jar/Lister.java,
classpath/tools/gnu/classpath/tools/jar/Main.java,
classpath/tools/gnu/classpath/tools/jar/Updater.java,
classpath/tools/gnu/classpath/tools/jar/Messages.java,
classpath/tools/gnu/classpath/tools/jar/Extractor.java,
classpath/tools/gnu/classpath/tools/jar/Action.java,
classpath/tools/gnu/classpath/tools/jar/Indexer.java,
classpath/tools/gnu/classpath/tools/jar/WorkSet.java,
classpath/tools/gnu/classpath/tools/giop/GRMIC.txt,
classpath/tools/gnu/classpath/tools/giop/grmic/GiopRmicCompiler.java,
classpath/tools/gnu/classpath/tools/giop/GRMIC.java,
classpath/tools/Makefile.am, classpath/tools/jarsigner.in,
classpath/tools/keytool.in, classpath/tools/appletviewer.in,
classpath/tools/.cvsignore, classpath/configure.ac,
classpath/javax/swing/JTabbedPane.java,
classpath/javax/swing/AbstractButton.java,
classpath/javax/swing/JViewport.java,
classpath/javax/swing/KeyboardManager.java,
classpath/javax/swing/JMenuItem.java,
classpath/javax/swing/JMenuBar.java,
classpath/javax/swing/MenuSelectionManager.java,
classpath/javax/swing/JOptionPane.java,
classpath/javax/swing/JSpinner.java,
classpath/javax/swing/JCheckBoxMenuItem.java,
classpath/javax/swing/JEditorPane.java,
classpath/javax/swing/JFormattedTextField.java,
classpath/javax/swing/JTree.java,
classpath/javax/swing/CellRendererPane.java,
classpath/javax/swing/JScrollPane.java,
classpath/javax/swing/tree/VariableHeightLayoutCache.java,
classpath/javax/swing/tree/TreeNode.java,
classpath/javax/swing/tree/FixedHeightLayoutCache.java,
classpath/javax/swing/tree/DefaultTreeCellEditor.java,
classpath/javax/swing/tree/TreePath.java,
classpath/javax/swing/tree/RowMapper.java,
classpath/javax/swing/tree/DefaultMutableTreeNode.java,
classpath/javax/swing/tree/DefaultTreeModel.java,
classpath/javax/swing/tree/AbstractLayoutCache.java,
classpath/javax/swing/tree/TreeSelectionModel.java,
classpath/javax/swing/tree/DefaultTreeSelectionModel.java,
classpath/javax/swing/tree/DefaultTreeCellRenderer.java,
classpath/javax/swing/tree/ExpandVetoException.java,
classpath/javax/swing/JList.java,
classpath/javax/swing/table/JTableHeader.java,
classpath/javax/swing/table/AbstractTableModel.java,
classpath/javax/swing/table/DefaultTableModel.java,
classpath/javax/swing/table/TableCellEditor.java,
classpath/javax/swing/table/TableCellRenderer.java,
classpath/javax/swing/ProgressMonitor.java,
classpath/javax/swing/JToolBar.java,
classpath/javax/swing/TransferHandler.java,
classpath/javax/swing/DefaultCellEditor.java,
classpath/javax/swing/DefaultButtonModel.java,
classpath/javax/swing/JLayeredPane.java,
classpath/javax/swing/text/DefaultEditorKit.java,
classpath/javax/swing/text/DefaultCaret.java,
classpath/javax/swing/text/FieldView.java,
classpath/javax/swing/text/JTextComponent.java,
classpath/javax/swing/text/TextAction.java,
classpath/javax/swing/text/StyleContext.java,
classpath/javax/swing/text/html/HTMLDocument.java,
classpath/javax/swing/text/html/MinimalHTMLWriter.java,
classpath/javax/swing/text/html/ImageView.java,
classpath/javax/swing/text/html/HTMLEditorKit.java,
classpath/javax/swing/text/AbstractWriter.java,
classpath/javax/swing/text/GapContent.java,
classpath/javax/swing/text/Utilities.java,
classpath/javax/swing/text/PlainView.java,
classpath/javax/swing/UIManager.java,
classpath/javax/swing/JSplitPane.java,
classpath/javax/swing/JComponent.java,
classpath/javax/swing/SwingUtilities.java,
classpath/javax/swing/border/AbstractBorder.java,
classpath/javax/swing/border/CompoundBorder.java,
classpath/javax/swing/border/TitledBorder.java,
classpath/javax/swing/border/MatteBorder.java,
classpath/javax/swing/border/BevelBorder.java,
classpath/javax/swing/RepaintManager.java,
classpath/javax/swing/JTable.java,
classpath/javax/swing/UIDefaults.java,
classpath/javax/swing/DefaultDesktopManager.java,
classpath/javax/swing/JMenu.java,
classpath/javax/swing/JLabel.java,
classpath/javax/swing/JSlider.java,
classpath/javax/swing/plaf/basic/BasicToolBarUI.java,
classpath/javax/swing/plaf/basic/BasicButtonUI.java,
classpath/javax/swing/plaf/basic/BasicOptionPaneUI.java,
classpath/javax/swing/plaf/basic/BasicTextAreaUI.java,
classpath/javax/swing/plaf/basic/BasicToggleButtonUI.java,
classpath/javax/swing/plaf/basic/BasicSpinnerUI.java,
classpath/javax/swing/plaf/basic/BasicSliderUI.java,
classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java,
classpath/javax/swing/plaf/basic/BasicComboPopup.java,
classpath/javax/swing/plaf/basic/BasicCheckBoxUI.java,
classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java,
classpath/javax/swing/plaf/basic/BasicProgressBarUI.java,
classpath/javax/swing/plaf/basic/BasicRadioButtonUI.java,
classpath/javax/swing/plaf/basic/BasicPanelUI.java,
classpath/javax/swing/plaf/basic/BasicSplitPaneUI.java,
classpath/javax/swing/plaf/basic/BasicTreeUI.java,
classpath/javax/swing/plaf/basic/BasicTableHeaderUI.java,
classpath/javax/swing/plaf/basic/BasicFileChooserUI.java,
classpath/javax/swing/plaf/basic/BasicScrollPaneUI.java,
classpath/javax/swing/plaf/basic/BasicComboBoxUI.java,
classpath/javax/swing/plaf/basic/BasicListUI.java,
classpath/javax/swing/plaf/basic/BasicIconFactory.java,
classpath/javax/swing/plaf/basic/BasicTextUI.java,
classpath/javax/swing/plaf/basic/BasicLookAndFeel.java,
classpath/javax/swing/plaf/basic/BasicDirectoryModel.java,
classpath/javax/swing/plaf/basic/BasicRootPaneUI.java,
classpath/javax/swing/plaf/basic/BasicTableUI.java,
classpath/javax/swing/plaf/basic/SharedUIDefaults.java,
classpath/javax/swing/plaf/multi/MultiComboBoxUI.java,
classpath/javax/swing/plaf/multi/MultiListUI.java,
classpath/javax/swing/plaf/multi/MultiSplitPaneUI.java,
classpath/javax/swing/plaf/multi/MultiFileChooserUI.java,
classpath/javax/swing/plaf/multi/MultiOptionPaneUI.java,
classpath/javax/swing/plaf/multi/MultiTabbedPaneUI.java,
classpath/javax/swing/plaf/multi/MultiLookAndFeel.java,
classpath/javax/swing/plaf/metal/MetalSliderUI.java,
classpath/javax/swing/plaf/metal/MetalIconFactory.java,
classpath/javax/swing/plaf/metal/MetalComboBoxIcon.java,
classpath/javax/swing/plaf/metal/MetalTabbedPaneUI.java,
classpath/javax/swing/plaf/metal/MetalLookAndFeel.java,
classpath/javax/swing/plaf/metal/MetalCheckBoxUI.java,
classpath/javax/swing/plaf/metal/MetalSeparatorUI.java,
classpath/javax/swing/plaf/metal/MetalBorders.java,
classpath/javax/swing/plaf/metal/MetalSplitPaneDivider.java,
classpath/javax/swing/plaf/metal/MetalScrollBarUI.java,
classpath/javax/swing/plaf/metal/MetalRootPaneUI.java,
classpath/javax/swing/plaf/metal/MetalInternalFrameUI.java,
classpath/javax/swing/plaf/metal/MetalRadioButtonUI.java,
classpath/javax/swing/plaf/metal/MetalToolTipUI.java,
classpath/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java,
classpath/javax/swing/plaf/metal/MetalFileChooserUI.java,
classpath/javax/swing/plaf/metal/MetalUtils.java,
classpath/javax/swing/plaf/metal/MetalComboBoxButton.java,
classpath/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.java,
classpath/javax/swing/plaf/metal/MetalButtonUI.java,
classpath/javax/swing/JPopupMenu.java,
classpath/javax/swing/JProgressBar.java,
classpath/javax/swing/WindowConstants.java,
classpath/javax/swing/JFrame.java,
classpath/javax/swing/JFileChooser.java,
classpath/javax/swing/JComboBox.java,
classpath/javax/swing/event/EventListenerList.java,
classpath/javax/swing/ListSelectionModel.java,
classpath/javax/swing/JScrollBar.java,
classpath/java/text/SimpleDateFormat.java,
classpath/java/text/NumberFormat.java,
classpath/java/text/class-dependencies.conf,
classpath/java/awt/image/ColorModel.java,
classpath/java/awt/image/BufferedImage.java,
classpath/java/awt/Window.java,
classpath/java/awt/ContainerOrderFocusTraversalPolicy.java,
classpath/java/awt/LightweightDispatcher.java,
classpath/java/awt/EventDispatchThread.java,
classpath/java/awt/BasicStroke.java,
classpath/java/awt/ColorPaintContext.java,
classpath/java/awt/Container.java,
classpath/java/awt/TexturePaint.java,
classpath/java/awt/Component.java, classpath/java/awt/Font.java,
classpath/java/awt/GraphicsConfiguration.java,
classpath/java/awt/DefaultKeyboardFocusManager.java,
classpath/java/awt/print/PrinterJob.java,
classpath/java/awt/im/InputContext.java,
classpath/java/awt/dnd/DragGestureRecognizer.java,
classpath/java/awt/Toolkit.java,
classpath/java/awt/font/GraphicAttribute.java,
classpath/java/awt/font/ImageGraphicAttribute.java,
classpath/java/awt/font/GlyphVector.java,
classpath/java/awt/font/GlyphMetrics.java,
classpath/java/awt/font/ShapeGraphicAttribute.java,
classpath/java/awt/Graphics2D.java,
classpath/include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h,
classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h,
classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h,
classpath/include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h,
classpath/include/gnu_java_awt_peer_gtk_GtkCanvasPeer.h,
classpath/include/config.h.in,
classpath/include/gnu_java_awt_peer_gtk_GdkTextLayout.h,
classpath/include/gnu_java_awt_peer_gtk_GtkComponentPeer.h,
classpath/include/gnu_java_awt_peer_gtk_GdkFontPeer.h,
classpath/include/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.h,
classpath/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h,
classpath/include/gnu_java_awt_peer_gtk_GtkImage.h,
classpath/include/gnu_java_awt_peer_gtk_CairoSurface.h,
classpath/include/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h:
Merge from GNU Classpath HEAD.
From-SVN: r114510
2006-06-09 16:07:07 +00:00
|
|
|
* <li><code>o</code> is an instanceof <code>BasicStroke</code>;</li>
|
2006-03-10 21:46:48 +00:00
|
|
|
* <li>this object has the same width, line cap style, line join style,
|
|
|
|
* miter limit, dash array and dash phase as <code>o</code>.</li>
|
|
|
|
* </ul>
|
|
|
|
*
|
|
|
|
* @param o the object (<code>null</code> permitted).
|
|
|
|
*
|
|
|
|
* @return <code>true</code> if this stroke is equal to <code>o</code> and
|
|
|
|
* <code>false</code> otherwise.
|
2005-07-16 00:30:23 +00:00
|
|
|
*/
|
|
|
|
public boolean equals(Object o)
|
|
|
|
{
|
|
|
|
if (! (o instanceof BasicStroke))
|
|
|
|
return false;
|
|
|
|
BasicStroke s = (BasicStroke) o;
|
|
|
|
return width == s.width && cap == s.cap && join == s.join
|
|
|
|
&& limit == s.limit && Arrays.equals(dash, s.dash) && phase == s.phase;
|
|
|
|
}
|
2006-05-18 17:29:21 +00:00
|
|
|
|
|
|
|
private Shape solidStroke(PathIterator pi)
|
|
|
|
{
|
|
|
|
double[] coords = new double[6];
|
|
|
|
double x, y, x0, y0;
|
|
|
|
boolean pathOpen = false;
|
|
|
|
GeneralPath output = new GeneralPath( );
|
|
|
|
Segment[] p;
|
|
|
|
x = x0 = y = y0 = 0;
|
|
|
|
|
|
|
|
while( !pi.isDone() )
|
|
|
|
{
|
|
|
|
switch( pi.currentSegment(coords) )
|
|
|
|
{
|
|
|
|
case PathIterator.SEG_MOVETO:
|
|
|
|
x0 = x = coords[0];
|
|
|
|
y0 = y = coords[1];
|
|
|
|
if( pathOpen )
|
|
|
|
{
|
|
|
|
capEnds();
|
|
|
|
convertPath(output, start);
|
|
|
|
start = end = null;
|
|
|
|
pathOpen = false;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PathIterator.SEG_LINETO:
|
|
|
|
p = (new LineSegment(x, y, coords[0], coords[1])).
|
|
|
|
getDisplacedSegments(width/2.0);
|
|
|
|
if( !pathOpen )
|
|
|
|
{
|
|
|
|
start = p[0];
|
|
|
|
end = p[1];
|
|
|
|
pathOpen = true;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
addSegments(p);
|
|
|
|
|
|
|
|
x = coords[0];
|
|
|
|
y = coords[1];
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PathIterator.SEG_QUADTO:
|
|
|
|
p = (new QuadSegment(x, y, coords[0], coords[1], coords[2],
|
|
|
|
coords[3])).getDisplacedSegments(width/2.0);
|
|
|
|
if( !pathOpen )
|
|
|
|
{
|
|
|
|
start = p[0];
|
|
|
|
end = p[1];
|
|
|
|
pathOpen = true;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
addSegments(p);
|
|
|
|
|
Imported GNU Classpath 0.92
2006-08-14 Mark Wielaard <mark@klomp.org>
Imported GNU Classpath 0.92
* HACKING: Add more importing hints. Update automake version
requirement.
* configure.ac (gconf-peer): New enable AC argument.
Add --disable-gconf-peer and --enable-default-preferences-peer
to classpath configure when gconf is disabled.
* scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
gnu/java/awt/dnd/peer/gtk to bc. Classify
gnu/java/security/Configuration.java as generated source file.
* gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
gnu/java/lang/management/VMThreadMXBeanImpl.java,
gnu/java/lang/management/VMMemoryMXBeanImpl.java,
gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
classes.
* java/lang/management/VMManagementFactory.java: Likewise.
* java/net/VMURLConnection.java: Likewise.
* gnu/java/nio/VMChannel.java: Likewise.
* java/lang/Thread.java (getState): Add stub implementation.
* java/lang/Class.java (isEnum): Likewise.
* java/lang/Class.h (isEnum): Likewise.
* gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.
* javax/naming/spi/NamingManager.java: New override for StackWalker
functionality.
* configure, sources.am, Makefile.in, gcj/Makefile.in,
include/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r116139
2006-08-14 23:12:35 +00:00
|
|
|
x = coords[2];
|
|
|
|
y = coords[3];
|
2006-05-18 17:29:21 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case PathIterator.SEG_CUBICTO:
|
|
|
|
p = new CubicSegment(x, y, coords[0], coords[1],
|
|
|
|
coords[2], coords[3],
|
|
|
|
coords[4], coords[5]).getDisplacedSegments(width/2.0);
|
|
|
|
if( !pathOpen )
|
|
|
|
{
|
|
|
|
start = p[0];
|
|
|
|
end = p[1];
|
|
|
|
pathOpen = true;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
addSegments(p);
|
|
|
|
|
Imported GNU Classpath 0.92
2006-08-14 Mark Wielaard <mark@klomp.org>
Imported GNU Classpath 0.92
* HACKING: Add more importing hints. Update automake version
requirement.
* configure.ac (gconf-peer): New enable AC argument.
Add --disable-gconf-peer and --enable-default-preferences-peer
to classpath configure when gconf is disabled.
* scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
gnu/java/awt/dnd/peer/gtk to bc. Classify
gnu/java/security/Configuration.java as generated source file.
* gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
gnu/java/lang/management/VMThreadMXBeanImpl.java,
gnu/java/lang/management/VMMemoryMXBeanImpl.java,
gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
classes.
* java/lang/management/VMManagementFactory.java: Likewise.
* java/net/VMURLConnection.java: Likewise.
* gnu/java/nio/VMChannel.java: Likewise.
* java/lang/Thread.java (getState): Add stub implementation.
* java/lang/Class.java (isEnum): Likewise.
* java/lang/Class.h (isEnum): Likewise.
* gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.
* javax/naming/spi/NamingManager.java: New override for StackWalker
functionality.
* configure, sources.am, Makefile.in, gcj/Makefile.in,
include/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r116139
2006-08-14 23:12:35 +00:00
|
|
|
x = coords[4];
|
|
|
|
y = coords[5];
|
2006-05-18 17:29:21 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case PathIterator.SEG_CLOSE:
|
Imported GNU Classpath 0.92
2006-08-14 Mark Wielaard <mark@klomp.org>
Imported GNU Classpath 0.92
* HACKING: Add more importing hints. Update automake version
requirement.
* configure.ac (gconf-peer): New enable AC argument.
Add --disable-gconf-peer and --enable-default-preferences-peer
to classpath configure when gconf is disabled.
* scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
gnu/java/awt/dnd/peer/gtk to bc. Classify
gnu/java/security/Configuration.java as generated source file.
* gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
gnu/java/lang/management/VMThreadMXBeanImpl.java,
gnu/java/lang/management/VMMemoryMXBeanImpl.java,
gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
classes.
* java/lang/management/VMManagementFactory.java: Likewise.
* java/net/VMURLConnection.java: Likewise.
* gnu/java/nio/VMChannel.java: Likewise.
* java/lang/Thread.java (getState): Add stub implementation.
* java/lang/Class.java (isEnum): Likewise.
* java/lang/Class.h (isEnum): Likewise.
* gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.
* javax/naming/spi/NamingManager.java: New override for StackWalker
functionality.
* configure, sources.am, Makefile.in, gcj/Makefile.in,
include/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r116139
2006-08-14 23:12:35 +00:00
|
|
|
if (x == x0 && y == y0)
|
|
|
|
{
|
|
|
|
joinSegments(new Segment[] { start.first, end.first });
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
p = (new LineSegment(x, y, x0, y0)).getDisplacedSegments(width / 2.0);
|
|
|
|
addSegments(p);
|
|
|
|
}
|
2006-05-18 17:29:21 +00:00
|
|
|
convertPath(output, start);
|
|
|
|
convertPath(output, end);
|
|
|
|
start = end = null;
|
|
|
|
pathOpen = false;
|
Imported GNU Classpath 0.92
2006-08-14 Mark Wielaard <mark@klomp.org>
Imported GNU Classpath 0.92
* HACKING: Add more importing hints. Update automake version
requirement.
* configure.ac (gconf-peer): New enable AC argument.
Add --disable-gconf-peer and --enable-default-preferences-peer
to classpath configure when gconf is disabled.
* scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
gnu/java/awt/dnd/peer/gtk to bc. Classify
gnu/java/security/Configuration.java as generated source file.
* gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
gnu/java/lang/management/VMThreadMXBeanImpl.java,
gnu/java/lang/management/VMMemoryMXBeanImpl.java,
gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
classes.
* java/lang/management/VMManagementFactory.java: Likewise.
* java/net/VMURLConnection.java: Likewise.
* gnu/java/nio/VMChannel.java: Likewise.
* java/lang/Thread.java (getState): Add stub implementation.
* java/lang/Class.java (isEnum): Likewise.
* java/lang/Class.h (isEnum): Likewise.
* gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.
* javax/naming/spi/NamingManager.java: New override for StackWalker
functionality.
* configure, sources.am, Makefile.in, gcj/Makefile.in,
include/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r116139
2006-08-14 23:12:35 +00:00
|
|
|
output.setWindingRule(GeneralPath.WIND_EVEN_ODD);
|
2006-05-18 17:29:21 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
pi.next();
|
|
|
|
}
|
|
|
|
|
|
|
|
if( pathOpen )
|
|
|
|
{
|
|
|
|
capEnds();
|
|
|
|
convertPath(output, start);
|
|
|
|
}
|
|
|
|
return output;
|
|
|
|
}
|
|
|
|
|
|
|
|
private Shape dashedStroke(PathIterator pi)
|
|
|
|
{
|
|
|
|
GeneralPath out = new GeneralPath();
|
|
|
|
return out;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Cap the ends of the path (joining the start and end list of segments)
|
|
|
|
*/
|
|
|
|
private void capEnds()
|
|
|
|
{
|
|
|
|
Segment returnPath = end.last;
|
|
|
|
|
|
|
|
end.reverseAll(); // reverse the path.
|
|
|
|
end = null;
|
|
|
|
capEnd(start, returnPath);
|
|
|
|
start.last = returnPath.last;
|
|
|
|
end = null;
|
|
|
|
|
|
|
|
capEnd(start, start);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
Imported GNU Classpath 0.92
2006-08-14 Mark Wielaard <mark@klomp.org>
Imported GNU Classpath 0.92
* HACKING: Add more importing hints. Update automake version
requirement.
* configure.ac (gconf-peer): New enable AC argument.
Add --disable-gconf-peer and --enable-default-preferences-peer
to classpath configure when gconf is disabled.
* scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
gnu/java/awt/dnd/peer/gtk to bc. Classify
gnu/java/security/Configuration.java as generated source file.
* gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
gnu/java/lang/management/VMThreadMXBeanImpl.java,
gnu/java/lang/management/VMMemoryMXBeanImpl.java,
gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
classes.
* java/lang/management/VMManagementFactory.java: Likewise.
* java/net/VMURLConnection.java: Likewise.
* gnu/java/nio/VMChannel.java: Likewise.
* java/lang/Thread.java (getState): Add stub implementation.
* java/lang/Class.java (isEnum): Likewise.
* java/lang/Class.h (isEnum): Likewise.
* gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.
* javax/naming/spi/NamingManager.java: New override for StackWalker
functionality.
* configure, sources.am, Makefile.in, gcj/Makefile.in,
include/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r116139
2006-08-14 23:12:35 +00:00
|
|
|
* Append the Segments in s to the GeneralPath p
|
2006-05-18 17:29:21 +00:00
|
|
|
*/
|
|
|
|
private void convertPath(GeneralPath p, Segment s)
|
|
|
|
{
|
|
|
|
Segment v = s;
|
|
|
|
p.moveTo((float)s.P1.getX(), (float)s.P1.getY());
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
|
|
|
if(v instanceof LineSegment)
|
|
|
|
p.lineTo((float)v.P2.getX(), (float)v.P2.getY());
|
|
|
|
else if(v instanceof QuadSegment)
|
|
|
|
p.quadTo((float)((QuadSegment)v).cp.getX(),
|
|
|
|
(float)((QuadSegment)v).cp.getY(),
|
|
|
|
(float)v.P2.getX(),
|
|
|
|
(float)v.P2.getY());
|
|
|
|
else if(v instanceof CubicSegment)
|
|
|
|
p.curveTo((float)((CubicSegment)v).cp1.getX(),
|
|
|
|
(float)((CubicSegment)v).cp1.getY(),
|
|
|
|
(float)((CubicSegment)v).cp2.getX(),
|
|
|
|
(float)((CubicSegment)v).cp2.getY(),
|
|
|
|
(float)v.P2.getX(),
|
|
|
|
(float)v.P2.getY());
|
|
|
|
v = v.next;
|
|
|
|
} while(v != s && v != null);
|
|
|
|
|
|
|
|
p.closePath();
|
|
|
|
}
|
Imported GNU Classpath 0.92
2006-08-14 Mark Wielaard <mark@klomp.org>
Imported GNU Classpath 0.92
* HACKING: Add more importing hints. Update automake version
requirement.
* configure.ac (gconf-peer): New enable AC argument.
Add --disable-gconf-peer and --enable-default-preferences-peer
to classpath configure when gconf is disabled.
* scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
gnu/java/awt/dnd/peer/gtk to bc. Classify
gnu/java/security/Configuration.java as generated source file.
* gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
gnu/java/lang/management/VMThreadMXBeanImpl.java,
gnu/java/lang/management/VMMemoryMXBeanImpl.java,
gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
classes.
* java/lang/management/VMManagementFactory.java: Likewise.
* java/net/VMURLConnection.java: Likewise.
* gnu/java/nio/VMChannel.java: Likewise.
* java/lang/Thread.java (getState): Add stub implementation.
* java/lang/Class.java (isEnum): Likewise.
* java/lang/Class.h (isEnum): Likewise.
* gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.
* javax/naming/spi/NamingManager.java: New override for StackWalker
functionality.
* configure, sources.am, Makefile.in, gcj/Makefile.in,
include/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r116139
2006-08-14 23:12:35 +00:00
|
|
|
|
2006-05-18 17:29:21 +00:00
|
|
|
/**
|
Imported GNU Classpath 0.92
2006-08-14 Mark Wielaard <mark@klomp.org>
Imported GNU Classpath 0.92
* HACKING: Add more importing hints. Update automake version
requirement.
* configure.ac (gconf-peer): New enable AC argument.
Add --disable-gconf-peer and --enable-default-preferences-peer
to classpath configure when gconf is disabled.
* scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
gnu/java/awt/dnd/peer/gtk to bc. Classify
gnu/java/security/Configuration.java as generated source file.
* gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
gnu/java/lang/management/VMThreadMXBeanImpl.java,
gnu/java/lang/management/VMMemoryMXBeanImpl.java,
gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
classes.
* java/lang/management/VMManagementFactory.java: Likewise.
* java/net/VMURLConnection.java: Likewise.
* gnu/java/nio/VMChannel.java: Likewise.
* java/lang/Thread.java (getState): Add stub implementation.
* java/lang/Class.java (isEnum): Likewise.
* java/lang/Class.h (isEnum): Likewise.
* gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.
* javax/naming/spi/NamingManager.java: New override for StackWalker
functionality.
* configure, sources.am, Makefile.in, gcj/Makefile.in,
include/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r116139
2006-08-14 23:12:35 +00:00
|
|
|
* Add the segments to start and end (the inner and outer edges of the stroke)
|
2006-05-18 17:29:21 +00:00
|
|
|
*/
|
|
|
|
private void addSegments(Segment[] segments)
|
|
|
|
{
|
Imported GNU Classpath 0.92
2006-08-14 Mark Wielaard <mark@klomp.org>
Imported GNU Classpath 0.92
* HACKING: Add more importing hints. Update automake version
requirement.
* configure.ac (gconf-peer): New enable AC argument.
Add --disable-gconf-peer and --enable-default-preferences-peer
to classpath configure when gconf is disabled.
* scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
gnu/java/awt/dnd/peer/gtk to bc. Classify
gnu/java/security/Configuration.java as generated source file.
* gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
gnu/java/lang/management/VMThreadMXBeanImpl.java,
gnu/java/lang/management/VMMemoryMXBeanImpl.java,
gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
classes.
* java/lang/management/VMManagementFactory.java: Likewise.
* java/net/VMURLConnection.java: Likewise.
* gnu/java/nio/VMChannel.java: Likewise.
* java/lang/Thread.java (getState): Add stub implementation.
* java/lang/Class.java (isEnum): Likewise.
* java/lang/Class.h (isEnum): Likewise.
* gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.
* javax/naming/spi/NamingManager.java: New override for StackWalker
functionality.
* configure, sources.am, Makefile.in, gcj/Makefile.in,
include/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r116139
2006-08-14 23:12:35 +00:00
|
|
|
joinSegments(segments);
|
|
|
|
start.add(segments[0]);
|
|
|
|
end.add(segments[1]);
|
|
|
|
}
|
|
|
|
|
|
|
|
private void joinSegments(Segment[] segments)
|
|
|
|
{
|
|
|
|
double[] p0 = start.last.cp2();
|
2006-05-18 17:29:21 +00:00
|
|
|
double[] p1 = new double[]{start.last.P2.getX(), start.last.P2.getY()};
|
Imported GNU Classpath 0.92
2006-08-14 Mark Wielaard <mark@klomp.org>
Imported GNU Classpath 0.92
* HACKING: Add more importing hints. Update automake version
requirement.
* configure.ac (gconf-peer): New enable AC argument.
Add --disable-gconf-peer and --enable-default-preferences-peer
to classpath configure when gconf is disabled.
* scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
gnu/java/awt/dnd/peer/gtk to bc. Classify
gnu/java/security/Configuration.java as generated source file.
* gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
gnu/java/lang/management/VMThreadMXBeanImpl.java,
gnu/java/lang/management/VMMemoryMXBeanImpl.java,
gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
classes.
* java/lang/management/VMManagementFactory.java: Likewise.
* java/net/VMURLConnection.java: Likewise.
* gnu/java/nio/VMChannel.java: Likewise.
* java/lang/Thread.java (getState): Add stub implementation.
* java/lang/Class.java (isEnum): Likewise.
* java/lang/Class.h (isEnum): Likewise.
* gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.
* javax/naming/spi/NamingManager.java: New override for StackWalker
functionality.
* configure, sources.am, Makefile.in, gcj/Makefile.in,
include/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r116139
2006-08-14 23:12:35 +00:00
|
|
|
double[] p2 = new double[]{segments[0].first.P1.getX(), segments[0].first.P1.getY()};
|
|
|
|
double[] p3 = segments[0].cp1();
|
2006-05-18 17:29:21 +00:00
|
|
|
Point2D p;
|
|
|
|
|
Imported GNU Classpath 0.92
2006-08-14 Mark Wielaard <mark@klomp.org>
Imported GNU Classpath 0.92
* HACKING: Add more importing hints. Update automake version
requirement.
* configure.ac (gconf-peer): New enable AC argument.
Add --disable-gconf-peer and --enable-default-preferences-peer
to classpath configure when gconf is disabled.
* scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
gnu/java/awt/dnd/peer/gtk to bc. Classify
gnu/java/security/Configuration.java as generated source file.
* gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
gnu/java/lang/management/VMThreadMXBeanImpl.java,
gnu/java/lang/management/VMMemoryMXBeanImpl.java,
gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
classes.
* java/lang/management/VMManagementFactory.java: Likewise.
* java/net/VMURLConnection.java: Likewise.
* gnu/java/nio/VMChannel.java: Likewise.
* java/lang/Thread.java (getState): Add stub implementation.
* java/lang/Class.java (isEnum): Likewise.
* java/lang/Class.h (isEnum): Likewise.
* gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.
* javax/naming/spi/NamingManager.java: New override for StackWalker
functionality.
* configure, sources.am, Makefile.in, gcj/Makefile.in,
include/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r116139
2006-08-14 23:12:35 +00:00
|
|
|
p = lineIntersection(p0[0],p0[1],p1[0],p1[1],
|
|
|
|
p2[0],p2[1],p3[0],p3[1], false);
|
|
|
|
|
2006-05-18 17:29:21 +00:00
|
|
|
double det = (p1[0] - p0[0])*(p3[1] - p2[1]) -
|
|
|
|
(p3[0] - p2[0])*(p1[1] - p0[1]);
|
|
|
|
|
|
|
|
if( det > 0 )
|
|
|
|
{
|
|
|
|
// start and segment[0] form the 'inner' part of a join,
|
|
|
|
// connect the overlapping segments
|
Imported GNU Classpath 0.92
2006-08-14 Mark Wielaard <mark@klomp.org>
Imported GNU Classpath 0.92
* HACKING: Add more importing hints. Update automake version
requirement.
* configure.ac (gconf-peer): New enable AC argument.
Add --disable-gconf-peer and --enable-default-preferences-peer
to classpath configure when gconf is disabled.
* scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
gnu/java/awt/dnd/peer/gtk to bc. Classify
gnu/java/security/Configuration.java as generated source file.
* gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
gnu/java/lang/management/VMThreadMXBeanImpl.java,
gnu/java/lang/management/VMMemoryMXBeanImpl.java,
gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
classes.
* java/lang/management/VMManagementFactory.java: Likewise.
* java/net/VMURLConnection.java: Likewise.
* gnu/java/nio/VMChannel.java: Likewise.
* java/lang/Thread.java (getState): Add stub implementation.
* java/lang/Class.java (isEnum): Likewise.
* java/lang/Class.h (isEnum): Likewise.
* gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.
* javax/naming/spi/NamingManager.java: New override for StackWalker
functionality.
* configure, sources.am, Makefile.in, gcj/Makefile.in,
include/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r116139
2006-08-14 23:12:35 +00:00
|
|
|
joinInnerSegments(start, segments[0], p);
|
|
|
|
joinOuterSegments(end, segments[1], p);
|
2006-05-18 17:29:21 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// end and segment[1] form the 'inner' part
|
Imported GNU Classpath 0.92
2006-08-14 Mark Wielaard <mark@klomp.org>
Imported GNU Classpath 0.92
* HACKING: Add more importing hints. Update automake version
requirement.
* configure.ac (gconf-peer): New enable AC argument.
Add --disable-gconf-peer and --enable-default-preferences-peer
to classpath configure when gconf is disabled.
* scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
gnu/java/awt/dnd/peer/gtk to bc. Classify
gnu/java/security/Configuration.java as generated source file.
* gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
gnu/java/lang/management/VMThreadMXBeanImpl.java,
gnu/java/lang/management/VMMemoryMXBeanImpl.java,
gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
classes.
* java/lang/management/VMManagementFactory.java: Likewise.
* java/net/VMURLConnection.java: Likewise.
* gnu/java/nio/VMChannel.java: Likewise.
* java/lang/Thread.java (getState): Add stub implementation.
* java/lang/Class.java (isEnum): Likewise.
* java/lang/Class.h (isEnum): Likewise.
* gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.
* javax/naming/spi/NamingManager.java: New override for StackWalker
functionality.
* configure, sources.am, Makefile.in, gcj/Makefile.in,
include/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r116139
2006-08-14 23:12:35 +00:00
|
|
|
joinInnerSegments(end, segments[1], p);
|
|
|
|
joinOuterSegments(start, segments[0], p);
|
2006-05-18 17:29:21 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Make a cap between a and b segments,
|
|
|
|
* where a-->b is the direction of iteration.
|
|
|
|
*/
|
|
|
|
private void capEnd(Segment a, Segment b)
|
|
|
|
{
|
|
|
|
double[] p0, p1;
|
|
|
|
double dx, dy, l;
|
|
|
|
Point2D c1,c2;
|
|
|
|
|
|
|
|
switch( cap )
|
|
|
|
{
|
|
|
|
case CAP_BUTT:
|
|
|
|
a.add(new LineSegment(a.last.P2, b.P1));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case CAP_SQUARE:
|
Imported GNU Classpath 0.92
2006-08-14 Mark Wielaard <mark@klomp.org>
Imported GNU Classpath 0.92
* HACKING: Add more importing hints. Update automake version
requirement.
* configure.ac (gconf-peer): New enable AC argument.
Add --disable-gconf-peer and --enable-default-preferences-peer
to classpath configure when gconf is disabled.
* scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
gnu/java/awt/dnd/peer/gtk to bc. Classify
gnu/java/security/Configuration.java as generated source file.
* gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
gnu/java/lang/management/VMThreadMXBeanImpl.java,
gnu/java/lang/management/VMMemoryMXBeanImpl.java,
gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
classes.
* java/lang/management/VMManagementFactory.java: Likewise.
* java/net/VMURLConnection.java: Likewise.
* gnu/java/nio/VMChannel.java: Likewise.
* java/lang/Thread.java (getState): Add stub implementation.
* java/lang/Class.java (isEnum): Likewise.
* java/lang/Class.h (isEnum): Likewise.
* gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.
* javax/naming/spi/NamingManager.java: New override for StackWalker
functionality.
* configure, sources.am, Makefile.in, gcj/Makefile.in,
include/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r116139
2006-08-14 23:12:35 +00:00
|
|
|
p0 = a.last.cp2();
|
2006-05-18 17:29:21 +00:00
|
|
|
p1 = new double[]{a.last.P2.getX(), a.last.P2.getY()};
|
|
|
|
dx = p1[0] - p0[0];
|
|
|
|
dy = p1[1] - p0[1];
|
|
|
|
l = Math.sqrt(dx * dx + dy * dy);
|
|
|
|
dx = 0.5*width*dx/l;
|
|
|
|
dy = 0.5*width*dy/l;
|
|
|
|
c1 = new Point2D.Double(p1[0] + dx, p1[1] + dy);
|
|
|
|
c2 = new Point2D.Double(b.P1.getX() + dx, b.P1.getY() + dy);
|
|
|
|
a.add(new LineSegment(a.last.P2, c1));
|
|
|
|
a.add(new LineSegment(c1, c2));
|
|
|
|
a.add(new LineSegment(c2, b.P1));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case CAP_ROUND:
|
Imported GNU Classpath 0.92
2006-08-14 Mark Wielaard <mark@klomp.org>
Imported GNU Classpath 0.92
* HACKING: Add more importing hints. Update automake version
requirement.
* configure.ac (gconf-peer): New enable AC argument.
Add --disable-gconf-peer and --enable-default-preferences-peer
to classpath configure when gconf is disabled.
* scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
gnu/java/awt/dnd/peer/gtk to bc. Classify
gnu/java/security/Configuration.java as generated source file.
* gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
gnu/java/lang/management/VMThreadMXBeanImpl.java,
gnu/java/lang/management/VMMemoryMXBeanImpl.java,
gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
classes.
* java/lang/management/VMManagementFactory.java: Likewise.
* java/net/VMURLConnection.java: Likewise.
* gnu/java/nio/VMChannel.java: Likewise.
* java/lang/Thread.java (getState): Add stub implementation.
* java/lang/Class.java (isEnum): Likewise.
* java/lang/Class.h (isEnum): Likewise.
* gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.
* javax/naming/spi/NamingManager.java: New override for StackWalker
functionality.
* configure, sources.am, Makefile.in, gcj/Makefile.in,
include/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r116139
2006-08-14 23:12:35 +00:00
|
|
|
p0 = a.last.cp2();
|
2006-05-18 17:29:21 +00:00
|
|
|
p1 = new double[]{a.last.P2.getX(), a.last.P2.getY()};
|
|
|
|
dx = p1[0] - p0[0];
|
|
|
|
dy = p1[1] - p0[1];
|
|
|
|
l = Math.sqrt(dx * dx + dy * dy);
|
|
|
|
dx = (2.0/3.0)*width*dx/l;
|
|
|
|
dy = (2.0/3.0)*width*dy/l;
|
|
|
|
c1 = new Point2D.Double(p1[0] + dx, p1[1] + dy);
|
|
|
|
c2 = new Point2D.Double(b.P1.getX() + dx, b.P1.getY() + dy);
|
|
|
|
a.add(new CubicSegment(a.last.P2, c1, c2, b.P1));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
a.add(b);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the intersection of two lines, or null if there isn't one.
|
|
|
|
* @param infinite - true if the lines should be regarded as infinite, false
|
|
|
|
* if the intersection must be within the given segments.
|
|
|
|
* @return a Point2D or null.
|
|
|
|
*/
|
|
|
|
private Point2D lineIntersection(double X1, double Y1,
|
|
|
|
double X2, double Y2,
|
|
|
|
double X3, double Y3,
|
|
|
|
double X4, double Y4,
|
|
|
|
boolean infinite)
|
|
|
|
{
|
|
|
|
double x1 = X1;
|
|
|
|
double y1 = Y1;
|
|
|
|
double rx = X2 - x1;
|
|
|
|
double ry = Y2 - y1;
|
|
|
|
|
|
|
|
double x2 = X3;
|
|
|
|
double y2 = Y3;
|
|
|
|
double sx = X4 - x2;
|
|
|
|
double sy = Y4 - y2;
|
|
|
|
|
|
|
|
double determinant = sx * ry - sy * rx;
|
|
|
|
double nom = (sx * (y2 - y1) + sy * (x1 - x2));
|
|
|
|
|
|
|
|
// lines can be considered parallel.
|
|
|
|
if (Math.abs(determinant) < 1E-6)
|
|
|
|
return null;
|
|
|
|
|
|
|
|
nom = nom / determinant;
|
|
|
|
|
|
|
|
// check if lines are within the bounds
|
|
|
|
if(!infinite && (nom > 1.0 || nom < 0.0))
|
|
|
|
return null;
|
|
|
|
|
|
|
|
return new Point2D.Double(x1 + nom * rx, y1 + nom * ry);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Join a and b segments, where a-->b is the direction of iteration.
|
|
|
|
*
|
|
|
|
* insideP is the inside intersection point of the join, needed for
|
|
|
|
* calculating miter lengths.
|
|
|
|
*/
|
Imported GNU Classpath 0.92
2006-08-14 Mark Wielaard <mark@klomp.org>
Imported GNU Classpath 0.92
* HACKING: Add more importing hints. Update automake version
requirement.
* configure.ac (gconf-peer): New enable AC argument.
Add --disable-gconf-peer and --enable-default-preferences-peer
to classpath configure when gconf is disabled.
* scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
gnu/java/awt/dnd/peer/gtk to bc. Classify
gnu/java/security/Configuration.java as generated source file.
* gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
gnu/java/lang/management/VMThreadMXBeanImpl.java,
gnu/java/lang/management/VMMemoryMXBeanImpl.java,
gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
classes.
* java/lang/management/VMManagementFactory.java: Likewise.
* java/net/VMURLConnection.java: Likewise.
* gnu/java/nio/VMChannel.java: Likewise.
* java/lang/Thread.java (getState): Add stub implementation.
* java/lang/Class.java (isEnum): Likewise.
* java/lang/Class.h (isEnum): Likewise.
* gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.
* javax/naming/spi/NamingManager.java: New override for StackWalker
functionality.
* configure, sources.am, Makefile.in, gcj/Makefile.in,
include/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r116139
2006-08-14 23:12:35 +00:00
|
|
|
private void joinOuterSegments(Segment a, Segment b, Point2D insideP)
|
2006-05-18 17:29:21 +00:00
|
|
|
{
|
|
|
|
double[] p0, p1;
|
|
|
|
double dx, dy, l;
|
|
|
|
Point2D c1,c2;
|
|
|
|
|
|
|
|
switch( join )
|
|
|
|
{
|
|
|
|
case JOIN_MITER:
|
Imported GNU Classpath 0.92
2006-08-14 Mark Wielaard <mark@klomp.org>
Imported GNU Classpath 0.92
* HACKING: Add more importing hints. Update automake version
requirement.
* configure.ac (gconf-peer): New enable AC argument.
Add --disable-gconf-peer and --enable-default-preferences-peer
to classpath configure when gconf is disabled.
* scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
gnu/java/awt/dnd/peer/gtk to bc. Classify
gnu/java/security/Configuration.java as generated source file.
* gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
gnu/java/lang/management/VMThreadMXBeanImpl.java,
gnu/java/lang/management/VMMemoryMXBeanImpl.java,
gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
classes.
* java/lang/management/VMManagementFactory.java: Likewise.
* java/net/VMURLConnection.java: Likewise.
* gnu/java/nio/VMChannel.java: Likewise.
* java/lang/Thread.java (getState): Add stub implementation.
* java/lang/Class.java (isEnum): Likewise.
* java/lang/Class.h (isEnum): Likewise.
* gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.
* javax/naming/spi/NamingManager.java: New override for StackWalker
functionality.
* configure, sources.am, Makefile.in, gcj/Makefile.in,
include/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r116139
2006-08-14 23:12:35 +00:00
|
|
|
p0 = a.last.cp2();
|
2006-05-18 17:29:21 +00:00
|
|
|
p1 = new double[]{a.last.P2.getX(), a.last.P2.getY()};
|
|
|
|
double[] p2 = new double[]{b.P1.getX(), b.P1.getY()};
|
Imported GNU Classpath 0.92
2006-08-14 Mark Wielaard <mark@klomp.org>
Imported GNU Classpath 0.92
* HACKING: Add more importing hints. Update automake version
requirement.
* configure.ac (gconf-peer): New enable AC argument.
Add --disable-gconf-peer and --enable-default-preferences-peer
to classpath configure when gconf is disabled.
* scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
gnu/java/awt/dnd/peer/gtk to bc. Classify
gnu/java/security/Configuration.java as generated source file.
* gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
gnu/java/lang/management/VMThreadMXBeanImpl.java,
gnu/java/lang/management/VMMemoryMXBeanImpl.java,
gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
classes.
* java/lang/management/VMManagementFactory.java: Likewise.
* java/net/VMURLConnection.java: Likewise.
* gnu/java/nio/VMChannel.java: Likewise.
* java/lang/Thread.java (getState): Add stub implementation.
* java/lang/Class.java (isEnum): Likewise.
* java/lang/Class.h (isEnum): Likewise.
* gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.
* javax/naming/spi/NamingManager.java: New override for StackWalker
functionality.
* configure, sources.am, Makefile.in, gcj/Makefile.in,
include/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r116139
2006-08-14 23:12:35 +00:00
|
|
|
double[] p3 = b.cp1();
|
2006-05-18 17:29:21 +00:00
|
|
|
Point2D p = lineIntersection(p0[0],p0[1],p1[0],p1[1],p2[0],p2[1],p3[0],p3[1], true);
|
|
|
|
if( p == null || insideP == null )
|
|
|
|
a.add(new LineSegment(a.last.P2, b.P1));
|
|
|
|
else if((p.distance(insideP)/width) < limit)
|
|
|
|
{
|
|
|
|
a.add(new LineSegment(a.last.P2, p));
|
|
|
|
a.add(new LineSegment(p, b.P1));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// outside miter limit, do a bevel join.
|
|
|
|
a.add(new LineSegment(a.last.P2, b.P1));
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case JOIN_ROUND:
|
Imported GNU Classpath 0.92
2006-08-14 Mark Wielaard <mark@klomp.org>
Imported GNU Classpath 0.92
* HACKING: Add more importing hints. Update automake version
requirement.
* configure.ac (gconf-peer): New enable AC argument.
Add --disable-gconf-peer and --enable-default-preferences-peer
to classpath configure when gconf is disabled.
* scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
gnu/java/awt/dnd/peer/gtk to bc. Classify
gnu/java/security/Configuration.java as generated source file.
* gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
gnu/java/lang/management/VMThreadMXBeanImpl.java,
gnu/java/lang/management/VMMemoryMXBeanImpl.java,
gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
classes.
* java/lang/management/VMManagementFactory.java: Likewise.
* java/net/VMURLConnection.java: Likewise.
* gnu/java/nio/VMChannel.java: Likewise.
* java/lang/Thread.java (getState): Add stub implementation.
* java/lang/Class.java (isEnum): Likewise.
* java/lang/Class.h (isEnum): Likewise.
* gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.
* javax/naming/spi/NamingManager.java: New override for StackWalker
functionality.
* configure, sources.am, Makefile.in, gcj/Makefile.in,
include/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r116139
2006-08-14 23:12:35 +00:00
|
|
|
p0 = a.last.cp2();
|
2006-05-18 17:29:21 +00:00
|
|
|
p1 = new double[]{a.last.P2.getX(), a.last.P2.getY()};
|
|
|
|
dx = p1[0] - p0[0];
|
|
|
|
dy = p1[1] - p0[1];
|
|
|
|
l = Math.sqrt(dx * dx + dy * dy);
|
|
|
|
dx = 0.5*width*dx/l;
|
|
|
|
dy = 0.5*width*dy/l;
|
|
|
|
c1 = new Point2D.Double(p1[0] + dx, p1[1] + dy);
|
|
|
|
|
|
|
|
p0 = new double[]{b.P1.getX(), b.P1.getY()};
|
Imported GNU Classpath 0.92
2006-08-14 Mark Wielaard <mark@klomp.org>
Imported GNU Classpath 0.92
* HACKING: Add more importing hints. Update automake version
requirement.
* configure.ac (gconf-peer): New enable AC argument.
Add --disable-gconf-peer and --enable-default-preferences-peer
to classpath configure when gconf is disabled.
* scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
gnu/java/awt/dnd/peer/gtk to bc. Classify
gnu/java/security/Configuration.java as generated source file.
* gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
gnu/java/lang/management/VMThreadMXBeanImpl.java,
gnu/java/lang/management/VMMemoryMXBeanImpl.java,
gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
classes.
* java/lang/management/VMManagementFactory.java: Likewise.
* java/net/VMURLConnection.java: Likewise.
* gnu/java/nio/VMChannel.java: Likewise.
* java/lang/Thread.java (getState): Add stub implementation.
* java/lang/Class.java (isEnum): Likewise.
* java/lang/Class.h (isEnum): Likewise.
* gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.
* javax/naming/spi/NamingManager.java: New override for StackWalker
functionality.
* configure, sources.am, Makefile.in, gcj/Makefile.in,
include/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r116139
2006-08-14 23:12:35 +00:00
|
|
|
p1 = b.cp1();
|
2006-05-18 17:29:21 +00:00
|
|
|
|
|
|
|
dx = p0[0] - p1[0]; // backwards direction.
|
|
|
|
dy = p0[1] - p1[1];
|
|
|
|
l = Math.sqrt(dx * dx + dy * dy);
|
|
|
|
dx = 0.5*width*dx/l;
|
|
|
|
dy = 0.5*width*dy/l;
|
|
|
|
c2 = new Point2D.Double(p0[0] + dx, p0[1] + dy);
|
|
|
|
a.add(new CubicSegment(a.last.P2, c1, c2, b.P1));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case JOIN_BEVEL:
|
|
|
|
a.add(new LineSegment(a.last.P2, b.P1));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
Imported GNU Classpath 0.92
2006-08-14 Mark Wielaard <mark@klomp.org>
Imported GNU Classpath 0.92
* HACKING: Add more importing hints. Update automake version
requirement.
* configure.ac (gconf-peer): New enable AC argument.
Add --disable-gconf-peer and --enable-default-preferences-peer
to classpath configure when gconf is disabled.
* scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
gnu/java/awt/dnd/peer/gtk to bc. Classify
gnu/java/security/Configuration.java as generated source file.
* gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
gnu/java/lang/management/VMThreadMXBeanImpl.java,
gnu/java/lang/management/VMMemoryMXBeanImpl.java,
gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
classes.
* java/lang/management/VMManagementFactory.java: Likewise.
* java/net/VMURLConnection.java: Likewise.
* gnu/java/nio/VMChannel.java: Likewise.
* java/lang/Thread.java (getState): Add stub implementation.
* java/lang/Class.java (isEnum): Likewise.
* java/lang/Class.h (isEnum): Likewise.
* gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.
* javax/naming/spi/NamingManager.java: New override for StackWalker
functionality.
* configure, sources.am, Makefile.in, gcj/Makefile.in,
include/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r116139
2006-08-14 23:12:35 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Join a and b segments, removing any overlap
|
|
|
|
*/
|
|
|
|
private void joinInnerSegments(Segment a, Segment b, Point2D p)
|
|
|
|
{
|
|
|
|
double[] p0 = a.last.cp2();
|
|
|
|
double[] p1 = new double[] { a.last.P2.getX(), a.last.P2.getY() };
|
|
|
|
double[] p2 = new double[] { b.P1.getX(), b.P1.getY() };
|
|
|
|
double[] p3 = b.cp1();
|
|
|
|
|
|
|
|
if (p == null)
|
|
|
|
{
|
|
|
|
// Dodgy.
|
|
|
|
a.add(new LineSegment(a.last.P2, b.P1));
|
|
|
|
p = new Point2D.Double((b.P1.getX() + a.last.P2.getX()) / 2.0,
|
|
|
|
(b.P1.getY() + a.last.P2.getY()) / 2.0);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
// This assumes segments a and b are single segments, which is
|
|
|
|
// incorrect - if they are a linked list of segments (ie, passed in
|
|
|
|
// from a flattening operation), this produces strange results!!
|
|
|
|
a.last.P2 = b.P1 = p;
|
|
|
|
}
|
|
|
|
}
|