You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2009/10/12 00:00:56 UTC
svn commit: r824184 [9/34] - in /harmony/enhanced/classlib/branches/java6:
./ depends/build/ doc/ doc/security/ make/
modules/accessibility/src/main/java/javax/accessibility/
modules/accessibility/src/test/api/java/common/javax/accessibility/
modules/a...
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/ComponentInternals.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/ComponentInternals.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/ComponentInternals.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/ComponentInternals.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision$
*/
package org.apache.harmony.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/ContextStorage.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/ContextStorage.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/ContextStorage.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/ContextStorage.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision$
*/
package org.apache.harmony.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/ContextThreadGroup.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/ContextThreadGroup.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/ContextThreadGroup.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/ContextThreadGroup.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision$
*/
package org.apache.harmony.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/FieldsAccessor.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/FieldsAccessor.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/FieldsAccessor.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/FieldsAccessor.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision$
*/
package org.apache.harmony.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/MouseEventPreprocessor.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/MouseEventPreprocessor.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/MouseEventPreprocessor.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/MouseEventPreprocessor.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision$
*/
package org.apache.harmony.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/PeriodicTimer.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/PeriodicTimer.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/PeriodicTimer.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/PeriodicTimer.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Michael Danilov
- * @version $Revision$
*/
package org.apache.harmony.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/ReadOnlyIterator.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/ReadOnlyIterator.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/ReadOnlyIterator.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/ReadOnlyIterator.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision$
*/
package org.apache.harmony.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/RelativeTimer.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/RelativeTimer.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/RelativeTimer.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/RelativeTimer.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Michael Danilov
- * @version $Revision$
*/
package org.apache.harmony.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/ScrollStateController.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/ScrollStateController.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/ScrollStateController.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/ScrollStateController.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Dmitry A. Durnev
- * @version $Revision$
*/
package org.apache.harmony.awt;
@@ -273,12 +272,8 @@
int compSize = 0;
int adjSize = (isVertical ? scrollable.getAdjustableWidth()
: scrollable.getAdjustableHeight());
- if (comp != null) {
- Dimension prefSize = scrollable.getSize();
- compSize = isVertical ? prefSize.height
- : prefSize.width;
- }
- return ((spSize < compSize) &&
- (spOtherSize > adjSize + GAP));
+ Dimension prefSize = scrollable.getSize();
+ compSize = isVertical ? prefSize.height : prefSize.width;
+ return ((spSize < compSize) && (spOtherSize > adjSize + GAP));
}
}
\ No newline at end of file
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/Scrollable.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/Scrollable.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/Scrollable.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/Scrollable.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Dmitry A. Durnev
- * @version $Revision$
*/
package org.apache.harmony.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/ScrollbarStateController.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/ScrollbarStateController.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/ScrollbarStateController.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/ScrollbarStateController.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Dmitry A. Durnev
- * @version $Revision$
*/
package org.apache.harmony.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/SingleShotTimer.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/SingleShotTimer.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/SingleShotTimer.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/SingleShotTimer.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Michael Danilov
- * @version $Revision$
*/
package org.apache.harmony.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/Theme.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/Theme.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/Theme.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/Theme.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision$
*/
package org.apache.harmony.awt;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DTK.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DTK.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DTK.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DTK.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Michael Danilov
- * @version $Revision$
*/
package org.apache.harmony.awt.datatransfer;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DataProvider.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DataProvider.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DataProvider.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DataProvider.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision$
*/
package org.apache.harmony.awt.datatransfer;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DataProxy.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DataProxy.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DataProxy.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DataProxy.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision$
*/
package org.apache.harmony.awt.datatransfer;
@@ -58,9 +57,9 @@
*/
public final class DataProxy implements Transferable {
- public static final Class[] unicodeTextClasses =
+ public static final Class<?>[] unicodeTextClasses =
{ String.class, Reader.class, CharBuffer.class, char[].class };
- public static final Class[] charsetTextClasses =
+ public static final Class<?>[] charsetTextClasses =
{ byte[].class, ByteBuffer.class, InputStream.class };
private final DataProvider data;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DataSnapshot.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DataSnapshot.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DataSnapshot.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DataSnapshot.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision$
*/
package org.apache.harmony.awt.datatransfer;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DataSource.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DataSource.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DataSource.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DataSource.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision$
*/
package org.apache.harmony.awt.datatransfer;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DataTransferThread.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DataTransferThread.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DataTransferThread.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DataTransferThread.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision$
*/
package org.apache.harmony.awt.datatransfer;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DragSourceEventProxy.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DragSourceEventProxy.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DragSourceEventProxy.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/DragSourceEventProxy.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision$
*/
package org.apache.harmony.awt.datatransfer;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/FlavorsComparator.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/FlavorsComparator.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/FlavorsComparator.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/FlavorsComparator.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Michael Danilov
- * @version $Revision$
*/
package org.apache.harmony.awt.datatransfer;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/NativeClipboard.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/NativeClipboard.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/NativeClipboard.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/NativeClipboard.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Mikhail Danilov
- * @version $Revision$
*/
package org.apache.harmony.awt.datatransfer;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/RawBitmap.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/RawBitmap.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/RawBitmap.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/RawBitmap.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision$
*/
package org.apache.harmony.awt.datatransfer;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/TextFlavor.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/TextFlavor.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/TextFlavor.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/datatransfer/TextFlavor.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Pavel Dolgov
- * @version $Revision$
*/
package org.apache.harmony.awt.datatransfer;
@@ -32,10 +31,10 @@
*/
public class TextFlavor {
- public static final Class[] unicodeTextClasses = {
+ public static final Class<?>[] unicodeTextClasses = {
String.class, Reader.class, CharBuffer.class, char[].class };
- public static final Class[] charsetTextClasses = {
+ public static final Class<?>[] charsetTextClasses = {
InputStream.class, ByteBuffer.class, byte[].class };
public static void addUnicodeClasses(SystemFlavorMap fm,
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/geom/CrossingHelper.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/geom/CrossingHelper.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/geom/CrossingHelper.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/geom/CrossingHelper.java Sun Oct 11 21:59:47 2009
@@ -26,7 +26,7 @@
private double[][] coords;
private int[] sizes;
private List<IntersectPoint> isectPoints = new ArrayList<IntersectPoint>();
-
+
public CrossingHelper(double[][] coords, int[] sizes) {
this.coords = coords;
this.sizes = sizes;
@@ -36,11 +36,11 @@
int pointCount1 = sizes[0] / 2;
int pointCount2 = sizes[1] / 2;
int[] indices = new int[pointCount1 + pointCount2];
-
+
for(int i = 0; i < pointCount1 + pointCount2; i++) {
indices[i] = i;
}
-
+
sort(coords[0], pointCount1, coords[1], pointCount2, indices);
// the set for the shapes edges storing
List<Edge> edges = new ArrayList<Edge>();
@@ -52,42 +52,42 @@
if (indices[i] < pointCount1) {
begIndex = indices[i];
endIndex = indices[i] - 1;
-
+
if (endIndex < 0) {
endIndex = pointCount1 - 1;
}
-
+
areaNumber = 0;
} else if (indices[i] < pointCount1 + pointCount2) {
begIndex = indices[i] - pointCount1;
endIndex = indices[i] - 1 - pointCount1;
-
+
if (endIndex < 0) {
endIndex = pointCount2 - 1;
}
-
+
areaNumber = 1;
} else {
throw new IndexOutOfBoundsException();
}
-
+
if (!removeEdge(edges, begIndex, endIndex)) {
edge = new Edge(begIndex, endIndex, areaNumber);
- intersectShape(edges, coords[0], pointCount1,
- coords[1], pointCount2, edge);
+ intersectShape(edges, coords[0], pointCount1,
+ coords[1], pointCount2, edge);
edges.add(edge);
}
-
+
begIndex = indices[i];
endIndex = indices[i] + 1;
-
+
if ((begIndex < pointCount1) && (endIndex == pointCount1)) {
endIndex = 0;
- } else if ((begIndex >= pointCount1) &&
- (endIndex == (pointCount2 + pointCount1))) {
+ } else if ((begIndex >= pointCount1) &&
+ (endIndex == (pointCount2 + pointCount1))) {
endIndex = pointCount1;
}
-
+
if (endIndex < pointCount1) {
areaNumber = 0;
} else {
@@ -95,36 +95,36 @@
endIndex -= pointCount1;
begIndex -= pointCount1;
}
-
+
if (!removeEdge(edges, begIndex, endIndex)) {
edge = new Edge(begIndex, endIndex, areaNumber);
- intersectShape(edges, coords[0], pointCount1,
- coords[1], pointCount2, edge);
+ intersectShape(edges, coords[0], pointCount1,
+ coords[1], pointCount2, edge);
edges.add(edge);
}
}
-
+
return isectPoints.toArray(new IntersectPoint[isectPoints.size()]);
}
private boolean removeEdge(List<Edge> edges, int begIndex, int endIndex) {
-
+
for (Edge edge : edges) {
if (edge.reverseCompare(begIndex, endIndex)) {
edges.remove(edge);
return true;
}
}
-
+
return false;
}
// return the quantity of intersect points
private void intersectShape(List<Edge> edges,
- double[] coords1, int length1,
- double[] coords2, int length2,
- Edge initEdge) {
- int areaOfEdge1, areaOfEdge2;
+ double[] coords1, int length1,
+ double[] coords2, int length2,
+ Edge initEdge) {
+ int areaOfEdge1, areaOfEdge2;
int initBegin, initEnd;
int addBegin, addEnd;
double x1, y1, x2, y2, x3, y3, x4, y4;
@@ -136,37 +136,37 @@
y1 = coords1[2* initEdge.begIndex + 1];
x2 = coords1[2* initEdge.endIndex];
y2 = coords1[2* initEdge.endIndex + 1];
- areaOfEdge1 = 0;
+ areaOfEdge1 = 0;
} else {
x1 = coords2[2* initEdge.begIndex];
y1 = coords2[2* initEdge.begIndex + 1];
x2 = coords2[2* initEdge.endIndex];
y2 = coords2[2* initEdge.endIndex + 1];
- areaOfEdge1 = 1;
+ areaOfEdge1 = 1;
}
-
- for (Iterator iter = edges.iterator(); iter.hasNext(); ) {
- edge = (Edge) iter.next();
-
+
+ for (Iterator<Edge> iter = edges.iterator(); iter.hasNext(); ) {
+ edge = iter.next();
+
if (edge.areaNumber == 0) {
x3 = coords1[2* edge.begIndex];
y3 = coords1[2* edge.begIndex + 1];
x4 = coords1[2* edge.endIndex];
y4 = coords1[2* edge.endIndex + 1];
- areaOfEdge2 = 0;
+ areaOfEdge2 = 0;
} else {
x3 = coords2[2* edge.begIndex];
y3 = coords2[2* edge.begIndex + 1];
x4 = coords2[2* edge.endIndex];
y4 = coords2[2* edge.endIndex + 1];
- areaOfEdge2 = 1;
+ areaOfEdge2 = 1;
}
-
+
if ((areaOfEdge1 != areaOfEdge2) &&
- (GeometryUtil.intersectLines(
- x1, y1, x2, y2, x3, y3, x4, y4, point) == 1) &&
- (!containsPoint(point))) {
-
+ (GeometryUtil.intersectLines(
+ x1, y1, x2, y2, x3, y3, x4, y4, point) == 1) &&
+ (!containsPoint(point))) {
+
if (initEdge.areaNumber == 0) {
initBegin = initEdge.begIndex;
initEnd = initEdge.endIndex;
@@ -178,34 +178,34 @@
addBegin = initEdge.begIndex;
addEnd = initEdge.endIndex;
}
-
- if (((initEnd == length1 - 1) &&
- (initBegin == 0 && initEnd > initBegin)) ||
- (((initEnd != length1 - 1) || (initBegin != 0)) &&
- ((initBegin != length1 - 1) || (initEnd != 0)) &&
- (initBegin > initEnd))) {
-
+
+ if (((initEnd == length1 - 1) &&
+ (initBegin == 0 && initEnd > initBegin)) ||
+ (((initEnd != length1 - 1) || (initBegin != 0)) &&
+ ((initBegin != length1 - 1) || (initEnd != 0)) &&
+ (initBegin > initEnd))) {
+
int temp = initBegin;
initBegin = initEnd;
initEnd = temp;
}
-
- if (((addEnd == length2 - 1) && (addBegin == 0) && (addEnd > addBegin)) ||
- (((addEnd != length2 - 1) || (addBegin != 0)) &&
- ((addBegin != length2 - 1) || (addEnd != 0)) && (addBegin > addEnd))) {
-
+
+ if (((addEnd == length2 - 1) && (addBegin == 0) && (addEnd > addBegin)) ||
+ (((addEnd != length2 - 1) || (addBegin != 0)) &&
+ ((addBegin != length2 - 1) || (addEnd != 0)) && (addBegin > addEnd))) {
+
int temp = addBegin;
addBegin = addEnd;
addEnd = temp;
}
-
+
IntersectPoint ip;
- for (Iterator i = isectPoints.iterator(); i.hasNext(); ) {
- ip = (IntersectPoint)i.next();
-
- if ((initBegin == ip.getBegIndex(true)) &&
- (initEnd == ip.getEndIndex(true))) {
-
+ for (Iterator<IntersectPoint> i = isectPoints.iterator(); i.hasNext(); ) {
+ ip = i.next();
+
+ if ((initBegin == ip.getBegIndex(true)) &&
+ (initEnd == ip.getEndIndex(true))) {
+
if (compare(ip.getX(), ip.getY(), point[0], point[1]) > 0) {
initEnd = - (isectPoints.indexOf(ip) + 1);
ip.setBegIndex1(-(isectPoints.size() + 1));
@@ -214,10 +214,10 @@
ip.setEndIndex1(-(isectPoints.size() + 1));
}
}
-
- if ((addBegin == ip.getBegIndex(false)) &&
- (addEnd == ip.getEndIndex(false))) {
-
+
+ if ((addBegin == ip.getBegIndex(false)) &&
+ (addEnd == ip.getEndIndex(false))) {
+
if (compare(ip.getX(), ip.getY(), point[0], point[1]) > 0) {
addEnd = - (isectPoints.indexOf(ip) + 1);
ip.setBegIndex2(-(isectPoints.size() + 1));
@@ -227,18 +227,18 @@
}
}
}
-
- isectPoints.add(new IntersectPoint(initBegin, initEnd,
- addBegin, addEnd,
- point[0], point[1]));
+
+ isectPoints.add(new IntersectPoint(initBegin, initEnd,
+ addBegin, addEnd,
+ point[0], point[1]));
}
}
}
// the array sorting
private static void sort(double[] coords1, int length1,
- double[] coords2, int length2,
- int[] array) {
+ double[] coords2, int length2,
+ int[] array) {
int temp;
int length = length1 + length2;
double x1, y1, x2, y2;
@@ -260,7 +260,7 @@
}
int j = i;
while (j > 0 && compare(x1, y1, x2, y2) <= 0) {
- temp = array[j];
+ temp = array[j];
array[j] = array[j-1];
array[j-1] = temp;
j--;
@@ -283,44 +283,44 @@
}
}
}
-
+
public boolean containsPoint(double[] point) {
- IntersectPoint ipoint;
-
- for (Iterator i = isectPoints.iterator(); i.hasNext(); ) {
- ipoint = (IntersectPoint)i.next();
-
- if (ipoint.getX() == point[0] && ipoint.getY() == point[1]) {
- return true;
- }
- }
-
- return false;
+ IntersectPoint ipoint;
+
+ for (Iterator<IntersectPoint> i = isectPoints.iterator(); i.hasNext(); ) {
+ ipoint = i.next();
+
+ if (ipoint.getX() == point[0] && ipoint.getY() == point[1]) {
+ return true;
+ }
+ }
+
+ return false;
}
public static int compare(double x1, double y1, double x2, double y2) {
-
- if ((x1 < x2) || (x1 == x2 && y1 < y2)) {
- return 1;
- } else if (x1 == x2 && y1 == y2) {
- return 0;
- }
-
+
+ if ((x1 < x2) || (x1 == x2 && y1 < y2)) {
+ return 1;
+ } else if (x1 == x2 && y1 == y2) {
+ return 0;
+ }
+
return -1;
}
- private static class Edge {
- int begIndex;
- int endIndex;
- int areaNumber;
+ private static final class Edge {
+ final int begIndex;
+ final int endIndex;
+ final int areaNumber;
- public Edge(int begIndex, int endIndex, int areaNumber) {
+ Edge(int begIndex, int endIndex, int areaNumber) {
this.begIndex = begIndex;
this.endIndex = endIndex;
this.areaNumber = areaNumber;
}
- public boolean reverseCompare (int begIndex, int endIndex) {
+ boolean reverseCompare (int begIndex, int endIndex) {
return this.begIndex == endIndex && this.endIndex == begIndex;
}
}
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/geom/CurveCrossingHelper.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/geom/CurveCrossingHelper.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/geom/CurveCrossingHelper.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/geom/CurveCrossingHelper.java Sun Oct 11 21:59:47 2009
@@ -30,9 +30,9 @@
private int[][] offsets;
private List<IntersectPoint> isectPoints = new ArrayList<IntersectPoint>();
- public CurveCrossingHelper(double[][] coords, int[] sizes,
- int[][] rules, int[] rulesSizes,
- int[][] offsets) {
+ public CurveCrossingHelper(double[][] coords, int[] sizes,
+ int[][] rules, int[] rulesSizes,
+ int[][] offsets) {
this.coords = coords;
this.rules = rules;
this.sizes = sizes;
@@ -41,277 +41,277 @@
}
public IntersectPoint[] findCrossing() {
- double[] edge1 = new double[8];
- double[] edge2 = new double[8];
- double[] points = new double[6];
+ double[] edge1 = new double[8];
+ double[] edge2 = new double[8];
+ double[] points = new double[6];
double[] params = new double[6];
double[] mp1 = new double[2];
- double[] cp1 = new double[2];
- double[] mp2 = new double[2];
- double[] cp2 = new double[2];
- int rule1, rule2, endIndex1, endIndex2;
- int ipCount = 0;
+ double[] cp1 = new double[2];
+ double[] mp2 = new double[2];
+ double[] cp2 = new double[2];
+ int rule1, rule2, endIndex1, endIndex2;
+ int ipCount = 0;
for (int i = 0; i < rulesSizes[0]; i++) {
- rule1 = rules[0][i];
- endIndex1 = getCurrentEdge(0, i, edge1, mp1, cp1);
- for (int j = 0; j < rulesSizes[1]; j++) {
- ipCount = 0;
- rule2 = rules[1][j];
- endIndex2 = getCurrentEdge(1, j, edge2, mp2, cp2);
- if (((rule1 == PathIterator.SEG_LINETO) ||
- (rule1 == PathIterator.SEG_CLOSE)) &&
- ((rule2 == PathIterator.SEG_LINETO) ||
- (rule2 == PathIterator.SEG_CLOSE))) {
-
- ipCount = GeometryUtil.intersectLinesWithParams(
- edge1[0], edge1[1], edge1[2], edge1[3],
- edge2[0], edge2[1], edge2[2], edge2[3],
- params);
-
+ rule1 = rules[0][i];
+ endIndex1 = getCurrentEdge(0, i, edge1, mp1, cp1);
+ for (int j = 0; j < rulesSizes[1]; j++) {
+ ipCount = 0;
+ rule2 = rules[1][j];
+ endIndex2 = getCurrentEdge(1, j, edge2, mp2, cp2);
+ if (((rule1 == PathIterator.SEG_LINETO) ||
+ (rule1 == PathIterator.SEG_CLOSE)) &&
+ ((rule2 == PathIterator.SEG_LINETO) ||
+ (rule2 == PathIterator.SEG_CLOSE))) {
+
+ ipCount = GeometryUtil.intersectLinesWithParams(
+ edge1[0], edge1[1], edge1[2], edge1[3],
+ edge2[0], edge2[1], edge2[2], edge2[3],
+ params);
+
if (ipCount != 0) {
points[0] = GeometryUtil.line(
- params[0], edge1[0], edge1[2]);
+ params[0], edge1[0], edge1[2]);
points[1] = GeometryUtil.line(
- params[0], edge1[1], edge1[3]);
+ params[0], edge1[1], edge1[3]);
}
- } else if (((rule1 == PathIterator.SEG_LINETO) ||
- (rule1 == PathIterator.SEG_CLOSE)) &&
- (rule2 == PathIterator.SEG_QUADTO)) {
- ipCount = GeometryUtil.intersectLineAndQuad(
- edge1[0], edge1[1], edge1[2],
- edge1[3], edge2[0], edge2[1],
- edge2[2], edge2[3], edge2[4],
- edge2[5], params);
+ } else if (((rule1 == PathIterator.SEG_LINETO) ||
+ (rule1 == PathIterator.SEG_CLOSE)) &&
+ (rule2 == PathIterator.SEG_QUADTO)) {
+ ipCount = GeometryUtil.intersectLineAndQuad(
+ edge1[0], edge1[1], edge1[2],
+ edge1[3], edge2[0], edge2[1],
+ edge2[2], edge2[3], edge2[4],
+ edge2[5], params);
for (int k = 0; k < ipCount; k++) {
points[2*k] = GeometryUtil.line(params[2*k], edge1[0], edge1[2]);
points[2*k + 1] = GeometryUtil.line(params[2*k], edge1[1], edge1[3]);
}
} else if (rule1 == PathIterator.SEG_QUADTO &&
- (rule2 == PathIterator.SEG_LINETO || rule2 == PathIterator.SEG_CLOSE)) {
- ipCount = GeometryUtil.intersectLineAndQuad(
- edge2[0], edge2[1], edge2[2],
- edge2[3], edge1[0], edge1[1],
- edge1[2], edge1[3], edge1[4],
- edge1[5], params);
+ (rule2 == PathIterator.SEG_LINETO || rule2 == PathIterator.SEG_CLOSE)) {
+ ipCount = GeometryUtil.intersectLineAndQuad(
+ edge2[0], edge2[1], edge2[2],
+ edge2[3], edge1[0], edge1[1],
+ edge1[2], edge1[3], edge1[4],
+ edge1[5], params);
for (int k = 0; k < ipCount; k++) {
points[2*k] = GeometryUtil.line(
- params[2*k + 1], edge2[0], edge2[2]);
+ params[2*k + 1], edge2[0], edge2[2]);
points[2*k + 1] = GeometryUtil.line(
- params[2*k + 1], edge2[1], edge2[3]);
+ params[2*k + 1], edge2[1], edge2[3]);
}
} else if ((rule1 == PathIterator.SEG_CUBICTO) &&
- ((rule2 == PathIterator.SEG_LINETO) ||
- (rule2 == PathIterator.SEG_CLOSE))) {
- ipCount = GeometryUtil.intersectLineAndCubic(
- edge1[0], edge1[1], edge1[2],
- edge1[3], edge1[4], edge1[5],
+ ((rule2 == PathIterator.SEG_LINETO) ||
+ (rule2 == PathIterator.SEG_CLOSE))) {
+ ipCount = GeometryUtil.intersectLineAndCubic(
+ edge1[0], edge1[1], edge1[2],
+ edge1[3], edge1[4], edge1[5],
edge1[6], edge1[7], edge2[0],
edge2[1], edge2[2], edge2[3],
- params);
-
+ params);
+
for (int k = 0; k < ipCount; k++) {
points[2*k] = GeometryUtil.line(
- params[2*k + 1], edge2[0], edge2[2]);
+ params[2*k + 1], edge2[0], edge2[2]);
points[2*k + 1] = GeometryUtil.line(
- params[2*k + 1], edge2[1], edge2[3]);
+ params[2*k + 1], edge2[1], edge2[3]);
}
- } else if (((rule1 == PathIterator.SEG_LINETO) ||
- (rule1 == PathIterator.SEG_CLOSE)) &&
- (rule2 == PathIterator.SEG_CUBICTO)) {
- ipCount = GeometryUtil.intersectLineAndCubic(
- edge1[0], edge1[1], edge1[2],
- edge1[3], edge2[0], edge2[1],
- edge2[2], edge2[3], edge2[4],
- edge2[5], edge2[6], edge2[7],
- params);
-
+ } else if (((rule1 == PathIterator.SEG_LINETO) ||
+ (rule1 == PathIterator.SEG_CLOSE)) &&
+ (rule2 == PathIterator.SEG_CUBICTO)) {
+ ipCount = GeometryUtil.intersectLineAndCubic(
+ edge1[0], edge1[1], edge1[2],
+ edge1[3], edge2[0], edge2[1],
+ edge2[2], edge2[3], edge2[4],
+ edge2[5], edge2[6], edge2[7],
+ params);
+
for (int k = 0; k < ipCount; k++) {
points[2*k] = GeometryUtil.line(
- params[2*k], edge1[0], edge1[2]);
+ params[2*k], edge1[0], edge1[2]);
points[2*k + 1] = GeometryUtil.line(
- params[2*k], edge1[1], edge1[3]);
+ params[2*k], edge1[1], edge1[3]);
}
- } else if ((rule1 == PathIterator.SEG_QUADTO) &&
- (rule2 == PathIterator.SEG_QUADTO)) {
- ipCount = GeometryUtil.intersectQuads(
- edge1[0], edge1[1], edge1[2], edge1[3],
- edge1[4], edge1[5], edge2[0], edge2[1],
- edge2[2], edge2[3], edge2[4], edge2[5],
- params);
+ } else if ((rule1 == PathIterator.SEG_QUADTO) &&
+ (rule2 == PathIterator.SEG_QUADTO)) {
+ ipCount = GeometryUtil.intersectQuads(
+ edge1[0], edge1[1], edge1[2], edge1[3],
+ edge1[4], edge1[5], edge2[0], edge2[1],
+ edge2[2], edge2[3], edge2[4], edge2[5],
+ params);
for (int k = 0; k < ipCount; k++) {
points[2*k] = GeometryUtil.quad(
- params[2*k], edge1[0], edge1[2], edge1[4]);
+ params[2*k], edge1[0], edge1[2], edge1[4]);
points[2*k + 1] = GeometryUtil.quad(
- params[2*k], edge1[1], edge1[3], edge1[5]);
+ params[2*k], edge1[1], edge1[3], edge1[5]);
}
- } else if ((rule1 == PathIterator.SEG_QUADTO) &&
- (rule2 == PathIterator.SEG_CUBICTO)) {
- ipCount = GeometryUtil.intersectQuadAndCubic(
- edge1[0], edge1[1], edge1[2],
- edge1[3], edge1[4], edge1[5],
- edge2[0], edge2[1], edge2[2],
- edge2[3], edge2[4], edge2[5],
- edge2[6], edge2[7], params);
-
+ } else if ((rule1 == PathIterator.SEG_QUADTO) &&
+ (rule2 == PathIterator.SEG_CUBICTO)) {
+ ipCount = GeometryUtil.intersectQuadAndCubic(
+ edge1[0], edge1[1], edge1[2],
+ edge1[3], edge1[4], edge1[5],
+ edge2[0], edge2[1], edge2[2],
+ edge2[3], edge2[4], edge2[5],
+ edge2[6], edge2[7], params);
+
for (int k = 0; k < ipCount; k++) {
points[2*k] = GeometryUtil.quad(
- params[2*k], edge1[0], edge1[2], edge1[4]);
+ params[2*k], edge1[0], edge1[2], edge1[4]);
points[2*k + 1] = GeometryUtil.quad(
- params[2*k], edge1[1], edge1[3], edge1[5]);
+ params[2*k], edge1[1], edge1[3], edge1[5]);
}
- } else if ((rule1 == PathIterator.SEG_CUBICTO) &&
- (rule2 == PathIterator.SEG_QUADTO)) {
- ipCount = GeometryUtil.intersectQuadAndCubic(
- edge2[0], edge2[1], edge2[2],
- edge2[3], edge2[4], edge2[5],
- edge1[0], edge1[1], edge1[2],
- edge1[3], edge1[4], edge1[5],
- edge2[6], edge2[7], params);
-
+ } else if ((rule1 == PathIterator.SEG_CUBICTO) &&
+ (rule2 == PathIterator.SEG_QUADTO)) {
+ ipCount = GeometryUtil.intersectQuadAndCubic(
+ edge2[0], edge2[1], edge2[2],
+ edge2[3], edge2[4], edge2[5],
+ edge1[0], edge1[1], edge1[2],
+ edge1[3], edge1[4], edge1[5],
+ edge2[6], edge2[7], params);
+
for (int k = 0; k < ipCount; k++) {
points[2*k] = GeometryUtil.quad(
- params[2*k + 1], edge2[0], edge2[2], edge2[4]);
+ params[2*k + 1], edge2[0], edge2[2], edge2[4]);
points[2*k + 1] = GeometryUtil.quad(
- params[2*k + 1], edge2[1], edge2[3], edge2[5]);
+ params[2*k + 1], edge2[1], edge2[3], edge2[5]);
}
- } else if ((rule1 == PathIterator.SEG_CUBICTO) &&
- (rule2 == PathIterator.SEG_CUBICTO)) {
- ipCount = GeometryUtil.intersectCubics(
- edge1[0], edge1[1], edge1[2], edge1[3],
- edge1[4], edge1[5], edge1[6], edge1[7],
- edge2[0], edge2[1], edge2[2], edge2[3],
- edge2[4], edge2[5], edge2[6], edge2[7],
- params);
-
+ } else if ((rule1 == PathIterator.SEG_CUBICTO) &&
+ (rule2 == PathIterator.SEG_CUBICTO)) {
+ ipCount = GeometryUtil.intersectCubics(
+ edge1[0], edge1[1], edge1[2], edge1[3],
+ edge1[4], edge1[5], edge1[6], edge1[7],
+ edge2[0], edge2[1], edge2[2], edge2[3],
+ edge2[4], edge2[5], edge2[6], edge2[7],
+ params);
+
for (int k = 0; k < ipCount; k++) {
points[2*k] = GeometryUtil.cubic(
- params[2*k], edge1[0], edge1[2], edge1[4], edge1[6]);
+ params[2*k], edge1[0], edge1[2], edge1[4], edge1[6]);
points[2*k + 1] = GeometryUtil.cubic(
- params[2*k], edge1[1], edge1[3], edge1[5], edge1[7]);
+ params[2*k], edge1[1], edge1[3], edge1[5], edge1[7]);
}
}
-
- endIndex1 = i;
+
+ endIndex1 = i;
endIndex2 = j;
int begIndex1 = i - 1;
- int begIndex2 = j - 1;
-
- for (int k = 0; k < ipCount; k++) {
+ int begIndex2 = j - 1;
+
+ for (int k = 0; k < ipCount; k++) {
IntersectPoint ip = null;
if (!containsPoint(points[2*k], points[2*k + 1])) {
- for (Iterator iter = isectPoints.iterator();
- iter.hasNext(); ) {
- ip = (IntersectPoint)iter.next();
- if ((begIndex1 == ip.getBegIndex(true)) &&
- (endIndex1 == ip.getEndIndex(true))) {
-
+ for (Iterator<IntersectPoint> iter = isectPoints.iterator();
+ iter.hasNext(); ) {
+ ip = iter.next();
+ if ((begIndex1 == ip.getBegIndex(true)) &&
+ (endIndex1 == ip.getEndIndex(true))) {
+
if (ip.getParam(true) > params[2*k]) {
endIndex1 = - (isectPoints.indexOf(ip) + 1);
ip.setBegIndex1(-(isectPoints.size() + 1));
} else {
- begIndex1 = - (isectPoints.indexOf(ip) + 1);
+ begIndex1 = - (isectPoints.indexOf(ip) + 1);
ip.setEndIndex1(-(isectPoints.size() + 1));
}
}
-
- if ((begIndex2 == ip.getBegIndex(false)) &&
- (endIndex2 == ip.getEndIndex(false))) {
-
+
+ if ((begIndex2 == ip.getBegIndex(false)) &&
+ (endIndex2 == ip.getEndIndex(false))) {
+
if (ip.getParam(false) > params[2*k + 1]) {
endIndex2 = - (isectPoints.indexOf(ip) + 1);
ip.setBegIndex2(-(isectPoints.size() + 1));
} else {
- begIndex2 = - (isectPoints.indexOf(ip) + 1);
+ begIndex2 = - (isectPoints.indexOf(ip) + 1);
ip.setEndIndex2(-(isectPoints.size() + 1));
}
}
}
-
+
if (rule1 == PathIterator.SEG_CLOSE) {
- rule1 = PathIterator.SEG_LINETO;
+ rule1 = PathIterator.SEG_LINETO;
}
-
+
if (rule2 == PathIterator.SEG_CLOSE) {
- rule2 = PathIterator.SEG_LINETO;
+ rule2 = PathIterator.SEG_LINETO;
}
-
- isectPoints.add(new IntersectPoint(begIndex1, endIndex1,
- rule1, i,
- begIndex2, endIndex2,
- rule2, j,
- points[2*k], points[2*k + 1],
- params[2*k], params[2*k + 1]));
+
+ isectPoints.add(new IntersectPoint(begIndex1, endIndex1,
+ rule1, i,
+ begIndex2, endIndex2,
+ rule2, j,
+ points[2*k], points[2*k + 1],
+ params[2*k], params[2*k + 1]));
}
}
- }
- }
- return isectPoints.toArray(new IntersectPoint[isectPoints.size()]);
+ }
+ }
+ return isectPoints.toArray(new IntersectPoint[isectPoints.size()]);
}
private int getCurrentEdge(int areaIndex, int index,
- double[] c, double[] mp, double[] cp) {
- int endIndex = 0;
-
- switch (rules[areaIndex][index]) {
- case PathIterator.SEG_MOVETO:
- cp[0] = mp[0] = coords[areaIndex][offsets[areaIndex][index]];
- cp[1] = mp[1] = coords[areaIndex][offsets[areaIndex][index] + 1];
- break;
- case PathIterator.SEG_LINETO:
- c[0] = cp[0];
- c[1] = cp[1];
- cp[0] = c[2] = coords[areaIndex][offsets[areaIndex][index]];
- cp[1] = c[3] = coords[areaIndex][offsets[areaIndex][index] + 1];
- endIndex = 0;
- break;
- case PathIterator.SEG_QUADTO:
- c[0] = cp[0];
- c[1] = cp[1];
- c[2] = coords[areaIndex][offsets[areaIndex][index]];
- c[3] = coords[areaIndex][offsets[areaIndex][index] + 1];
- cp[0] = c[4] = coords[areaIndex][offsets[areaIndex][index] + 2];
- cp[1] = c[5] = coords[areaIndex][offsets[areaIndex][index] + 3];
- endIndex = 2;
- break;
- case PathIterator.SEG_CUBICTO:
- c[0] = cp[0];
- c[1] = cp[1];
- c[2] = coords[areaIndex][offsets[areaIndex][index]];
- c[3] = coords[areaIndex][offsets[areaIndex][index] + 1];
- c[4] = coords[areaIndex][offsets[areaIndex][index] + 2];
- c[5] = coords[areaIndex][offsets[areaIndex][index] + 3];
- cp[0] = c[6] = coords[areaIndex][offsets[areaIndex][index] + 4];
- cp[1] = c[7] = coords[areaIndex][offsets[areaIndex][index] + 5];
- endIndex = 4;
- break;
- case PathIterator.SEG_CLOSE:
- c[0] = cp[0];
- c[1] = cp[1];
- cp[0] = c[2] = mp[0];
- cp[1] = c[3] = mp[1];
- if (offsets[areaIndex][index] >= sizes[areaIndex]) {
- endIndex = -sizes[areaIndex];
- } else {
- endIndex = 0;
- }
- break;
- }
- return offsets[areaIndex][index] + endIndex;
+ double[] c, double[] mp, double[] cp) {
+ int endIndex = 0;
+
+ switch (rules[areaIndex][index]) {
+ case PathIterator.SEG_MOVETO:
+ cp[0] = mp[0] = coords[areaIndex][offsets[areaIndex][index]];
+ cp[1] = mp[1] = coords[areaIndex][offsets[areaIndex][index] + 1];
+ break;
+ case PathIterator.SEG_LINETO:
+ c[0] = cp[0];
+ c[1] = cp[1];
+ cp[0] = c[2] = coords[areaIndex][offsets[areaIndex][index]];
+ cp[1] = c[3] = coords[areaIndex][offsets[areaIndex][index] + 1];
+ endIndex = 0;
+ break;
+ case PathIterator.SEG_QUADTO:
+ c[0] = cp[0];
+ c[1] = cp[1];
+ c[2] = coords[areaIndex][offsets[areaIndex][index]];
+ c[3] = coords[areaIndex][offsets[areaIndex][index] + 1];
+ cp[0] = c[4] = coords[areaIndex][offsets[areaIndex][index] + 2];
+ cp[1] = c[5] = coords[areaIndex][offsets[areaIndex][index] + 3];
+ endIndex = 2;
+ break;
+ case PathIterator.SEG_CUBICTO:
+ c[0] = cp[0];
+ c[1] = cp[1];
+ c[2] = coords[areaIndex][offsets[areaIndex][index]];
+ c[3] = coords[areaIndex][offsets[areaIndex][index] + 1];
+ c[4] = coords[areaIndex][offsets[areaIndex][index] + 2];
+ c[5] = coords[areaIndex][offsets[areaIndex][index] + 3];
+ cp[0] = c[6] = coords[areaIndex][offsets[areaIndex][index] + 4];
+ cp[1] = c[7] = coords[areaIndex][offsets[areaIndex][index] + 5];
+ endIndex = 4;
+ break;
+ case PathIterator.SEG_CLOSE:
+ c[0] = cp[0];
+ c[1] = cp[1];
+ cp[0] = c[2] = mp[0];
+ cp[1] = c[3] = mp[1];
+ if (offsets[areaIndex][index] >= sizes[areaIndex]) {
+ endIndex = -sizes[areaIndex];
+ } else {
+ endIndex = 0;
+ }
+ break;
+ }
+ return offsets[areaIndex][index] + endIndex;
}
private boolean containsPoint(double x, double y) {
- IntersectPoint ipoint;
-
- for (Iterator i = isectPoints.iterator(); i.hasNext(); ) {
- ipoint = (IntersectPoint)i.next();
-
- if ((Math.abs(ipoint.getX() - x) < Math.pow(10, -6)) &&
- (Math.abs(ipoint.getY() - y) < Math.pow(10, -6))) {
+ IntersectPoint ipoint;
+
+ for (Iterator<IntersectPoint> i = isectPoints.iterator(); i.hasNext(); ) {
+ ipoint = i.next();
+
+ if ((Math.abs(ipoint.getX() - x) < Math.pow(10, -6)) &&
+ (Math.abs(ipoint.getY() - y) < Math.pow(10, -6))) {
return true;
- }
- }
-
- return false;
+ }
+ }
+
+ return false;
}
}
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/geom/IntersectPoint.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/geom/IntersectPoint.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/geom/IntersectPoint.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/geom/IntersectPoint.java Sun Oct 11 21:59:47 2009
@@ -19,9 +19,9 @@
// the class represents the intersect point of two edges
public class IntersectPoint {
- // the edge begin number of first line
+ // the edge begin number of first line
private int begIndex1;
- // the edge end number of first line
+ // the edge end number of first line
private int endIndex1;
// the edge rule of first figure
private int rule1;
@@ -29,24 +29,24 @@
private int ruleIndex1;
// the parameter value of edge1
private double param1;
- // the edge begin number of second line
+ // the edge begin number of second line
private int begIndex2;
- // the edge end number of second line
+ // the edge end number of second line
private int endIndex2;
// the edge rule of second figure
private int rule2;
// the index of the second figure rules array
private int ruleIndex2;
// the absciss coordinate of the point
- private double x;
+ private final double x;
// the ordinate coordinate of the point
- private double y;
-// the parameter value of edge2
+ private final double y;
+ // the parameter value of edge2
private double param2;
public IntersectPoint(int begIndex1, int endIndex1,
- int begIndex2, int endIndex2,
- double x, double y) {
+ int begIndex2, int endIndex2,
+ double x, double y) {
this.begIndex1 = begIndex1;
this.endIndex1 = endIndex1;
this.begIndex2 = begIndex2;
@@ -55,9 +55,9 @@
this.y = y;
}
- public IntersectPoint (int begIndex1, int endIndex1, int rule1, int ruleIndex1,
- int begIndex2, int endIndex2, int rule2, int ruleIndex2,
- double x, double y, double param1, double param2) {
+ public IntersectPoint (int begIndex1, int endIndex1, int rule1, int ruleIndex1,
+ int begIndex2, int endIndex2, int rule2, int ruleIndex2,
+ double x, double y, double param1, double param2) {
this.begIndex1 = begIndex1;
this.endIndex1 = endIndex1;
this.rule1 = rule1;
@@ -73,45 +73,25 @@
}
public int getBegIndex(boolean isCurrentArea) {
- if (isCurrentArea) {
- return begIndex1;
- } else {
- return begIndex2;
- }
+ return isCurrentArea ? begIndex1 : begIndex2;
}
public int getEndIndex(boolean isCurrentArea) {
- if (isCurrentArea) {
- return endIndex1;
- } else {
- return endIndex2;
- }
+ return isCurrentArea ? endIndex1 : endIndex2;
}
public int getRuleIndex(boolean isCurrentArea) {
- if (isCurrentArea) {
- return ruleIndex1;
- } else {
- return ruleIndex2;
- }
+ return isCurrentArea ? ruleIndex1 : ruleIndex2;
}
-
+
public double getParam(boolean isCurrentArea) {
- if (isCurrentArea) {
- return param1;
- } else {
- return param2;
- }
+ return isCurrentArea ? param1 : param2;
}
-
+
public int getRule(boolean isCurrentArea) {
- if (isCurrentArea) {
- return rule1;
- } else {
- return rule2;
- }
+ return isCurrentArea ? rule1 : rule2;
}
-
+
public double getX() {
return x;
}
@@ -119,19 +99,19 @@
public double getY() {
return y;
}
-
+
public void setBegIndex1(int begIndex) {
this.begIndex1 = begIndex;
}
-
+
public void setEndIndex1(int endIndex) {
this.endIndex1 = endIndex;
}
-
+
public void setBegIndex2(int begIndex) {
this.begIndex2 = begIndex;
}
-
+
public void setEndIndex2(int endIndex) {
this.endIndex2 = endIndex;
}
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/AwtImageBackdoorAccessor.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/AwtImageBackdoorAccessor.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/AwtImageBackdoorAccessor.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/AwtImageBackdoorAccessor.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Igor V. Stolyarov
- * @version $Revision$
* Created on 23.11.2005
*
*/
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2D.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Alexey A. Petrenko
- * @version $Revision$
*/
package org.apache.harmony.awt.gl;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2DFactory.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2DFactory.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2DFactory.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphics2DFactory.java Sun Oct 11 21:59:47 2009
@@ -16,14 +16,11 @@
*/
/**
* @author Alexey A. Petrenko, Ilya S. Okomin
- * @version $Revision$
*/
package org.apache.harmony.awt.gl;
import java.awt.Font;
-import java.awt.FontMetrics;
import java.awt.peer.FontPeer;
-
import java.io.IOException;
import org.apache.harmony.awt.wtk.GraphicsFactory;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphicsEnvironment.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphicsEnvironment.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphicsEnvironment.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/CommonGraphicsEnvironment.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Alexey A. Petrenko, Oleg V. Khaschansky
- * @version $Revision$
*/
package org.apache.harmony.awt.gl;
@@ -28,7 +27,6 @@
import java.util.Locale;
import org.apache.harmony.awt.gl.font.FontManager;
-import org.apache.harmony.awt.gl.font.fontlib.FLFontManager;
import org.apache.harmony.awt.gl.image.BufferedImageGraphics2D;
/**
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/Crossing.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/Crossing.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/Crossing.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/Crossing.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Denis M. Kishenko
- * @version $Revision$
*/
package org.apache.harmony.awt.gl;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/GLGraphicsDevice.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/GLGraphicsDevice.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/GLGraphicsDevice.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/GLGraphicsDevice.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Alexey A. Petrenko
- * @version $Revision$
*/
package org.apache.harmony.awt.gl;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/GLVolatileImage.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/GLVolatileImage.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/GLVolatileImage.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/GLVolatileImage.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Igor V. Stolyarov
- * @version $Revision$
*/
package org.apache.harmony.awt.gl;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/ICompositeContext.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/ICompositeContext.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/ICompositeContext.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/ICompositeContext.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Igor V. Stolyarov
- * @version $Revision$
*/
package org.apache.harmony.awt.gl;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/ImageSurface.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/ImageSurface.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/ImageSurface.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/ImageSurface.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Igor V. Stolyarov
- * @version $Revision$
* Created on 10.11.2005
*
*/
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/MultiRectArea.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/MultiRectArea.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/MultiRectArea.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/MultiRectArea.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Denis M. Kishenko
- * @version $Revision$
*/
package org.apache.harmony.awt.gl;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/MultiRectAreaOp.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/MultiRectAreaOp.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/MultiRectAreaOp.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/MultiRectAreaOp.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Denis M. Kishenko
- * @version $Revision$
*/
package org.apache.harmony.awt.gl;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/Surface.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/Surface.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/Surface.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/Surface.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Igor V. Stolyarov
- * @version $Revision$
* Created on 10.11.2005
*
*/
@@ -193,8 +192,7 @@
}
public int[] getDirtyRegions(){
- if(dirtyRegions != null) return dirtyRegions.rect;
- else return null;
+ return (dirtyRegions == null ? null : dirtyRegions.rect);
}
/**
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/TextRenderer.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/TextRenderer.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/TextRenderer.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/TextRenderer.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Ilya S. Okomin
- * @version $Revision$
*/
package org.apache.harmony.awt.gl;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/Utils.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/Utils.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/Utils.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/Utils.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Alexey A. Petrenko, Igor V. Stolyarov
- * @version $Revision$
*/
package org.apache.harmony.awt.gl;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/XORComposite.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/XORComposite.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/XORComposite.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/XORComposite.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Igor V. Stolyarov
- * @version $Revision$
* Created on 21.11.2005
*
*/
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/color/ColorConverter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/color/ColorConverter.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/color/ColorConverter.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/color/ColorConverter.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Oleg V. Khaschansky
- * @version $Revision$
*/
package org.apache.harmony.awt.gl.color;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/color/ColorScaler.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/color/ColorScaler.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/color/ColorScaler.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/color/ColorScaler.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Oleg V. Khaschansky
- * @version $Revision$
*/
package org.apache.harmony.awt.gl.color;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/color/ICC_ProfileHelper.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/color/ICC_ProfileHelper.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/color/ICC_ProfileHelper.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/color/ICC_ProfileHelper.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Oleg V. Khaschansky
- * @version $Revision$
*/
package org.apache.harmony.awt.gl.color;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/color/ICC_Transform.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/color/ICC_Transform.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/color/ICC_Transform.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/color/ICC_Transform.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Oleg V. Khaschansky
- * @version $Revision$
*/
package org.apache.harmony.awt.gl.color;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/color/LUTColorConverter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/color/LUTColorConverter.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/color/LUTColorConverter.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/color/LUTColorConverter.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Igor V. Stolyarov
- * @version $Revision$
*/
/*
* Created on 02.11.2004
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/color/NativeCMM.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/color/NativeCMM.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/color/NativeCMM.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/color/NativeCMM.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Oleg V. Khaschansky
- * @version $Revision$
*/
package org.apache.harmony.awt.gl.color;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/color/NativeImageFormat.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/color/NativeImageFormat.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/color/NativeImageFormat.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/color/NativeImageFormat.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Oleg V. Khaschansky
- * @version $Revision$
*/
package org.apache.harmony.awt.gl.color;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/BasicMetrics.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/BasicMetrics.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/BasicMetrics.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/BasicMetrics.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Oleg V. Khaschansky
- * @version $Revision$
*
*/
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/CaretManager.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/CaretManager.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/CaretManager.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/CaretManager.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Oleg V. Khaschansky
- * @version $Revision$
*
* @date: Jun 14, 2005
*/
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/CommonGlyphVector.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/CommonGlyphVector.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/CommonGlyphVector.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/CommonGlyphVector.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Ilya S. Okomin
- * @version $Revision$
*/
package org.apache.harmony.awt.gl.font;
@@ -33,6 +32,7 @@
import java.awt.geom.Rectangle2D;
import org.apache.harmony.awt.internal.nls.Messages;
+import org.apache.harmony.luni.util.NotImplementedException;
/**
* GlyphVector implementation
@@ -422,11 +422,7 @@
*/
@Override
public GlyphJustificationInfo getGlyphJustificationInfo(int glyphIndex) {
- // TODO : Find out the source of Justification info
- if (true) {
- throw new RuntimeException("Method is not implemented"); //$NON-NLS-1$
- }
- return null;
+ throw new NotImplementedException();
}
/**
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/CompositeFont.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/CompositeFont.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/CompositeFont.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/CompositeFont.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Ilya S. Okomin
- * @version $Revision$
*/
package org.apache.harmony.awt.gl.font;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontExtraMetrics.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontExtraMetrics.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontExtraMetrics.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontExtraMetrics.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Ilya S. Okomin
- * @version $Revision$
*
*/
package org.apache.harmony.awt.gl.font;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontFinder.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontFinder.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontFinder.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontFinder.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Oleg V. Khaschansky
- * @version $Revision$
*
* @date: Jul 12, 2005
*/
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontManager.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontManager.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontManager.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontManager.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Ilya S. Okomin
- * @version $Revision$
*/
package org.apache.harmony.awt.gl.font;
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontMetricsImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontMetricsImpl.java?rev=824184&r1=824183&r2=824184&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontMetricsImpl.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/FontMetricsImpl.java Sun Oct 11 21:59:47 2009
@@ -16,7 +16,6 @@
*/
/**
* @author Ilya S. Okomin
- * @version $Revision$
*/
package org.apache.harmony.awt.gl.font;
@@ -84,20 +83,6 @@
this.maxAscent = ascent;
this.maxDescent = descent;
this.maxAdvance = lm.getLogicalMaxCharWidth();
-// initWidths();
- }
-
- /**
- * Initialize the array of the first 256 chars' advance widths
- * of the Font describing this FontMetricsImpl object.
- */
- private void initWidths(){
-
- this.widths = new int[256];
- for (int chr=0; chr < 256; chr++){
- widths[chr] = (int)(getFontPeer().charWidth((char)chr)*scaleX);
- }
-
}
/**
@@ -180,7 +165,6 @@
* Returns the maximum descent of the Font describing this
* FontMetricsImpl object.
*/
- @SuppressWarnings("deprecation")
@Deprecated
@Override
public int getMaxDecent() {