Use foreach and cleanup
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/batik/trunk@1804130 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/batik-anim/src/main/java/org/apache/batik/anim/AnimationEngine.java b/batik-anim/src/main/java/org/apache/batik/anim/AnimationEngine.java
index 4f4f755..166eba7 100644
--- a/batik-anim/src/main/java/org/apache/batik/anim/AnimationEngine.java
+++ b/batik-anim/src/main/java/org/apache/batik/anim/AnimationEngine.java
@@ -90,22 +90,21 @@
*/
public void dispose() {
// Remove any target listeners that are registered.
- Iterator i = targets.entrySet().iterator();
- while (i.hasNext()) {
- Map.Entry e = (Map.Entry) i.next();
+ for (Object o : targets.entrySet()) {
+ Map.Entry e = (Map.Entry) o;
AnimationTarget target = (AnimationTarget) e.getKey();
TargetInfo info = (TargetInfo) e.getValue();
Iterator j = info.xmlAnimations.iterator();
while (j.hasNext()) {
DoublyIndexedTable.Entry e2 =
- (DoublyIndexedTable.Entry) j.next();
+ (DoublyIndexedTable.Entry) j.next();
String namespaceURI = (String) e2.getKey1();
String localName = (String) e2.getKey2();
Sandwich sandwich = (Sandwich) e2.getValue();
if (sandwich.listenerRegistered) {
target.removeTargetListener(namespaceURI, localName, false,
- targetListener);
+ targetListener);
}
}
@@ -116,7 +115,7 @@
Sandwich sandwich = (Sandwich) e2.getValue();
if (sandwich.listenerRegistered) {
target.removeTargetListener(null, propertyName, true,
- targetListener);
+ targetListener);
}
}
}
@@ -304,8 +303,7 @@
float waitTime = timedDocumentRoot.seekTo(time, hyperlinking);
Map.Entry[] targetEntries =
(Map.Entry[]) targets.entrySet().toArray(MAP_ENTRY_ARRAY);
- for (int i = 0; i < targetEntries.length; i++) {
- Map.Entry e = targetEntries[i];
+ for (Map.Entry e : targetEntries) {
AnimationTarget target = (AnimationTarget) e.getKey();
TargetInfo info = (TargetInfo) e.getValue();
@@ -313,29 +311,29 @@
Iterator j = info.xmlAnimations.iterator();
while (j.hasNext()) {
DoublyIndexedTable.Entry e2 =
- (DoublyIndexedTable.Entry) j.next();
+ (DoublyIndexedTable.Entry) j.next();
String namespaceURI = (String) e2.getKey1();
String localName = (String) e2.getKey2();
Sandwich sandwich = (Sandwich) e2.getValue();
if (sandwich.shouldUpdate ||
sandwich.animation != null
- && sandwich.animation.isDirty) {
+ && sandwich.animation.isDirty) {
AnimatableValue av = null;
boolean usesUnderlying = false;
AbstractAnimation anim = sandwich.animation;
if (anim != null) {
av = anim.getComposedValue();
usesUnderlying =
- sandwich.lowestAnimation.usesUnderlyingValue();
+ sandwich.lowestAnimation.usesUnderlyingValue();
anim.isDirty = false;
}
if (usesUnderlying && !sandwich.listenerRegistered) {
target.addTargetListener(namespaceURI, localName, false,
- targetListener);
+ targetListener);
sandwich.listenerRegistered = true;
} else if (!usesUnderlying && sandwich.listenerRegistered) {
target.removeTargetListener(namespaceURI, localName,
- false, targetListener);
+ false, targetListener);
sandwich.listenerRegistered = false;
}
target.updateAttributeValue(namespaceURI, localName, av);
@@ -351,23 +349,23 @@
Sandwich sandwich = (Sandwich) e2.getValue();
if (sandwich.shouldUpdate ||
sandwich.animation != null
- && sandwich.animation.isDirty) {
+ && sandwich.animation.isDirty) {
AnimatableValue av = null;
boolean usesUnderlying = false;
AbstractAnimation anim = sandwich.animation;
if (anim != null) {
av = anim.getComposedValue();
usesUnderlying =
- sandwich.lowestAnimation.usesUnderlyingValue();
+ sandwich.lowestAnimation.usesUnderlyingValue();
anim.isDirty = false;
}
if (usesUnderlying && !sandwich.listenerRegistered) {
target.addTargetListener(null, propertyName, true,
- targetListener);
+ targetListener);
sandwich.listenerRegistered = true;
} else if (!usesUnderlying && sandwich.listenerRegistered) {
target.removeTargetListener(null, propertyName, true,
- targetListener);
+ targetListener);
sandwich.listenerRegistered = false;
}
if (usesUnderlying) {
@@ -388,7 +386,7 @@
Sandwich sandwich = (Sandwich) e2.getValue();
if (sandwich.shouldUpdate ||
sandwich.animation != null
- && sandwich.animation.isDirty) {
+ && sandwich.animation.isDirty) {
AnimatableValue av = null;
AbstractAnimation anim = sandwich.animation;
if (anim != null) {
diff --git a/batik-anim/src/main/java/org/apache/batik/anim/dom/AbstractSVGAnimatedValue.java b/batik-anim/src/main/java/org/apache/batik/anim/dom/AbstractSVGAnimatedValue.java
index 84b809b..8080540 100644
--- a/batik-anim/src/main/java/org/apache/batik/anim/dom/AbstractSVGAnimatedValue.java
+++ b/batik-anim/src/main/java/org/apache/batik/anim/dom/AbstractSVGAnimatedValue.java
@@ -18,7 +18,6 @@
*/
package org.apache.batik.anim.dom;
-import java.util.Iterator;
import java.util.LinkedList;
import org.apache.batik.anim.values.AnimatableValue;
@@ -125,10 +124,9 @@
* Fires the listeners for the animated value.
*/
protected void fireAnimatedAttributeListeners() {
- Iterator i = listeners.iterator();
- while (i.hasNext()) {
+ for (Object listener1 : listeners) {
AnimatedAttributeListener listener =
- (AnimatedAttributeListener) i.next();
+ (AnimatedAttributeListener) listener1;
listener.animatedAttributeChanged(element, this);
}
}
diff --git a/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedNumberList.java b/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedNumberList.java
index a2343d9..20ddfa3 100644
--- a/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedNumberList.java
+++ b/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedNumberList.java
@@ -23,7 +23,6 @@
import org.apache.batik.anim.values.AnimatableNumberListValue;
import org.apache.batik.anim.values.AnimatableValue;
-import org.apache.batik.dom.svg.AbstractSVGList;
import org.apache.batik.dom.svg.AbstractSVGNumberList;
import org.apache.batik.dom.svg.ListBuilder;
import org.apache.batik.dom.svg.LiveAttributeException;
diff --git a/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedPathData.java b/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedPathData.java
index 55d6539..f8d07e2 100644
--- a/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedPathData.java
+++ b/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedPathData.java
@@ -23,7 +23,6 @@
import org.apache.batik.anim.values.AnimatablePathDataValue;
import org.apache.batik.anim.values.AnimatableValue;
-import org.apache.batik.dom.svg.AbstractSVGList;
import org.apache.batik.dom.svg.AbstractSVGNormPathSegList;
import org.apache.batik.dom.svg.AbstractSVGPathSegList;
import org.apache.batik.dom.svg.ListBuilder;
diff --git a/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedPoints.java b/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedPoints.java
index a658e9a..dfa82c5 100644
--- a/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedPoints.java
+++ b/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMAnimatedPoints.java
@@ -23,7 +23,6 @@
import org.apache.batik.anim.values.AnimatablePointListValue;
import org.apache.batik.anim.values.AnimatableValue;
-import org.apache.batik.dom.svg.AbstractSVGList;
import org.apache.batik.dom.svg.AbstractSVGPointList;
import org.apache.batik.dom.svg.ListBuilder;
import org.apache.batik.dom.svg.LiveAttributeException;
diff --git a/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMDocument.java b/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMDocument.java
index 62f0a9c..1bdb938 100644
--- a/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMDocument.java
+++ b/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMDocument.java
@@ -23,7 +23,6 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.Locale;
import java.util.MissingResourceException;
@@ -496,10 +495,9 @@
* modified.
*/
protected void overrideStyleTextChanged(CSSStylableElement e, String text) {
- Iterator i = cssNavigableDocumentListeners.keySet().iterator();
- while (i.hasNext()) {
+ for (Object o : cssNavigableDocumentListeners.keySet()) {
CSSNavigableDocumentListener l =
- (CSSNavigableDocumentListener) i.next();
+ (CSSNavigableDocumentListener) o;
l.overrideStyleTextChanged(e, text);
}
}
@@ -509,10 +507,9 @@
*/
protected void overrideStylePropertyRemoved(CSSStylableElement e,
String name) {
- Iterator i = cssNavigableDocumentListeners.keySet().iterator();
- while (i.hasNext()) {
+ for (Object o : cssNavigableDocumentListeners.keySet()) {
CSSNavigableDocumentListener l =
- (CSSNavigableDocumentListener) i.next();
+ (CSSNavigableDocumentListener) o;
l.overrideStylePropertyRemoved(e, name);
}
}
@@ -522,10 +519,9 @@
*/
protected void overrideStylePropertyChanged
(CSSStylableElement e, String name, String value, String prio) {
- Iterator i = cssNavigableDocumentListeners.keySet().iterator();
- while (i.hasNext()) {
+ for (Object o : cssNavigableDocumentListeners.keySet()) {
CSSNavigableDocumentListener l =
- (CSSNavigableDocumentListener) i.next();
+ (CSSNavigableDocumentListener) o;
l.overrideStylePropertyChanged(e, name, value, prio);
}
}
@@ -701,10 +697,9 @@
*/
public void animatedAttributeChanged(Element e,
AnimatedLiveAttributeValue alav) {
- Iterator i = animatedAttributeListeners.iterator();
- while (i.hasNext()) {
+ for (Object animatedAttributeListener : animatedAttributeListeners) {
AnimatedAttributeListener aal =
- (AnimatedAttributeListener) i.next();
+ (AnimatedAttributeListener) animatedAttributeListener;
aal.animatedAttributeChanged(e, alav);
}
}
@@ -716,10 +711,9 @@
* @param type the type of animation whose value changed
*/
public void otherAnimationChanged(Element e, String type) {
- Iterator i = animatedAttributeListeners.iterator();
- while (i.hasNext()) {
+ for (Object animatedAttributeListener : animatedAttributeListeners) {
AnimatedAttributeListener aal =
- (AnimatedAttributeListener) i.next();
+ (AnimatedAttributeListener) animatedAttributeListener;
aal.otherAnimationChanged(e, type);
}
}
diff --git a/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMElement.java b/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMElement.java
index b49badb..f3553f5 100644
--- a/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMElement.java
+++ b/batik-anim/src/main/java/org/apache/batik/anim/dom/SVGOMElement.java
@@ -18,7 +18,6 @@
*/
package org.apache.batik.anim.dom;
-import java.util.Iterator;
import java.util.LinkedList;
import org.apache.batik.anim.values.AnimatableNumberOptionalNumberValue;
@@ -841,9 +840,8 @@
void fireBaseAttributeListeners(String ns, String ln) {
if (targetListeners != null) {
LinkedList ll = (LinkedList) targetListeners.get(ns, ln);
- Iterator it = ll.iterator();
- while (it.hasNext()) {
- AnimationTargetListener l = (AnimationTargetListener) it.next();
+ for (Object aLl : ll) {
+ AnimationTargetListener l = (AnimationTargetListener) aLl;
l.baseValueChanged(this, ns, ln, false);
}
}
diff --git a/batik-anim/src/main/java/org/apache/batik/anim/timing/Interval.java b/batik-anim/src/main/java/org/apache/batik/anim/timing/Interval.java
index 539a665..2622ef0 100644
--- a/batik-anim/src/main/java/org/apache/batik/anim/timing/Interval.java
+++ b/batik-anim/src/main/java/org/apache/batik/anim/timing/Interval.java
@@ -18,7 +18,6 @@
*/
package org.apache.batik.anim.timing;
-import java.util.Iterator;
import java.util.LinkedList;
/**
@@ -150,9 +149,8 @@
// Trace.enter(this, "setBegin", new Object[] { Float.valueOf(begin) } ); try {
float minTime = Float.POSITIVE_INFINITY;
this.begin = begin;
- Iterator i = beginDependents.iterator();
- while (i.hasNext()) {
- InstanceTime it = (InstanceTime) i.next();
+ for (Object beginDependent : beginDependents) {
+ InstanceTime it = (InstanceTime) beginDependent;
float t = it.dependentUpdate(begin);
if (t < minTime) {
minTime = t;
@@ -170,9 +168,8 @@
float minTime = Float.POSITIVE_INFINITY;
this.end = end;
this.endInstanceTime = endInstanceTime;
- Iterator i = endDependents.iterator();
- while (i.hasNext()) {
- InstanceTime it = (InstanceTime) i.next();
+ for (Object endDependent : endDependents) {
+ InstanceTime it = (InstanceTime) endDependent;
float t = it.dependentUpdate(end);
if (t < minTime) {
minTime = t;
diff --git a/batik-anim/src/main/java/org/apache/batik/anim/timing/TimeContainer.java b/batik-anim/src/main/java/org/apache/batik/anim/timing/TimeContainer.java
index cbbf52b..6d5bc32 100644
--- a/batik-anim/src/main/java/org/apache/batik/anim/timing/TimeContainer.java
+++ b/batik-anim/src/main/java/org/apache/batik/anim/timing/TimeContainer.java
@@ -18,7 +18,6 @@
*/
package org.apache.batik.anim.timing;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -57,9 +56,8 @@
e.root = root;
if (e instanceof TimeContainer) {
TimeContainer c = (TimeContainer) e;
- Iterator it = c.children.iterator();
- while (it.hasNext()) {
- TimedElement te = (TimedElement)it.next();
+ for (Object aChildren : c.children) {
+ TimedElement te = (TimedElement) aChildren;
setRoot(te, root);
}
}
@@ -108,9 +106,8 @@
protected float sampleChildren(float parentSimpleTime,
boolean hyperlinking) {
float mint = Float.POSITIVE_INFINITY;
- Iterator i = children.iterator();
- while (i.hasNext()) {
- TimedElement e = (TimedElement) i.next();
+ for (Object aChildren : children) {
+ TimedElement e = (TimedElement) aChildren;
float t = e.sampleAt(parentSimpleTime, hyperlinking);
if (t < mint) {
mint = t;
@@ -124,9 +121,8 @@
*/
protected void reset(boolean clearCurrentBegin) {
super.reset(clearCurrentBegin);
- Iterator i = children.iterator();
- while (i.hasNext()) {
- TimedElement e = (TimedElement) i.next();
+ for (Object aChildren : children) {
+ TimedElement e = (TimedElement) aChildren;
e.reset(clearCurrentBegin);
}
}
diff --git a/batik-anim/src/main/java/org/apache/batik/anim/timing/TimedDocumentRoot.java b/batik-anim/src/main/java/org/apache/batik/anim/timing/TimedDocumentRoot.java
index 8d89155..e80400f 100644
--- a/batik-anim/src/main/java/org/apache/batik/anim/timing/TimedDocumentRoot.java
+++ b/batik-anim/src/main/java/org/apache/batik/anim/timing/TimedDocumentRoot.java
@@ -19,7 +19,6 @@
package org.apache.batik.anim.timing;
import java.util.Calendar;
-import java.util.Iterator;
import java.util.LinkedList;
import org.apache.batik.util.DoublyIndexedSet;
@@ -138,8 +137,8 @@
// about a partial ordering of timed elements to sample.
float mint = Float.POSITIVE_INFINITY;
TimedElement[] es = getChildren();
- for (int i = 0; i < es.length; i++) {
- float t = es[i].sampleAt(time, hyperlinking);
+ for (TimedElement e1 : es) {
+ float t = e1.sampleAt(time, hyperlinking);
if (t < mint) {
mint = t;
}
@@ -147,11 +146,11 @@
boolean needsUpdates;
do {
needsUpdates = false;
- for (int i = 0; i < es.length; i++) {
- if (es[i].shouldUpdateCurrentInterval) {
+ for (TimedElement e : es) {
+ if (e.shouldUpdateCurrentInterval) {
needsUpdates = true;
// System.err.print("{" + ((Test.AnimateElement) es[i]).id + "} ");
- float t = es[i].sampleAt(time, hyperlinking);
+ float t = e.sampleAt(time, hyperlinking);
if (t < mint) {
mint = t;
}
@@ -221,9 +220,8 @@
* timegraph listeners.
*/
void fireElementAdded(TimedElement e) {
- Iterator i = listeners.iterator();
- while (i.hasNext()) {
- ((TimegraphListener) i.next()).elementAdded(e);
+ for (Object listener : listeners) {
+ ((TimegraphListener) listener).elementAdded(e);
}
}
@@ -232,9 +230,8 @@
* timegraph listeners.
*/
void fireElementRemoved(TimedElement e) {
- Iterator i = listeners.iterator();
- while (i.hasNext()) {
- ((TimegraphListener) i.next()).elementRemoved(e);
+ for (Object listener : listeners) {
+ ((TimegraphListener) listener).elementRemoved(e);
}
}
diff --git a/batik-anim/src/main/java/org/apache/batik/anim/timing/TimedElement.java b/batik-anim/src/main/java/org/apache/batik/anim/timing/TimedElement.java
index b639d4e..a1c6e75 100644
--- a/batik-anim/src/main/java/org/apache/batik/anim/timing/TimedElement.java
+++ b/batik-anim/src/main/java/org/apache/batik/anim/timing/TimedElement.java
@@ -606,16 +606,15 @@
// First, process any events that occurred since the last sampling,
// taking into account event sensitivity.
- Iterator i = handledEvents.entrySet().iterator();
- while (i.hasNext()) {
- Map.Entry e = (Map.Entry) i.next();
+ for (Object o : handledEvents.entrySet()) {
+ Map.Entry e = (Map.Entry) o;
Event evt = (Event) e.getKey();
Set ts = (Set) e.getValue();
Iterator j = ts.iterator();
boolean hasBegin = false, hasEnd = false;
while (j.hasNext() && !(hasBegin && hasEnd)) {
EventLikeTimingSpecifier t =
- (EventLikeTimingSpecifier) j.next();
+ (EventLikeTimingSpecifier) j.next();
if (t.isBegin()) {
hasBegin = true;
} else {
@@ -627,7 +626,7 @@
useBegin = !isActive || restartMode == RESTART_ALWAYS;
useEnd = !useBegin;
} else if (hasBegin && (!isActive ||
- restartMode == RESTART_ALWAYS)) {
+ restartMode == RESTART_ALWAYS)) {
useBegin = true;
useEnd = false;
} else if (hasEnd && isActive) {
@@ -639,7 +638,7 @@
j = ts.iterator();
while (j.hasNext()) {
EventLikeTimingSpecifier t =
- (EventLikeTimingSpecifier) j.next();
+ (EventLikeTimingSpecifier) j.next();
boolean isBegin = t.isBegin();
if (isBegin && useBegin || !isBegin && useEnd) {
t.resolve(evt);
@@ -838,8 +837,8 @@
* accesskey or repeat timing specifiers.
*/
protected boolean endHasEventConditions() {
- for (int i = 0; i < endTimes.length; i++) {
- if (endTimes[i].isEventCondition()) {
+ for (TimingSpecifier endTime : endTimes) {
+ if (endTime.isEventCondition()) {
return true;
}
}
@@ -1289,11 +1288,11 @@
* Initializes this timed element.
*/
public void initialize() {
- for (int i = 0; i < beginTimes.length; i++) {
- beginTimes[i].initialize();
+ for (TimingSpecifier beginTime : beginTimes) {
+ beginTime.initialize();
}
- for (int i = 0; i < endTimes.length; i++) {
- endTimes[i].initialize();
+ for (TimingSpecifier endTime : endTimes) {
+ endTime.initialize();
}
}
@@ -1301,11 +1300,11 @@
* Deinitializes this timed element.
*/
public void deinitialize() {
- for (int i = 0; i < beginTimes.length; i++) {
- beginTimes[i].deinitialize();
+ for (TimingSpecifier beginTime : beginTimes) {
+ beginTime.deinitialize();
}
- for (int i = 0; i < endTimes.length; i++) {
- endTimes[i].deinitialize();
+ for (TimingSpecifier endTime : endTimes) {
+ endTime.deinitialize();
}
}
diff --git a/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatablePathDataValue.java b/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatablePathDataValue.java
index 6eaf40a..236b155 100644
--- a/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatablePathDataValue.java
+++ b/batik-anim/src/main/java/org/apache/batik/anim/values/AnimatablePathDataValue.java
@@ -186,9 +186,9 @@
public String toStringRep() {
StringBuffer sb = new StringBuffer();
int k = 0;
- for (int i = 0; i < commands.length; i++) {
- sb.append(PATH_COMMANDS[commands[i]]);
- for (int j = 0; j < PATH_PARAMS[commands[i]]; j++) {
+ for (short command : commands) {
+ sb.append(PATH_COMMANDS[command]);
+ for (int j = 0; j < PATH_PARAMS[command]; j++) {
sb.append(' ');
sb.append(parameters[k++]);
}
diff --git a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/MultipleGradientPaint.java b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/MultipleGradientPaint.java
index 84fa689..b9708c7 100644
--- a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/MultipleGradientPaint.java
+++ b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/MultipleGradientPaint.java
@@ -167,8 +167,8 @@
// Process transparency
boolean opaque = true;
- for(int i=0; i<colors.length; i++){
- opaque = opaque && (colors[i].getAlpha()==0xff);
+ for (Color color : colors) {
+ opaque = opaque && (color.getAlpha() == 0xff);
}
if(opaque) {
diff --git a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/MultipleGradientPaintContext.java b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/MultipleGradientPaintContext.java
index 59f2cfc..ccf523d 100644
--- a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/MultipleGradientPaintContext.java
+++ b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/MultipleGradientPaintContext.java
@@ -360,8 +360,8 @@
estimatedSize = Integer.MAX_VALUE;
hasDiscontinuity = true;
} else {
- for (int i = 0; i < workTbl.length; i++) {
- estimatedSize += (workTbl[i]/Imin) * GRADIENT_SIZE;
+ for (float aWorkTbl : workTbl) {
+ estimatedSize += (aWorkTbl / Imin) * GRADIENT_SIZE;
}
}
@@ -486,10 +486,10 @@
// Put all gradients in a single array
gradient = new int[gradientsTot];
int curOffset = 0;
- for(int i = 0; i < gradients.length; i++){
- System.arraycopy(gradients[i], 0, gradient,
- curOffset, gradients[i].length);
- curOffset += gradients[i].length;
+ for (int[] gradient1 : gradients) {
+ System.arraycopy(gradient1, 0, gradient,
+ curOffset, gradient1.length);
+ curOffset += gradient1.length;
}
gradient[gradient.length-1] = hiColors[hiColors.length-1].getRGB();
diff --git a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/geom/SegmentList.java b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/geom/SegmentList.java
index 2d9992d..d2ea843 100644
--- a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/geom/SegmentList.java
+++ b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/geom/SegmentList.java
@@ -126,13 +126,13 @@
}
Segment [] resAbove = results.getAbove();
- for(int i=0; i<resAbove.length; i++) {
- above.add(resAbove[i]);
+ for (Segment aResAbove : resAbove) {
+ above.add(aResAbove);
}
Segment [] resBelow = results.getBelow();
- for(int i=0; i<resBelow.length; i++) {
- below.add(resBelow[i]);
+ for (Segment aResBelow : resBelow) {
+ below.add(aResBelow);
}
}
return new SegmentList.SplitResults(above, below);
diff --git a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/renderable/AbstractRable.java b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/renderable/AbstractRable.java
index a817c1e..0153009 100644
--- a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/renderable/AbstractRable.java
+++ b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/renderable/AbstractRable.java
@@ -234,9 +234,8 @@
public Object getProperty(String name) {
Object ret = props.get(name);
if (ret != null) return ret;
- Iterator i = srcs.iterator();
- while (i.hasNext()) {
- RenderableImage ri = (RenderableImage)i.next();
+ for (Object src : srcs) {
+ RenderableImage ri = (RenderableImage) src;
ret = ri.getProperty(name);
if (ret != null) return ret;
}
diff --git a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/renderable/ClipRable8Bit.java b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/renderable/ClipRable8Bit.java
index a62f7c7..cd1c089 100644
--- a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/renderable/ClipRable8Bit.java
+++ b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/renderable/ClipRable8Bit.java
@@ -166,9 +166,7 @@
if (false) {
java.util.Set s = rh.keySet();
- java.util.Iterator i = s.iterator();
- while (i.hasNext()) {
- Object o = i.next();
+ for (Object o : s) {
System.out.println("XXX: " + o + " -> " + rh.get(o));
}
}
diff --git a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/renderable/CompositeRable8Bit.java b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/renderable/CompositeRable8Bit.java
index d4a8760..ffcfca9 100644
--- a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/renderable/CompositeRable8Bit.java
+++ b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/renderable/CompositeRable8Bit.java
@@ -28,7 +28,6 @@
import java.awt.geom.Rectangle2D;
import java.awt.image.RenderedImage;
import java.awt.image.renderable.RenderContext;
-import java.util.Iterator;
import java.util.List;
import java.util.ArrayList;
@@ -116,9 +115,8 @@
// System.out.println("drawImage : " + g2dCS +
// crCS);
- Iterator i = getSources().iterator();
- while (i.hasNext()) {
- GraphicsUtil.drawImage(g2d, (Filter)i.next());
+ for (Object o : getSources()) {
+ GraphicsUtil.drawImage(g2d, (Filter) o);
}
return true;
}
@@ -154,10 +152,9 @@
// note: this hides a member in a superclass!
List srcs = new ArrayList();
- Iterator i = getSources().iterator();
- while (i.hasNext()) {
+ for (Object o : getSources()) {
// Get the source to work with...
- Filter filt = (Filter)i.next();
+ Filter filt = (Filter) o;
// Get our sources image...
RenderedImage ri = filt.createRendering(rc);
@@ -169,25 +166,25 @@
// Blank image...
switch (rule.getRule()) {
- case CompositeRule.RULE_IN:
- // For Mode IN One blank image kills all output
- // (including any "future" images to be drawn).
- return null;
+ case CompositeRule.RULE_IN:
+ // For Mode IN One blank image kills all output
+ // (including any "future" images to be drawn).
+ return null;
- case CompositeRule.RULE_OUT:
- // For mode OUT blank image clears output
- // up to this point, so ignore inputs to this point.
- srcs.clear();
- break;
+ case CompositeRule.RULE_OUT:
+ // For mode OUT blank image clears output
+ // up to this point, so ignore inputs to this point.
+ srcs.clear();
+ break;
- case CompositeRule.RULE_ARITHMETIC:
- srcs.add(new FloodRed(devRect));
- break;
+ case CompositeRule.RULE_ARITHMETIC:
+ srcs.add(new FloodRed(devRect));
+ break;
- default:
- // All other cases we simple pretend the image didn't
- // exist (fully transparent image has no affect).
- break;
+ default:
+ // All other cases we simple pretend the image didn't
+ // exist (fully transparent image has no affect).
+ break;
}
}
}
diff --git a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/renderable/ConvolveMatrixRable8Bit.java b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/renderable/ConvolveMatrixRable8Bit.java
index 04a41b2..005c44c 100644
--- a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/renderable/ConvolveMatrixRable8Bit.java
+++ b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/renderable/ConvolveMatrixRable8Bit.java
@@ -98,8 +98,8 @@
this.kernel = k;
kernelHasNegValues = false;
float [] kv = k.getKernelData(null);
- for (int i=0; i<kv.length; i++)
- if (kv[i] < 0) {
+ for (float aKv : kv)
+ if (aKv < 0) {
kernelHasNegValues = true;
break;
}
diff --git a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/renderable/FilterResRable8Bit.java b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/renderable/FilterResRable8Bit.java
index eea28e7..af5345f 100644
--- a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/renderable/FilterResRable8Bit.java
+++ b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/renderable/FilterResRable8Bit.java
@@ -31,7 +31,6 @@
import java.awt.image.renderable.RenderableImage;
import java.lang.ref.Reference;
import java.lang.ref.SoftReference;
-import java.util.Iterator;
import java.util.ListIterator;
import java.util.List;
@@ -146,9 +145,8 @@
// No sources and we are PaintRable so the chain is PaintRable.
if (v == null) return true;
- Iterator i = v.iterator();
- while (i.hasNext()) {
- RenderableImage nri = (RenderableImage)i.next();
+ for (Object aV : v) {
+ RenderableImage nri = (RenderableImage) aV;
// A source is not paintRable so we are not 100% paintRable.
if (!allPaintRable(nri)) return false;
}
diff --git a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/rendered/AbstractRed.java b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/rendered/AbstractRed.java
index 4a2f333..c9d2ae5 100644
--- a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/rendered/AbstractRed.java
+++ b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/rendered/AbstractRed.java
@@ -31,7 +31,6 @@
import java.awt.image.SampleModel;
import java.awt.image.WritableRaster;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -434,9 +433,8 @@
public Object getProperty(String name) {
Object ret = props.get(name);
if (ret != null) return ret;
- Iterator i = srcs.iterator();
- while (i.hasNext()) {
- RenderedImage ri = (RenderedImage)i.next();
+ for (Object src : srcs) {
+ RenderedImage ri = (RenderedImage) src;
ret = ri.getProperty(name);
if (ret != null) return ret;
}
@@ -454,15 +452,14 @@
// ret[i++] = (String)iter.next();
// }
- Iterator iter = srcs.iterator();
- while (iter.hasNext()) {
- RenderedImage ri = (RenderedImage)iter.next();
- String [] srcProps = ri.getPropertyNames();
+ for (Object src : srcs) {
+ RenderedImage ri = (RenderedImage) src;
+ String[] srcProps = ri.getPropertyNames();
if (srcProps.length != 0) {
- String [] tmp = new String[ret.length+srcProps.length];
- System.arraycopy(ret,0,tmp,0,ret.length);
+ String[] tmp = new String[ret.length + srcProps.length];
+ System.arraycopy(ret, 0, tmp, 0, ret.length);
/// ??? System.arraycopy((tmp,ret.length,srcProps,0,srcProps.length);
- System.arraycopy( srcProps, 0, tmp, ret.length, srcProps.length);
+ System.arraycopy(srcProps, 0, tmp, ret.length, srcProps.length);
ret = tmp;
}
}
diff --git a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/rendered/AbstractTiledRed.java b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/rendered/AbstractTiledRed.java
index fee6f0c..312d842 100644
--- a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/rendered/AbstractTiledRed.java
+++ b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/rendered/AbstractTiledRed.java
@@ -561,11 +561,10 @@
int workTileWidth = tileWidth; // local is cheaper
int workTileHeight = tileHeight; // local is cheaper
int maxTileSize = 0;
- for ( int i = 0; i < blocks.length; i++ ) {
- TileBlock curr = blocks[ i ];
- int sz = ( ( curr.getWidth() * workTileWidth ) *
- ( curr.getHeight() * workTileHeight ) );
- if ( sz > maxTileSize ) {
+ for (TileBlock curr : blocks) {
+ int sz = ((curr.getWidth() * workTileWidth) *
+ (curr.getHeight() * workTileHeight));
+ if (sz > maxTileSize) {
maxTileSize = sz;
}
}
@@ -576,25 +575,24 @@
// cache for reuse in hasBeenHalted()
Thread currentThread = Thread.currentThread();
- for ( int i = 0; i < blocks.length; i++ ) {
- TileBlock curr = blocks[ i ];
+ for (TileBlock curr : blocks) {
int xloc = curr.getXLoc() * workTileWidth + tileGridXOff;
int yloc = curr.getYLoc() * workTileHeight + tileGridYOff;
- Rectangle tb = new Rectangle( xloc, yloc,
+ Rectangle tb = new Rectangle(xloc, yloc,
curr.getWidth() * workTileWidth,
- curr.getHeight() * workTileHeight );
- tb = tb.intersection( bounds );
- Point loc = new Point( tb.x, tb.y );
- WritableRaster child = Raster.createPackedRaster( dbi, tb.width, tb.height, tb.width, masks, loc );
- genRect( child );
- if ( use_INT_PACK ) {
- GraphicsUtil.copyData_INT_PACK( child, wr );
+ curr.getHeight() * workTileHeight);
+ tb = tb.intersection(bounds);
+ Point loc = new Point(tb.x, tb.y);
+ WritableRaster child = Raster.createPackedRaster(dbi, tb.width, tb.height, tb.width, masks, loc);
+ genRect(child);
+ if (use_INT_PACK) {
+ GraphicsUtil.copyData_INT_PACK(child, wr);
} else {
- GraphicsUtil.copyData_FALLBACK( child, wr );
+ GraphicsUtil.copyData_FALLBACK(child, wr);
}
// Check If we should halt early.
- if ( HaltingThread.hasBeenHalted( currentThread ) ) {
+ if (HaltingThread.hasBeenHalted(currentThread)) {
return;
}
}
@@ -610,26 +608,24 @@
int workTileWidth = tileWidth; // local is cheaper
int workTileHeight = tileHeight; // local is cheaper
- for ( int i = 0; i < blocks.length; i++ ) {
- TileBlock curr = blocks[ i ];
-
+ for (TileBlock curr : blocks) {
// System.out.println("Block " + i + ":\n" + curr);
int xloc = curr.getXLoc() * workTileWidth + tileGridXOff;
int yloc = curr.getYLoc() * workTileHeight + tileGridYOff;
- Rectangle tb = new Rectangle( xloc, yloc,
+ Rectangle tb = new Rectangle(xloc, yloc,
curr.getWidth() * workTileWidth,
- curr.getHeight() * workTileHeight );
- tb = tb.intersection( bounds );
+ curr.getHeight() * workTileHeight);
+ tb = tb.intersection(bounds);
WritableRaster child =
- wr.createWritableChild( tb.x, tb.y, tb.width, tb.height,
- tb.x, tb.y, null );
+ wr.createWritableChild(tb.x, tb.y, tb.width, tb.height,
+ tb.x, tb.y, null);
// System.out.println("Computing : " + child);
- genRect( child );
+ genRect(child);
// Check If we should halt early.
- if ( HaltingThread.hasBeenHalted( currentThread ) ) {
+ if (HaltingThread.hasBeenHalted(currentThread)) {
return;
}
}
diff --git a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/rendered/IndexImage.java b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/rendered/IndexImage.java
index c61f2f4..2c59f8a 100644
--- a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/rendered/IndexImage.java
+++ b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/rendered/IndexImage.java
@@ -452,13 +452,12 @@
for (int k=minIdx[c1]; k<=maxIdx[c1]; k++) {
int idx = idx2 | (k<<c1Sh4);
Counter[] v = colors[idx];
- for( int iColor = 0; iColor < v.length; iColor++ ){
- Counter c = v[ iColor ];
- vals = c.getRgb( vals );
- if ( contains( vals )){
+ for (Counter c : v) {
+ vals = c.getRgb(vals);
+ if (contains(vals)) {
// The vals[] lies completly within
// this cube so count it.
- counts[ vals[splitChannel] ] += c.count;
+ counts[vals[splitChannel]] += c.count;
tcount += c.count;
}
}
@@ -530,14 +529,13 @@
for (int k=minIdx[2]; k<=maxIdx[2]; k++) {
int idx = idx2 | k;
Counter[] v = colors[idx];
- for( int iColor = 0; iColor < v.length; iColor++ ){
- Counter c = v[ iColor ];
- vals = c.getRgb( vals );
- if ( contains( vals ) ) {
- float weight = (c.count/(float)count);
- red += (vals[0]*weight);
- grn += (vals[1]*weight);
- blu += (vals[2]*weight);
+ for (Counter c : v) {
+ vals = c.getRgb(vals);
+ if (contains(vals)) {
+ float weight = (c.count / (float) count);
+ red += (vals[0] * weight);
+ grn += (vals[1] * weight);
+ blu += (vals[2] * weight);
}
}
}
diff --git a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/rendered/MultiplyAlphaRed.java b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/rendered/MultiplyAlphaRed.java
index ef28ebf..9183c9d 100644
--- a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/rendered/MultiplyAlphaRed.java
+++ b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/rendered/MultiplyAlphaRed.java
@@ -210,26 +210,32 @@
// 2 is probably next most common...
switch (bands) {
case 2:
- for (int x=0; x<alphaData.length; x++) {
- a = alphaData[x]&0xFF;
- wrData[i] = ((wrData[i]&0xFF)*a)>>8; ++i;
- wrData[i] = ((wrData[i]&0xFF)*a)>>8; ++i;
+ for (int anAlphaData2 : alphaData) {
+ a = anAlphaData2 & 0xFF;
+ wrData[i] = ((wrData[i] & 0xFF) * a) >> 8;
+ ++i;
+ wrData[i] = ((wrData[i] & 0xFF) * a) >> 8;
+ ++i;
}
break;
case 4:
- for (int x=0; x<alphaData.length; x++) {
- a = alphaData[x]&0xFF;
- wrData[i] = ((wrData[i]&0xFF)*a)>>8; ++i;
- wrData[i] = ((wrData[i]&0xFF)*a)>>8; ++i;
- wrData[i] = ((wrData[i]&0xFF)*a)>>8; ++i;
- wrData[i] = ((wrData[i]&0xFF)*a)>>8; ++i;
+ for (int anAlphaData1 : alphaData) {
+ a = anAlphaData1 & 0xFF;
+ wrData[i] = ((wrData[i] & 0xFF) * a) >> 8;
+ ++i;
+ wrData[i] = ((wrData[i] & 0xFF) * a) >> 8;
+ ++i;
+ wrData[i] = ((wrData[i] & 0xFF) * a) >> 8;
+ ++i;
+ wrData[i] = ((wrData[i] & 0xFF) * a) >> 8;
+ ++i;
}
break;
default:
- for (int x=0; x<alphaData.length; x++) {
- a = alphaData[x]&0xFF;
- for (b=0; b<bands; b++) {
- wrData[i] = ((wrData[i]&0xFF)*a)>>8;
+ for (int anAlphaData : alphaData) {
+ a = anAlphaData & 0xFF;
+ for (b = 0; b < bands; b++) {
+ wrData[i] = ((wrData[i] & 0xFF) * a) >> 8;
++i;
}
}
diff --git a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/rendered/TileBlock.java b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/rendered/TileBlock.java
index f6625a3..fff7ddc 100644
--- a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/rendered/TileBlock.java
+++ b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/rendered/TileBlock.java
@@ -140,8 +140,7 @@
*/
static int getWork(TileBlock [] blocks) {
int ret=0;
- for (int i=0; i<blocks.length; i++)
- ret += blocks[i].getWork();
+ for (TileBlock block : blocks) ret += block.getWork();
return ret;
}
diff --git a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/rendered/TurbulencePatternRed.java b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/rendered/TurbulencePatternRed.java
index 3f289a6..2babd44 100644
--- a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/rendered/TurbulencePatternRed.java
+++ b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/rendered/TurbulencePatternRed.java
@@ -239,8 +239,7 @@
public boolean[] getChannels(){
boolean[] channels = new boolean[4];
- for(int i=0; i<this.channels.length; i++)
- channels[this.channels[i]] = true;
+ for (int channel : this.channels) channels[channel] = true;
return channels;
}
diff --git a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/spi/AbstractRegistryEntry.java b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/spi/AbstractRegistryEntry.java
index d2c0d77..7978d64 100644
--- a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/spi/AbstractRegistryEntry.java
+++ b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/spi/AbstractRegistryEntry.java
@@ -42,13 +42,11 @@
this.priority = priority;
this.exts = new ArrayList(exts.length);
- for (int i=0; i<exts.length; i++)
- this.exts.add(exts[i]);
+ for (String ext : exts) this.exts.add(ext);
this.exts = Collections.unmodifiableList(this.exts);
this.mimeTypes = new ArrayList(mimeTypes.length);
- for (int i=0; i<mimeTypes.length; i++)
- this.mimeTypes.add(mimeTypes[i]);
+ for (String mimeType : mimeTypes) this.mimeTypes.add(mimeType);
this.mimeTypes = Collections.unmodifiableList(this.mimeTypes);
}
diff --git a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/spi/ImageTagRegistry.java b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/spi/ImageTagRegistry.java
index 64a9f2b..f4b1306 100644
--- a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/spi/ImageTagRegistry.java
+++ b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/spi/ImageTagRegistry.java
@@ -239,13 +239,12 @@
Filter ret = null;
- Iterator i = entries.iterator();
- while (i.hasNext()) {
- RegistryEntry re = (RegistryEntry)i.next();
+ for (Object entry : entries) {
+ RegistryEntry re = (RegistryEntry) entry;
- if (! (re instanceof StreamRegistryEntry))
+ if (!(re instanceof StreamRegistryEntry))
continue;
- StreamRegistryEntry sre = (StreamRegistryEntry)re;
+ StreamRegistryEntry sre = (StreamRegistryEntry) re;
try {
if (sre.isCompatibleStream(is)) {
@@ -296,9 +295,8 @@
return extensions;
extensions = new LinkedList();
- Iterator iter = entries.iterator();
- while(iter.hasNext()) {
- RegistryEntry re = (RegistryEntry)iter.next();
+ for (Object entry : entries) {
+ RegistryEntry re = (RegistryEntry) entry;
extensions.addAll(re.getStandardExtensions());
}
extensions = Collections.unmodifiableList(extensions);
@@ -315,9 +313,8 @@
return mimeTypes;
mimeTypes = new LinkedList();
- Iterator iter = entries.iterator();
- while(iter.hasNext()) {
- RegistryEntry re = (RegistryEntry)iter.next();
+ for (Object entry : entries) {
+ RegistryEntry re = (RegistryEntry) entry;
mimeTypes.addAll(re.getMimeTypes());
}
mimeTypes = Collections.unmodifiableList(mimeTypes);
diff --git a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/spi/MagicNumberRegistryEntry.java b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/spi/MagicNumberRegistryEntry.java
index 062af0c..1194ce6 100644
--- a/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/spi/MagicNumberRegistryEntry.java
+++ b/batik-awt-util/src/main/java/org/apache/batik/ext/awt/image/spi/MagicNumberRegistryEntry.java
@@ -278,8 +278,8 @@
*/
public int getReadlimit() {
int maxbuf = 0;
- for (int i=0; i<magicNumbers.length; i++) {
- int req = magicNumbers[i].getReadlimit();
+ for (MagicNumber magicNumber : magicNumbers) {
+ int req = magicNumber.getReadlimit();
if (req > maxbuf) {
maxbuf = req;
}
@@ -293,8 +293,8 @@
*/
public boolean isCompatibleStream(InputStream is)
throws StreamCorruptedException {
- for (int i=0; i<magicNumbers.length; i++) {
- if (magicNumbers[i].isMatch(is)) {
+ for (MagicNumber magicNumber : magicNumbers) {
+ if (magicNumber.isMatch(is)) {
return true;
}
}
diff --git a/batik-awt-util/src/main/java/org/apache/batik/ext/swing/DoubleDocument.java b/batik-awt-util/src/main/java/org/apache/batik/ext/swing/DoubleDocument.java
index d5bb9bc..6f41aca 100644
--- a/batik-awt-util/src/main/java/org/apache/batik/ext/swing/DoubleDocument.java
+++ b/batik-awt-util/src/main/java/org/apache/batik/ext/swing/DoubleDocument.java
@@ -53,10 +53,10 @@
if(offs==0 && buffer!=null && buffer.length>0 && buffer[0]=='-')
digit[j++] = buffer[0];
- for (int i = 0; i < buffer.length; i++) {
- if(Character.isDigit(buffer[i]))
- digit[j++] = buffer[i];
- if(!hasDot && buffer[i]=='.'){
+ for (char aBuffer : buffer) {
+ if (Character.isDigit(aBuffer))
+ digit[j++] = aBuffer;
+ if (!hasDot && aBuffer == '.') {
digit[j++] = '.';
hasDot = true;
}
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/AbstractGraphicsNodeBridge.java b/batik-bridge/src/main/java/org/apache/batik/bridge/AbstractGraphicsNodeBridge.java
index 24dce15..6546380 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/AbstractGraphicsNodeBridge.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/AbstractGraphicsNodeBridge.java
@@ -356,8 +356,7 @@
try {
SVGCSSEngine eng = (SVGCSSEngine) evt.getSource();
int[] properties = evt.getProperties();
- for (int i = 0; i < properties.length; i++) {
- int idx = properties[i];
+ for (int idx : properties) {
handleCSSPropertyChanged(idx);
String pn = eng.getPropertyName(idx);
fireBaseAttributeListeners(pn);
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/AbstractSVGGradientElementBridge.java b/batik-bridge/src/main/java/org/apache/batik/bridge/AbstractSVGGradientElementBridge.java
index 608ab7f..eb659a1 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/AbstractSVGGradientElementBridge.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/AbstractSVGGradientElementBridge.java
@@ -257,9 +257,8 @@
* @param key the url to search for
*/
private static boolean contains(List urls, ParsedURL key) {
- Iterator iter = urls.iterator();
- while (iter.hasNext()) {
- if (key.equals(iter.next()))
+ for (Object url : urls) {
+ if (key.equals(url))
return true;
}
return false;
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/AnimatableSVGBridge.java b/batik-bridge/src/main/java/org/apache/batik/bridge/AnimatableSVGBridge.java
index f4a28df..7e2bbf9 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/AnimatableSVGBridge.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/AnimatableSVGBridge.java
@@ -19,7 +19,6 @@
package org.apache.batik.bridge;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.LinkedList;
import org.apache.batik.anim.dom.AnimationTarget;
@@ -87,10 +86,9 @@
if (targetListeners != null) {
LinkedList ll = (LinkedList) targetListeners.get(pn);
if (ll != null) {
- Iterator it = ll.iterator();
- while (it.hasNext()) {
+ for (Object aLl : ll) {
AnimationTargetListener l =
- (AnimationTargetListener) it.next();
+ (AnimationTargetListener) aLl;
l.baseValueChanged((AnimationTarget) e, null, pn, true);
}
}
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/BaseScriptingEnvironment.java b/batik-bridge/src/main/java/org/apache/batik/bridge/BaseScriptingEnvironment.java
index f87d36b..7babd73 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/BaseScriptingEnvironment.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/BaseScriptingEnvironment.java
@@ -29,7 +29,6 @@
import java.net.URL;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -134,9 +133,8 @@
*/
public static boolean isDynamicElement
(Element elt, BridgeContext ctx, List bridgeExtensions) {
- Iterator i = bridgeExtensions.iterator();
- while (i.hasNext()) {
- BridgeExtension bridgeExtension = (BridgeExtension) i.next();
+ for (Object bridgeExtension1 : bridgeExtensions) {
+ BridgeExtension bridgeExtension = (BridgeExtension) bridgeExtension1;
if (bridgeExtension.isDynamicElement(elt)) {
return true;
}
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/BridgeContext.java b/batik-bridge/src/main/java/org/apache/batik/bridge/BridgeContext.java
index ea06204..cb2a014 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/BridgeContext.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/BridgeContext.java
@@ -567,8 +567,8 @@
language,
null);
String[] mimeTypes = interpreter.getMimeTypes();
- for (int i = 0; i < mimeTypes.length; i++) {
- interpreterMap.put(mimeTypes[i], interpreter);
+ for (String mimeType : mimeTypes) {
+ interpreterMap.put(mimeType, interpreter);
}
} catch (Exception e) {
if (userAgent != null) {
@@ -1205,15 +1205,14 @@
public void removeUIEventListeners(Document doc) {
EventTarget evtTarget = (EventTarget)doc.getDocumentElement();
synchronized (eventListenerSet) {
- Iterator i = eventListenerSet.iterator();
- while (i.hasNext()) {
- EventListenerMememto elm = (EventListenerMememto)i.next();
+ for (Object anEventListenerSet : eventListenerSet) {
+ EventListenerMememto elm = (EventListenerMememto) anEventListenerSet;
NodeEventTarget et = elm.getTarget();
if (et == evtTarget) {
EventListener el = elm.getListener();
- boolean uc = elm.getUseCapture();
- String t = elm.getEventType();
- boolean n = elm.getNamespaced();
+ boolean uc = elm.getUseCapture();
+ String t = elm.getEventType();
+ boolean n = elm.getNamespaced();
if (et == null || el == null || t == null) {
continue;
}
@@ -1428,14 +1427,13 @@
synchronized (eventListenerSet) {
// remove all listeners added by Bridges
- Iterator iter = eventListenerSet.iterator();
- while (iter.hasNext()) {
- EventListenerMememto m = (EventListenerMememto)iter.next();
+ for (Object anEventListenerSet : eventListenerSet) {
+ EventListenerMememto m = (EventListenerMememto) anEventListenerSet;
NodeEventTarget et = m.getTarget();
- EventListener el = m.getListener();
- boolean uc = m.getUseCapture();
- String t = m.getEventType();
- boolean n = m.getNamespaced();
+ EventListener el = m.getListener();
+ boolean uc = m.getUseCapture();
+ String t = m.getEventType();
+ boolean n = m.getNamespaced();
if (et == null || el == null || t == null) {
continue;
}
@@ -1458,9 +1456,8 @@
animationEngine = null;
}
- Iterator iter = interpreterMap.values().iterator();
- while (iter.hasNext()) {
- Interpreter interpreter = (Interpreter)iter.next();
+ for (Object o : interpreterMap.values()) {
+ Interpreter interpreter = (Interpreter) o;
if (interpreter != null)
interpreter.dispose();
}
@@ -1705,8 +1702,8 @@
// Check if 'display' changed on this element.
int [] properties = evt.getProperties();
- for (int i=0; i < properties.length; ++i) {
- if (properties[i] == SVGCSSEngine.DISPLAY_INDEX) {
+ for (int property : properties) {
+ if (property == SVGCSSEngine.DISPLAY_INDEX) {
if (!CSSUtilities.convertDisplay(elem)) {
// (Still) Not displayed
break;
@@ -1714,17 +1711,17 @@
// build the graphics node
GVTBuilder builder = getGVTBuilder();
GraphicsNode childNode = builder.build
- (BridgeContext.this, elem);
+ (BridgeContext.this, elem);
if (childNode == null) {
// the added element is not a graphic element?
break;
}
int idx = -1;
- for(Node ps = elem.getPreviousSibling(); ps != null;
- ps = ps.getPreviousSibling()) {
+ for (Node ps = elem.getPreviousSibling(); ps != null;
+ ps = ps.getPreviousSibling()) {
if (ps.getNodeType() != Node.ELEMENT_NODE)
continue;
- Element pse = (Element)ps;
+ Element pse = (Element) ps;
GraphicsNode gn = getGraphicsNode(pse);
if (gn == null)
continue;
@@ -2045,10 +2042,9 @@
public void registerSVGBridges() {
UserAgent ua = getUserAgent();
List ext = getBridgeExtensions(document);
- Iterator iter = ext.iterator();
- while(iter.hasNext()) {
- BridgeExtension be = (BridgeExtension)iter.next();
+ for (Object anExt : ext) {
+ BridgeExtension be = (BridgeExtension) anExt;
be.registerTags(this);
ua.registerExtension(be);
}
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/BridgeEventSupport.java b/batik-bridge/src/main/java/org/apache/batik/bridge/BridgeEventSupport.java
index 111e74b..ff2ee37 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/BridgeEventSupport.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/BridgeEventSupport.java
@@ -20,7 +20,6 @@
import java.awt.Point;
import java.awt.event.KeyEvent;
-import java.awt.geom.NoninvertibleTransformException;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import java.lang.ref.SoftReference;
@@ -435,21 +434,21 @@
if (list != null){
float x = (float)pt.getX();
float y = (float)pt.getY();
- for (int i = 0 ; i < list.size(); i++) {
+ for (Object aList : list) {
StrokingTextPainter.TextRun run =
- (StrokingTextPainter.TextRun)list.get(i);
+ (StrokingTextPainter.TextRun) aList;
AttributedCharacterIterator aci = run.getACI();
TextSpanLayout layout = run.getLayout();
TextHit textHit = layout.hitTestChar(x, y);
Rectangle2D bounds = layout.getBounds2D();
if ((textHit != null) &&
- (bounds != null) && bounds.contains(x, y)) {
+ (bounds != null) && bounds.contains(x, y)) {
SoftReference sr;
- sr =(SoftReference)aci.getAttribute
- (TEXT_COMPOUND_ID);
+ sr = (SoftReference) aci.getAttribute
+ (TEXT_COMPOUND_ID);
Object delimiter = sr.get();
if (delimiter instanceof Element) {
- return (Element)delimiter;
+ return (Element) delimiter;
}
}
}
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/ConcreteTextSelector.java b/batik-bridge/src/main/java/org/apache/batik/bridge/ConcreteTextSelector.java
index 849f893..90e4eb6 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/ConcreteTextSelector.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/ConcreteTextSelector.java
@@ -19,8 +19,6 @@
package org.apache.batik.bridge;
import java.awt.Shape;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.NoninvertibleTransformException;
import java.awt.geom.Point2D;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/DefaultFontFamilyResolver.java b/batik-bridge/src/main/java/org/apache/batik/bridge/DefaultFontFamilyResolver.java
index a8e4c1d..6c49231 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/DefaultFontFamilyResolver.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/DefaultFontFamilyResolver.java
@@ -24,7 +24,6 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
@@ -109,8 +108,7 @@
//Example: Font Family: "Univers", but Font Name: "Univers 45 Light"
//Without this, matching "Univers 45 Light" is not possible.
Font[] allFonts = env.getAllFonts();
- for (int i = 0; i < allFonts.length; i++) {
- Font f = allFonts[i];
+ for (Font f : allFonts) {
fonts.put(f.getFontName().toLowerCase(), f.getFontName());
}
@@ -119,9 +117,8 @@
awtFonts.add(new AWTGVTFont(DEFAULT_FONT_FAMILY.getFamilyName(), 0, 12));
Collection fontValues = fonts.values();
- Iterator iter = fontValues.iterator();
- while(iter.hasNext()) {
- String fontFamily = (String)iter.next();
+ for (Object fontValue : fontValues) {
+ String fontFamily = (String) fontValue;
AWTFontFamily awtFontFamily = new AWTFontFamily(fontFamily);
awtFontFamilies.add(awtFontFamily);
AWTGVTFont font = new AWTGVTFont(fontFamily, 0, 12);
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/FlowTextPainter.java b/batik-bridge/src/main/java/org/apache/batik/bridge/FlowTextPainter.java
index a61aa8b..985cfe6 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/FlowTextPainter.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/FlowTextPainter.java
@@ -151,9 +151,8 @@
AttributedCharacterIterator aci = acis[chunk];
List gvl = new LinkedList();
List layouts = (List)clIter.next();
- Iterator iter = layouts.iterator();
- while (iter.hasNext()) {
- GlyphLayout gl = (GlyphLayout)iter.next();
+ for (Object layout : layouts) {
+ GlyphLayout gl = (GlyphLayout) layout;
gvl.add(gl.getGlyphVector());
}
GVTGlyphVector gv = new MultiGlyphVector(gvl);
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/FontFace.java b/batik-bridge/src/main/java/org/apache/batik/bridge/FontFace.java
index 330f538..9ed2529 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/FontFace.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/FontFace.java
@@ -18,7 +18,6 @@
*/
package org.apache.batik.bridge;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -96,9 +95,7 @@
return family;
}
- Iterator iter = srcs.iterator();
- while (iter.hasNext()) {
- Object o = iter.next();
+ for (Object o : srcs) {
if (o instanceof String) {
family = fontFamilyResolver.resolve((String) o, this);
if (family != null) {
@@ -106,7 +103,7 @@
}
} else if (o instanceof ParsedURL) {
try {
- GVTFontFamily ff = getFontFamily(ctx, (ParsedURL)o);
+ GVTFontFamily ff = getFontFamily(ctx, (ParsedURL) o);
if (ff != null)
return ff;
} catch (SecurityException ex) {
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/GlyphLayout.java b/batik-bridge/src/main/java/org/apache/batik/bridge/GlyphLayout.java
index 409fd49..89e49cc 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/GlyphLayout.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/GlyphLayout.java
@@ -2018,8 +2018,8 @@
*/
public boolean hasCharacterIndex(int index){
- for (int n=0; n<charMap.length; n++) {
- if (index == charMap[n])
+ for (int aCharMap : charMap) {
+ if (index == aCharMap)
return true;
}
return false;
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/Location.java b/batik-bridge/src/main/java/org/apache/batik/bridge/Location.java
index cf56546..82a7bd4 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/Location.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/Location.java
@@ -18,9 +18,6 @@
*/
package org.apache.batik.bridge;
-import java.net.URL;
-
-import org.apache.batik.anim.dom.SVGOMDocument;
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.dom.AbstractDocument;
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/PaintServer.java b/batik-bridge/src/main/java/org/apache/batik/bridge/PaintServer.java
index ce7f688..8d374dc 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/PaintServer.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/PaintServer.java
@@ -630,8 +630,8 @@
// negative values
if ( dashoffset < 0 ) {
float dashpatternlength = 0;
- for ( int i=0; i<dasharray.length; i++ ) {
- dashpatternlength += dasharray[i];
+ for (float aDasharray : dasharray) {
+ dashpatternlength += aDasharray;
}
// if the dash pattern consists of an odd number of elements,
// the pattern length must be doubled
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/RepaintManager.java b/batik-bridge/src/main/java/org/apache/batik/bridge/RepaintManager.java
index be8afff..b2c8d56 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/RepaintManager.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/RepaintManager.java
@@ -25,7 +25,6 @@
import java.awt.image.BufferedImage;
import java.util.ArrayList;
import java.util.List;
-import java.util.Iterator;
import java.util.Collection;
import org.apache.batik.gvt.renderer.ImageRenderer;
@@ -65,18 +64,17 @@
List rects = new ArrayList(areas.size());
AffineTransform at = renderer.getTransform();
- Iterator i = areas.iterator();
- while (i.hasNext()) {
- Shape s = (Shape)i.next();
+ for (Object area : areas) {
+ Shape s = (Shape) area;
s = at.createTransformedShape(s);
Rectangle2D r2d = s.getBounds2D();
- int x0 = (int)Math.floor(r2d.getX());
- int y0 = (int)Math.floor(r2d.getY());
- int x1 = (int)Math.ceil(r2d.getX()+r2d.getWidth());
- int y1 = (int)Math.ceil(r2d.getY()+r2d.getHeight());
+ int x0 = (int) Math.floor(r2d.getX());
+ int y0 = (int) Math.floor(r2d.getY());
+ int x1 = (int) Math.ceil(r2d.getX() + r2d.getWidth());
+ int y1 = (int) Math.ceil(r2d.getY() + r2d.getHeight());
// This rectangle must be outset one pixel to ensure
// it includes the effects of anti-aliasing on objects.
- Rectangle r = new Rectangle(x0-1, y0-1, x1-x0+3, y1-y0+3);
+ Rectangle r = new Rectangle(x0 - 1, y0 - 1, x1 - x0 + 3, y1 - y0 + 3);
rects.add(r);
}
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/SVGAElementBridge.java b/batik-bridge/src/main/java/org/apache/batik/bridge/SVGAElementBridge.java
index fe76223..436aab1 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/SVGAElementBridge.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/SVGAElementBridge.java
@@ -20,7 +20,6 @@
import java.awt.Cursor;
-import java.util.Iterator;
import java.util.List;
import org.apache.batik.anim.dom.SVGOMAElement;
@@ -178,9 +177,7 @@
List l = ae.getDefaultActions();
if (l != null) {
- Iterator i = l.iterator();
- while (i.hasNext()) {
- Object o = i.next();
+ for (Object o : l) {
if (o instanceof AnchorDefaultActionable)
return; // only one anchor in default list...
}
@@ -254,9 +251,7 @@
List l = ae.getDefaultActions();
if (l != null) {
- Iterator i = l.iterator();
- while (i.hasNext()) {
- Object o = i.next();
+ for (Object o : l) {
if (o instanceof MouseOverDefaultActionable)
return; // only one anchor in default list...
}
@@ -340,9 +335,7 @@
List l = ae.getDefaultActions();
if (l != null) {
- Iterator i = l.iterator();
- while (i.hasNext()) {
- Object o = i.next();
+ for (Object o : l) {
if (o instanceof MouseOutDefaultActionable)
return; // only one anchor in default list...
}
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/SVGAnimationEngine.java b/batik-bridge/src/main/java/org/apache/batik/bridge/SVGAnimationEngine.java
index f3e0732..f67a7be 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/SVGAnimationEngine.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/SVGAnimationEngine.java
@@ -258,15 +258,15 @@
String[] eventNamesSVG12 = {
"load", "resize", "scroll", "zoom"
};
- for (int i = 0; i < eventNamesCommon.length; i++) {
- animationEventNames11.add(eventNamesCommon[i]);
- animationEventNames12.add(eventNamesCommon[i]);
+ for (String anEventNamesCommon : eventNamesCommon) {
+ animationEventNames11.add(anEventNamesCommon);
+ animationEventNames12.add(anEventNamesCommon);
}
- for (int i = 0; i < eventNamesSVG11.length; i++) {
- animationEventNames11.add(eventNamesSVG11[i]);
+ for (String anEventNamesSVG11 : eventNamesSVG11) {
+ animationEventNames11.add(anEventNamesSVG11);
}
- for (int i = 0; i < eventNamesSVG12.length; i++) {
- animationEventNames12.add(eventNamesSVG12[i]);
+ for (String anEventNamesSVG12 : eventNamesSVG12) {
+ animationEventNames12.add(anEventNamesSVG12);
}
}
@@ -439,14 +439,14 @@
timedDocumentRoot.resetDocument(cal);
Object[] bridges = initialBridges.toArray();
initialBridges = null;
- for (int i = 0; i < bridges.length; i++) {
+ for (Object bridge2 : bridges) {
SVGAnimationElementBridge bridge =
- (SVGAnimationElementBridge) bridges[i];
+ (SVGAnimationElementBridge) bridge2;
bridge.initializeAnimation();
}
- for (int i = 0; i < bridges.length; i++) {
+ for (Object bridge1 : bridges) {
SVGAnimationElementBridge bridge =
- (SVGAnimationElementBridge) bridges[i];
+ (SVGAnimationElementBridge) bridge1;
bridge.initializeTimedElement();
}
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/SVGFeConvolveMatrixElementBridge.java b/batik-bridge/src/main/java/org/apache/batik/bridge/SVGFeConvolveMatrixElementBridge.java
index 59ffa3d..465f82f 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/SVGFeConvolveMatrixElementBridge.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/SVGFeConvolveMatrixElementBridge.java
@@ -246,8 +246,8 @@
if (s.length() == 0) {
// default is sum of kernel values (if sum is zero then 1.0)
float sum = 0;
- for (int i=0; i < kernelMatrix.length; ++i) {
- sum += kernelMatrix[i];
+ for (float aKernelMatrix : kernelMatrix) {
+ sum += aKernelMatrix;
}
return (sum == 0) ? 1.0f : sum;
} else {
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/SVGFontUtilities.java b/batik-bridge/src/main/java/org/apache/batik/bridge/SVGFontUtilities.java
index dafc161..9ffde05 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/SVGFontUtilities.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/SVGFontUtilities.java
@@ -72,9 +72,8 @@
CSSEngine engine = ((SVGOMDocument)doc).getCSSEngine();
List sms = engine.getFontFaces();
- Iterator iter = sms.iterator();
- while (iter.hasNext()) {
- FontFaceRule ffr = (FontFaceRule)iter.next();
+ for (Object sm : sms) {
+ FontFaceRule ffr = (FontFaceRule) sm;
ret.add(CSSFontFace.createCSSFontFace(engine, ffr));
}
return ret;
@@ -159,10 +158,9 @@
// create lists of font weight numbers for each font family
List fontFamilyWeights = new ArrayList(svgFontFamilies.size());
- Iterator ffiter = svgFontFamilies.iterator();
- while(ffiter.hasNext()) {
+ for (Object svgFontFamily : svgFontFamilies) {
GVTFontFace fontFace;
- fontFace = ((GVTFontFamily)ffiter.next()).getFontFace();
+ fontFace = ((GVTFontFamily) svgFontFamily).getFontFace();
String fontFaceWeight = fontFace.getFontWeight();
fontFaceWeight = getFontWeightNumberString(fontFaceWeight);
fontFamilyWeights.add(fontFaceWeight);
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/SVGGVTFont.java b/batik-bridge/src/main/java/org/apache/batik/bridge/SVGGVTFont.java
index 512e8f6..7997492 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/SVGGVTFont.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/SVGGVTFont.java
@@ -682,8 +682,8 @@
// construct a string from the glyphCodes
int nGlyphs = glyphCodes.length;
StringBuffer workBuff = new StringBuffer( nGlyphs );
- for (int i = 0; i < nGlyphs; i++) {
- workBuff.append( glyphUnicodes[glyphCodes[i]] );
+ for (int glyphCode : glyphCodes) {
+ workBuff.append(glyphUnicodes[glyphCode]);
}
StringCharacterIterator sci = new StringCharacterIterator( workBuff.toString() );
return createGlyphVector(frc, sci);
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/SVGImageElementBridge.java b/batik-bridge/src/main/java/org/apache/batik/bridge/SVGImageElementBridge.java
index 8eea9aa..a58db16 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/SVGImageElementBridge.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/SVGImageElementBridge.java
@@ -42,7 +42,6 @@
import org.apache.batik.dom.events.DOMMouseEvent;
import org.apache.batik.dom.events.NodeEventTarget;
import org.apache.batik.dom.svg.LiveAttributeException;
-import org.apache.batik.dom.util.DOMUtilities;
import org.apache.batik.ext.awt.image.renderable.ClipRable8Bit;
import org.apache.batik.ext.awt.image.renderable.Filter;
import org.apache.batik.ext.awt.image.spi.BrokenLinkProvider;
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/SVGKernElementBridge.java b/batik-bridge/src/main/java/org/apache/batik/bridge/SVGKernElementBridge.java
index 640c713..fc67598 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/SVGKernElementBridge.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/SVGKernElementBridge.java
@@ -89,8 +89,7 @@
System.arraycopy( firstGlyphSet, 0, tmp, 0, firstGlyphLen );
firstGlyphSet = tmp;
}
- for (int i = 0; i < glyphCodes.length; i++)
- firstGlyphSet[firstGlyphLen++] = glyphCodes[i];
+ for (int glyphCode : glyphCodes) firstGlyphSet[firstGlyphLen++] = glyphCode;
}
}
}
@@ -116,8 +115,7 @@
System.arraycopy( secondGlyphSet, 0, tmp, 0, secondGlyphLen );
secondGlyphSet = tmp;
}
- for (int i = 0; i < glyphCodes.length; i++)
- secondGlyphSet[secondGlyphLen++] = glyphCodes[i];
+ for (int glyphCode : glyphCodes) secondGlyphSet[secondGlyphLen++] = glyphCode;
}
}
}
@@ -140,8 +138,7 @@
System.arraycopy( firstGlyphSet, 0, tmp, 0, firstGlyphLen );
firstGlyphSet = tmp;
}
- for (int i = 0; i < glyphCodes.length; i++)
- firstGlyphSet[firstGlyphLen++] = glyphCodes[i];
+ for (int glyphCode : glyphCodes) firstGlyphSet[firstGlyphLen++] = glyphCode;
}
}
@@ -163,8 +160,7 @@
System.arraycopy( secondGlyphSet, 0, tmp, 0, secondGlyphLen );
secondGlyphSet = tmp;
}
- for (int i = 0; i < glyphCodes.length; i++)
- secondGlyphSet[secondGlyphLen++] = glyphCodes[i];
+ for (int glyphCode : glyphCodes) secondGlyphSet[secondGlyphLen++] = glyphCode;
}
}
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/SVGPatternElementBridge.java b/batik-bridge/src/main/java/org/apache/batik/bridge/SVGPatternElementBridge.java
index 13cb4c4..f742c72 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/SVGPatternElementBridge.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/SVGPatternElementBridge.java
@@ -23,7 +23,6 @@
import java.awt.Shape;
import java.awt.geom.AffineTransform;
import java.awt.geom.Rectangle2D;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -309,9 +308,8 @@
* @param urls the list of ParsedURLs
* @param key the url to search for */
private static boolean contains(List urls, ParsedURL key) {
- Iterator iter = urls.iterator();
- while (iter.hasNext()) {
- if (key.equals(iter.next()))
+ for (Object url : urls) {
+ if (key.equals(url))
return true;
}
return false;
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/SVGTextElementBridge.java b/batik-bridge/src/main/java/org/apache/batik/bridge/SVGTextElementBridge.java
index 8ee402c..8f5ef6b 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/SVGTextElementBridge.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/SVGTextElementBridge.java
@@ -707,30 +707,30 @@
hasNewACI = false;
int [] properties = evt.getProperties();
// first try to find CSS properties that change the layout
- for (int i=0; i < properties.length; ++i) {
- switch(properties[i]) { // fall-through is intended
- case SVGCSSEngine.BASELINE_SHIFT_INDEX:
- case SVGCSSEngine.DIRECTION_INDEX:
- case SVGCSSEngine.DISPLAY_INDEX:
- case SVGCSSEngine.FONT_FAMILY_INDEX:
- case SVGCSSEngine.FONT_SIZE_INDEX:
- case SVGCSSEngine.FONT_STRETCH_INDEX:
- case SVGCSSEngine.FONT_STYLE_INDEX:
- case SVGCSSEngine.FONT_WEIGHT_INDEX:
- case SVGCSSEngine.GLYPH_ORIENTATION_HORIZONTAL_INDEX:
- case SVGCSSEngine.GLYPH_ORIENTATION_VERTICAL_INDEX:
- case SVGCSSEngine.KERNING_INDEX:
- case SVGCSSEngine.LETTER_SPACING_INDEX:
- case SVGCSSEngine.TEXT_ANCHOR_INDEX:
- case SVGCSSEngine.UNICODE_BIDI_INDEX:
- case SVGCSSEngine.WORD_SPACING_INDEX:
- case SVGCSSEngine.WRITING_MODE_INDEX: {
- if (!hasNewACI) {
- hasNewACI = true;
- computeLaidoutText(ctx, e, getTextNode());
+ for (int property : properties) {
+ switch (property) { // fall-through is intended
+ case SVGCSSEngine.BASELINE_SHIFT_INDEX:
+ case SVGCSSEngine.DIRECTION_INDEX:
+ case SVGCSSEngine.DISPLAY_INDEX:
+ case SVGCSSEngine.FONT_FAMILY_INDEX:
+ case SVGCSSEngine.FONT_SIZE_INDEX:
+ case SVGCSSEngine.FONT_STRETCH_INDEX:
+ case SVGCSSEngine.FONT_STYLE_INDEX:
+ case SVGCSSEngine.FONT_WEIGHT_INDEX:
+ case SVGCSSEngine.GLYPH_ORIENTATION_HORIZONTAL_INDEX:
+ case SVGCSSEngine.GLYPH_ORIENTATION_VERTICAL_INDEX:
+ case SVGCSSEngine.KERNING_INDEX:
+ case SVGCSSEngine.LETTER_SPACING_INDEX:
+ case SVGCSSEngine.TEXT_ANCHOR_INDEX:
+ case SVGCSSEngine.UNICODE_BIDI_INDEX:
+ case SVGCSSEngine.WORD_SPACING_INDEX:
+ case SVGCSSEngine.WRITING_MODE_INDEX: {
+ if (!hasNewACI) {
+ hasNewACI = true;
+ computeLaidoutText(ctx, e, getTextNode());
+ }
+ break;
}
- break;
- }
}
}
//optimize the calculation of
@@ -1024,11 +1024,10 @@
strippedSome = true;
}
if (strippedSome) {
- Iterator iter = elemTPI.values().iterator();
- while (iter.hasNext()) {
- TextPaintInfo tpi = (TextPaintInfo)iter.next();
+ for (Object o1 : elemTPI.values()) {
+ TextPaintInfo tpi = (TextPaintInfo) o1;
if (tpi.endChar >= asb.length()) {
- tpi.endChar = asb.length()-1;
+ tpi.endChar = asb.length() - 1;
if (tpi.startChar > tpi.endChar)
tpi.startChar = tpi.endChar;
}
@@ -1226,9 +1225,8 @@
}
StringBuffer sb = new StringBuffer( strings.size() * 5 );
- Iterator it = strings.iterator();
- while (it.hasNext()) {
- sb.append((String)it.next());
+ for (Object string : strings) {
+ sb.append((String) string);
}
AttributedString result = new AttributedString(sb.toString());
@@ -1264,9 +1262,8 @@
}
StringBuffer sb = new StringBuffer( strings.size() * 5 );
- Iterator it = strings.iterator();
- while (it.hasNext()) {
- sb.append((String)it.next());
+ for (Object string : strings) {
+ sb.append((String) string);
}
return sb.toString();
}
@@ -2901,11 +2898,11 @@
CharacterInformation info = new CharacterInformation();
info.characterIndex = startIndex+charnum;
- for (int i = 0; i < list.size(); i++) {
+ for (Object aList : list) {
StrokingTextPainter.TextRun run;
- run = (StrokingTextPainter.TextRun)list.get(i);
+ run = (StrokingTextPainter.TextRun) aList;
- if (!run.getLayout().hasCharacterIndex(info.characterIndex) )
+ if (!run.getLayout().hasCharacterIndex(info.characterIndex))
continue;
info.layout = run.getLayout();
@@ -2913,20 +2910,19 @@
aci.setIndex(info.characterIndex);
//check is it is a altGlyph
- if (aci.getAttribute(ALT_GLYPH_HANDLER) != null){
+ if (aci.getAttribute(ALT_GLYPH_HANDLER) != null) {
info.glyphIndexStart = 0;
- info.glyphIndexEnd = info.layout.getGlyphCount()-1;
+ info.glyphIndexEnd = info.layout.getGlyphCount() - 1;
} else {
info.glyphIndexStart = info.layout.getGlyphIndex
- (info.characterIndex);
+ (info.characterIndex);
//special case when the glyph does not have a unicode
//associated to it, it will return -1
- if ( info.glyphIndexStart == -1 ){
+ if (info.glyphIndexStart == -1) {
info.glyphIndexStart = 0;
- info.glyphIndexEnd = info.layout.getGlyphCount()-1;
- }
- else{
+ info.glyphIndexEnd = info.layout.getGlyphCount() - 1;
+ } else {
info.glyphIndexEnd = info.glyphIndexStart;
}
}
@@ -2971,19 +2967,19 @@
if (list == null)
return elems;
- for (int i = 0 ; i < list.size(); i++) {
+ for (Object aList : list) {
StrokingTextPainter.TextRun run;
- run = (StrokingTextPainter.TextRun)list.get(i);
+ run = (StrokingTextPainter.TextRun) aList;
TextSpanLayout layout = run.getLayout();
AttributedCharacterIterator aci = run.getACI();
aci.first();
SoftReference sr;
- sr =(SoftReference)aci.getAttribute(TEXT_COMPOUND_ID);
- Element elem = (Element)sr.get();
+ sr = (SoftReference) aci.getAttribute(TEXT_COMPOUND_ID);
+ Element elem = (Element) sr.get();
if (elem == null) continue;
if (elems.contains(elem)) continue;
- if (!isTextSensitive(elem)) continue;
+ if (!isTextSensitive(elem)) continue;
Rectangle2D glBounds = layout.getBounds2D();
if (glBounds != null) {
@@ -2993,13 +2989,13 @@
continue;
}
}
-
+
GVTGlyphVector gv = layout.getGlyphVector();
for (int g = 0; g < gv.getNumGlyphs(); g++) {
Shape gBounds = gv.getGlyphLogicalBounds(g);
if (gBounds != null) {
gBounds = at.createTransformedShape
- (gBounds).getBounds2D();
+ (gBounds).getBounds2D();
if (gBounds.intersects(rect)) {
elems.add(elem);
@@ -3021,15 +3017,15 @@
return elems;
Set reject = new HashSet();
- for (int i = 0 ; i < list.size(); i++) {
+ for (Object aList : list) {
StrokingTextPainter.TextRun run;
- run = (StrokingTextPainter.TextRun)list.get(i);
+ run = (StrokingTextPainter.TextRun) aList;
TextSpanLayout layout = run.getLayout();
AttributedCharacterIterator aci = run.getACI();
aci.first();
SoftReference sr;
- sr =(SoftReference)aci.getAttribute(TEXT_COMPOUND_ID);
- Element elem = (Element)sr.get();
+ sr = (SoftReference) aci.getAttribute(TEXT_COMPOUND_ID);
+ Element elem = (Element) sr.get();
if (elem == null) continue;
if (reject.contains(elem)) continue;
@@ -3039,11 +3035,11 @@
}
Rectangle2D glBounds = layout.getBounds2D();
- if ( glBounds == null ){
+ if (glBounds == null) {
continue;
}
- glBounds = at.createTransformedShape( glBounds ).getBounds2D();
+ glBounds = at.createTransformedShape(glBounds).getBounds2D();
if (rect.contains(glBounds)) {
elems.add(elem);
@@ -3091,15 +3087,15 @@
tnRect = at.createTransformedShape(tnRect).getBounds2D();
if (!rect.intersects(tnRect)) return false;
- for (int i = 0 ; i < list.size(); i++) {
+ for (Object aList : list) {
StrokingTextPainter.TextRun run;
- run = (StrokingTextPainter.TextRun)list.get(i);
+ run = (StrokingTextPainter.TextRun) aList;
TextSpanLayout layout = run.getLayout();
AttributedCharacterIterator aci = run.getACI();
aci.first();
SoftReference sr;
- sr =(SoftReference)aci.getAttribute(TEXT_COMPOUND_ID);
- Element runElem = (Element)sr.get();
+ sr = (SoftReference) aci.getAttribute(TEXT_COMPOUND_ID);
+ Element runElem = (Element) sr.get();
if (runElem == null) continue;
// Only consider runElem if it is sensitive.
@@ -3122,9 +3118,9 @@
Shape gBounds = gv.getGlyphLogicalBounds(g);
if (gBounds != null) {
gBounds = at.createTransformedShape
- (gBounds).getBounds2D();
+ (gBounds).getBounds2D();
- if (gBounds.intersects(rect)){
+ if (gBounds.intersects(rect)) {
return true;
}
}
@@ -3158,15 +3154,15 @@
Element txtElem = txtBridge.e;
Rectangle2D ret = null;
- for (int i = 0 ; i < list.size(); i++) {
+ for (Object aList : list) {
StrokingTextPainter.TextRun run;
- run = (StrokingTextPainter.TextRun)list.get(i);
+ run = (StrokingTextPainter.TextRun) aList;
TextSpanLayout layout = run.getLayout();
AttributedCharacterIterator aci = run.getACI();
aci.first();
SoftReference sr;
- sr =(SoftReference)aci.getAttribute(TEXT_COMPOUND_ID);
- Element runElem = (Element)sr.get();
+ sr = (SoftReference) aci.getAttribute(TEXT_COMPOUND_ID);
+ Element runElem = (Element) sr.get();
if (runElem == null) continue;
// Only consider runElem if it is sensitive.
@@ -3181,8 +3177,8 @@
// runElem is a child of elem so include it's bounds.
Rectangle2D glBounds = layout.getBounds2D();
if (glBounds != null) {
- if (ret == null) ret = (Rectangle2D)glBounds.clone();
- else ret.add(glBounds);
+ if (ret == null) ret = (Rectangle2D) glBounds.clone();
+ else ret.add(glBounds);
}
}
return ret;
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/SVGUtilities.java b/batik-bridge/src/main/java/org/apache/batik/bridge/SVGUtilities.java
index 10c310a..44e2ee8 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/SVGUtilities.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/SVGUtilities.java
@@ -22,7 +22,6 @@
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import java.io.IOException;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.StringTokenizer;
@@ -263,12 +262,11 @@
String baseURI = ((AbstractNode) e).getBaseURI();
ParsedURL purl = new ParsedURL(baseURI, uriStr);
- Iterator iter = refs.iterator();
- while (iter.hasNext()) {
- if (purl.equals(iter.next()))
+ for (Object ref : refs) {
+ if (purl.equals(ref))
throw new BridgeException
- (ctx, e, ERR_XLINK_HREF_CIRCULAR_DEPENDENCIES,
- new Object[] {uriStr});
+ (ctx, e, ERR_XLINK_HREF_CIRCULAR_DEPENDENCIES,
+ new Object[]{uriStr});
}
try {
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/ScriptingEnvironment.java b/batik-bridge/src/main/java/org/apache/batik/bridge/ScriptingEnvironment.java
index 34b00f4..06a5eff 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/ScriptingEnvironment.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/ScriptingEnvironment.java
@@ -33,7 +33,6 @@
import java.net.URLConnection;
import java.util.HashMap;
import java.util.LinkedList;
-import java.util.List;
import java.util.Map;
import java.util.Timer;
import java.util.TimerTask;
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/StrokingTextPainter.java b/batik-bridge/src/main/java/org/apache/batik/bridge/StrokingTextPainter.java
index 29206b5..291759d 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/StrokingTextPainter.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/StrokingTextPainter.java
@@ -38,7 +38,6 @@
import java.util.List;
import java.util.Set;
-import org.apache.batik.bridge.BasicTextPainter.BasicMark;
import org.apache.batik.gvt.font.GVTFont;
import org.apache.batik.gvt.font.GVTFontFamily;
import org.apache.batik.gvt.font.GVTGlyphMetrics;
@@ -461,24 +460,24 @@
int numSet=0;
int firstUnset=start;
boolean firstUnsetSet;
- for (int i = 0; i < fonts.size(); i++) {
+ for (Object font1 : fonts) {
// assign this font to all characters it can display if it has
// not already been assigned
int currentIndex = firstUnset;
firstUnsetSet = false;
aci.setIndex(currentIndex);
- GVTFont font = (GVTFont)fonts.get(i);
+ GVTFont font = (GVTFont) font1;
if (defaultFont == null)
defaultFont = font;
while (currentIndex < end) {
int displayUpToIndex = font.canDisplayUpTo
- (aci, currentIndex, end);
+ (aci, currentIndex, end);
Object altGlyphElement;
altGlyphElement = aci.getAttribute(ALT_GLYPH_HANDLER);
- if ( altGlyphElement != null ){
+ if (altGlyphElement != null) {
//found all the glyph to be displayed
//consider the font matching done
displayUpToIndex = -1;
@@ -505,8 +504,8 @@
if (fontAssigned[j - start]) {
if (runStart != -1) {
as.addAttribute(GVT_FONT, font,
- runStart-begin, j-begin);
- runStart=-1;
+ runStart - begin, j - begin);
+ runStart = -1;
}
} else {
if (runStart == -1)
@@ -517,13 +516,13 @@
}
if (runStart != -1) {
as.addAttribute(GVT_FONT, font,
- runStart-begin,
- displayUpToIndex-begin);
+ runStart - begin,
+ displayUpToIndex - begin);
}
// set currentIndex to be one after the char
// that couldn't display
- currentIndex = displayUpToIndex+1;
+ currentIndex = displayUpToIndex + 1;
}
}
@@ -864,55 +863,55 @@
Rectangle2D decorationRect = null;
double yLoc = 0, height = 0;
- for (int i = 0; i < textRuns.size(); i++) {
- TextRun textRun = (TextRun)textRuns.get(i);
+ for (Object textRun1 : textRuns) {
+ TextRun textRun = (TextRun) textRun1;
AttributedCharacterIterator runaci = textRun.getACI();
runaci.first();
- Paint paint = null;
- Stroke stroke = null;
- Paint strokePaint = null;
- boolean visible = true;
- TextPaintInfo tpi = (TextPaintInfo)runaci.getAttribute(PAINT_INFO);
+ Paint paint = null;
+ Stroke stroke = null;
+ Paint strokePaint = null;
+ boolean visible = true;
+ TextPaintInfo tpi = (TextPaintInfo) runaci.getAttribute(PAINT_INFO);
if (tpi != null) {
visible = tpi.visible;
if (tpi.composite != null) {
g2d.setComposite(tpi.composite);
}
switch (decorationType) {
- case TextSpanLayout.DECORATION_UNDERLINE :
- paint = tpi.underlinePaint;
- stroke = tpi.underlineStroke;
- strokePaint = tpi.underlineStrokePaint;
- break;
- case TextSpanLayout.DECORATION_OVERLINE :
- paint = tpi.overlinePaint;
- stroke = tpi.overlineStroke;
- strokePaint = tpi.overlineStrokePaint;
- break;
- case TextSpanLayout.DECORATION_STRIKETHROUGH :
- paint = tpi.strikethroughPaint;
- stroke = tpi.strikethroughStroke;
- strokePaint = tpi.strikethroughStrokePaint;
- break;
- default: // should never get here
- return;
+ case TextSpanLayout.DECORATION_UNDERLINE:
+ paint = tpi.underlinePaint;
+ stroke = tpi.underlineStroke;
+ strokePaint = tpi.underlineStrokePaint;
+ break;
+ case TextSpanLayout.DECORATION_OVERLINE:
+ paint = tpi.overlinePaint;
+ stroke = tpi.overlineStroke;
+ strokePaint = tpi.overlineStrokePaint;
+ break;
+ case TextSpanLayout.DECORATION_STRIKETHROUGH:
+ paint = tpi.strikethroughPaint;
+ stroke = tpi.strikethroughStroke;
+ strokePaint = tpi.strikethroughStrokePaint;
+ break;
+ default: // should never get here
+ return;
}
}
if (textRun.isFirstRunInChunk()) {
Shape s = textRun.getLayout().getDecorationOutline
- (decorationType);
+ (decorationType);
Rectangle2D r2d = s.getBounds2D();
- yLoc = r2d.getY();
+ yLoc = r2d.getY();
height = r2d.getHeight();
}
if (textRun.isFirstRunInChunk() ||
- (paint != prevPaint) ||
- (stroke != prevStroke) ||
- (strokePaint != prevStrokePaint) ||
- (visible != prevVisible)) {
+ (paint != prevPaint) ||
+ (stroke != prevStroke) ||
+ (strokePaint != prevStrokePaint) ||
+ (visible != prevVisible)) {
// if there is a current visible decoration, draw it now
if (prevVisible && (decorationRect != null)) {
if (prevPaint != null) {
@@ -931,8 +930,8 @@
}
if ((paint != null || strokePaint != null)
- && !textRun.getLayout().isVertical()
- && !textRun.getLayout().isOnATextPath()) {
+ && !textRun.getLayout().isVertical()
+ && !textRun.getLayout().isOnATextPath()) {
// this text run should be decorated with the
// specified decoration type
@@ -940,20 +939,20 @@
// horizontal layouts
Shape decorationShape =
- textRun.getLayout().getDecorationOutline(decorationType);
+ textRun.getLayout().getDecorationOutline(decorationType);
if (decorationRect == null) {
// create a new one
Rectangle2D r2d = decorationShape.getBounds2D();
decorationRect = new Rectangle2D.Double
- (r2d.getX(), yLoc, r2d.getWidth(), height);
+ (r2d.getX(), yLoc, r2d.getWidth(), height);
} else {
// extend the current one
Rectangle2D bounds = decorationShape.getBounds2D();
double minX = Math.min(decorationRect.getX(),
- bounds.getX());
+ bounds.getX());
double maxX = Math.max(decorationRect.getMaxX(),
- bounds.getMaxX());
- decorationRect.setRect(minX, yLoc, maxX-minX, height);
+ bounds.getMaxX());
+ decorationRect.setRect(minX, yLoc, maxX - minX, height);
}
}
prevPaint = paint;
@@ -985,12 +984,12 @@
*/
protected void paintTextRuns(List textRuns,
Graphics2D g2d) {
- for (int i = 0; i < textRuns.size(); i++) {
- TextRun textRun = (TextRun)textRuns.get(i);
+ for (Object textRun1 : textRuns) {
+ TextRun textRun = (TextRun) textRun1;
AttributedCharacterIterator runaci = textRun.getACI();
runaci.first();
- TextPaintInfo tpi = (TextPaintInfo)runaci.getAttribute(PAINT_INFO);
+ TextPaintInfo tpi = (TextPaintInfo) runaci.getAttribute(PAINT_INFO);
if ((tpi != null) && (tpi.composite != null)) {
g2d.setComposite(tpi.composite);
}
@@ -1016,14 +1015,14 @@
// for each text run, get its outline and append it to the overall
// outline
- for (int i = 0; i < textRuns.size(); ++i) {
- TextRun textRun = (TextRun)textRuns.get(i);
+ for (Object textRun1 : textRuns) {
+ TextRun textRun = (TextRun) textRun1;
TextSpanLayout textRunLayout = textRun.getLayout();
GeneralPath textRunOutline =
- new GeneralPath(textRunLayout.getOutline());
+ new GeneralPath(textRunLayout.getOutline());
if (outline == null) {
- outline = textRunOutline;
+ outline = textRunOutline;
} else {
outline.setWindingRule(GeneralPath.WIND_NON_ZERO);
outline.append(textRunOutline, false);
@@ -1085,17 +1084,17 @@
Rectangle2D bounds = null;
// for each text run, get its stroke outline and append it to
// the overall outline
- for (int i = 0; i < textRuns.size(); ++i) {
- TextRun textRun = (TextRun)textRuns.get(i);
- TextSpanLayout textRunLayout = textRun.getLayout();
- Rectangle2D runBounds = textRunLayout.getBounds2D();
- if (runBounds != null) {
- if (bounds == null)
- bounds = runBounds;
- else
- bounds.add( runBounds );
- }
- }
+ for (Object textRun1 : textRuns) {
+ TextRun textRun = (TextRun) textRun1;
+ TextSpanLayout textRunLayout = textRun.getLayout();
+ Rectangle2D runBounds = textRunLayout.getBounds2D();
+ if (runBounds != null) {
+ if (bounds == null)
+ bounds = runBounds;
+ else
+ bounds.add(runBounds);
+ }
+ }
// append any stroked decoration outlines
@@ -1149,50 +1148,50 @@
Rectangle2D decorationRect = null;
double yLoc = 0, height = 0;
- for (int i = 0; i < textRuns.size(); i++) {
- TextRun textRun = (TextRun)textRuns.get(i);
+ for (Object textRun1 : textRuns) {
+ TextRun textRun = (TextRun) textRun1;
AttributedCharacterIterator runaci = textRun.getACI();
runaci.first();
Paint paint = null;
Stroke stroke = null;
Paint strokePaint = null;
- TextPaintInfo tpi = (TextPaintInfo)runaci.getAttribute(PAINT_INFO);
+ TextPaintInfo tpi = (TextPaintInfo) runaci.getAttribute(PAINT_INFO);
if (tpi != null) {
switch (decorationType) {
- case TextSpanLayout.DECORATION_UNDERLINE :
- paint = tpi.underlinePaint;
- stroke = tpi.underlineStroke;
- strokePaint = tpi.underlineStrokePaint;
- break;
- case TextSpanLayout.DECORATION_OVERLINE :
- paint = tpi.overlinePaint;
- stroke = tpi.overlineStroke;
- strokePaint = tpi.overlineStrokePaint;
- break;
- case TextSpanLayout.DECORATION_STRIKETHROUGH :
- paint = tpi.strikethroughPaint;
- stroke = tpi.strikethroughStroke;
- strokePaint = tpi.strikethroughStrokePaint;
- break;
- default:
- // should never get here
- return null;
+ case TextSpanLayout.DECORATION_UNDERLINE:
+ paint = tpi.underlinePaint;
+ stroke = tpi.underlineStroke;
+ strokePaint = tpi.underlineStrokePaint;
+ break;
+ case TextSpanLayout.DECORATION_OVERLINE:
+ paint = tpi.overlinePaint;
+ stroke = tpi.overlineStroke;
+ strokePaint = tpi.overlineStrokePaint;
+ break;
+ case TextSpanLayout.DECORATION_STRIKETHROUGH:
+ paint = tpi.strikethroughPaint;
+ stroke = tpi.strikethroughStroke;
+ strokePaint = tpi.strikethroughStrokePaint;
+ break;
+ default:
+ // should never get here
+ return null;
}
}
if (textRun.isFirstRunInChunk()) {
Shape s = textRun.getLayout().getDecorationOutline
- (decorationType);
+ (decorationType);
Rectangle2D r2d = s.getBounds2D();
- yLoc = r2d.getY();
+ yLoc = r2d.getY();
height = r2d.getHeight();
}
if (textRun.isFirstRunInChunk() ||
- paint != prevPaint ||
- stroke != prevStroke ||
- strokePaint != prevStrokePaint) {
+ paint != prevPaint ||
+ stroke != prevStroke ||
+ strokePaint != prevStrokePaint) {
// if there is a current decoration, added it to the overall
// outline
@@ -1207,28 +1206,28 @@
}
if ((paint != null || strokePaint != null)
- && !textRun.getLayout().isVertical()
- && !textRun.getLayout().isOnATextPath()) {
+ && !textRun.getLayout().isVertical()
+ && !textRun.getLayout().isOnATextPath()) {
// this text run should be decorated with the specified
// decoration type note: decorations are only supported for
// plain horizontal layouts
Shape decorationShape =
- textRun.getLayout().getDecorationOutline(decorationType);
+ textRun.getLayout().getDecorationOutline(decorationType);
if (decorationRect == null) {
// create a new one
Rectangle2D r2d = decorationShape.getBounds2D();
decorationRect = new Rectangle2D.Double
- (r2d.getX(), yLoc, r2d.getWidth(), height);
+ (r2d.getX(), yLoc, r2d.getWidth(), height);
} else {
// extend the current one
Rectangle2D bounds = decorationShape.getBounds2D();
double minX = Math.min(decorationRect.getX(),
- bounds.getX());
+ bounds.getX());
double maxX = Math.max(decorationRect.getMaxX(),
- bounds.getMaxX());
- decorationRect.setRect(minX, yLoc, maxX-minX, height);
+ bounds.getMaxX());
+ decorationRect.setRect(minX, yLoc, maxX - minX, height);
}
}
@@ -1270,50 +1269,50 @@
Rectangle2D decorationRect = null;
double yLoc = 0, height = 0;
- for (int i = 0; i < textRuns.size(); i++) {
+ for (Object textRun1 : textRuns) {
- TextRun textRun = (TextRun)textRuns.get(i);
+ TextRun textRun = (TextRun) textRun1;
AttributedCharacterIterator runaci = textRun.getACI();
runaci.first();
Paint paint = null;
Stroke stroke = null;
Paint strokePaint = null;
- TextPaintInfo tpi = (TextPaintInfo)runaci.getAttribute(PAINT_INFO);
+ TextPaintInfo tpi = (TextPaintInfo) runaci.getAttribute(PAINT_INFO);
if (tpi != null) {
switch (decorationType) {
- case TextSpanLayout.DECORATION_UNDERLINE :
- paint = tpi.underlinePaint;
- stroke = tpi.underlineStroke;
- strokePaint = tpi.underlineStrokePaint;
- break;
- case TextSpanLayout.DECORATION_OVERLINE :
- paint = tpi.overlinePaint;
- stroke = tpi.overlineStroke;
- strokePaint = tpi.overlineStrokePaint;
- break;
- case TextSpanLayout.DECORATION_STRIKETHROUGH :
- paint = tpi.strikethroughPaint;
- stroke = tpi.strikethroughStroke;
- strokePaint = tpi.strikethroughStrokePaint;
- break;
- default: // should never get here
- return null;
+ case TextSpanLayout.DECORATION_UNDERLINE:
+ paint = tpi.underlinePaint;
+ stroke = tpi.underlineStroke;
+ strokePaint = tpi.underlineStrokePaint;
+ break;
+ case TextSpanLayout.DECORATION_OVERLINE:
+ paint = tpi.overlinePaint;
+ stroke = tpi.overlineStroke;
+ strokePaint = tpi.overlineStrokePaint;
+ break;
+ case TextSpanLayout.DECORATION_STRIKETHROUGH:
+ paint = tpi.strikethroughPaint;
+ stroke = tpi.strikethroughStroke;
+ strokePaint = tpi.strikethroughStrokePaint;
+ break;
+ default: // should never get here
+ return null;
}
}
if (textRun.isFirstRunInChunk()) {
Shape s = textRun.getLayout().getDecorationOutline
- (decorationType);
+ (decorationType);
Rectangle2D r2d = s.getBounds2D();
- yLoc = r2d.getY();
+ yLoc = r2d.getY();
height = r2d.getHeight();
}
if (textRun.isFirstRunInChunk() ||
- paint != prevPaint ||
- stroke != prevStroke ||
- strokePaint != prevStrokePaint) {
+ paint != prevPaint ||
+ stroke != prevStroke ||
+ strokePaint != prevStrokePaint) {
// if there is a current decoration, added it to the overall
// outline
@@ -1321,7 +1320,7 @@
Shape s = null;
if (prevStroke != null &&
- prevStrokePaint != null)
+ prevStrokePaint != null)
s = prevStroke.createStrokedShape(decorationRect);
else if (prevPaint != null)
s = decorationRect;
@@ -1336,29 +1335,29 @@
}
if ((paint != null || strokePaint != null)
- && !textRun.getLayout().isVertical()
- && !textRun.getLayout().isOnATextPath()) {
+ && !textRun.getLayout().isVertical()
+ && !textRun.getLayout().isOnATextPath()) {
// this text run should be decorated with the specified
// decoration type note: decorations are only supported for
// plain horizontal layouts
Shape decorationShape =
- textRun.getLayout().getDecorationOutline(decorationType);
+ textRun.getLayout().getDecorationOutline(decorationType);
if (decorationRect == null) {
// create a new one
Rectangle2D r2d = decorationShape.getBounds2D();
decorationRect = new Rectangle2D.Double
- (r2d.getX(), yLoc, r2d.getWidth(), height);
+ (r2d.getX(), yLoc, r2d.getWidth(), height);
} else {
// extend the current one
Rectangle2D bounds = decorationShape.getBounds2D();
double minX = Math.min(decorationRect.getX(),
- bounds.getX());
+ bounds.getX());
double maxX = Math.max(decorationRect.getMaxX(),
- bounds.getMaxX());
- decorationRect.setRect(minX, yLoc, maxX-minX, height);
+ bounds.getMaxX());
+ decorationRect.setRect(minX, yLoc, maxX - minX, height);
}
}
@@ -1412,14 +1411,14 @@
List textRuns = getTextRuns(node, aci);
if (textRuns != null) {
// for each text run, see if its been hit
- for (int i = 0; i < textRuns.size(); ++i) {
- TextRun textRun = (TextRun)textRuns.get(i);
+ for (Object textRun1 : textRuns) {
+ TextRun textRun = (TextRun) textRun1;
TextSpanLayout layout = textRun.getLayout();
TextHit textHit = layout.hitTestChar((float) x, (float) y);
Rectangle2D bounds = layout.getBounds2D();
- if ((textHit != null) &&
- (bounds != null) && bounds.contains(x,y))
- return new BasicTextPainter.BasicMark(node, textHit);
+ if ((textHit != null) &&
+ (bounds != null) && bounds.contains(x, y))
+ return new BasicMark(node, textHit);
}
}
@@ -1589,17 +1588,17 @@
// for each text run, append any highlight it may contain for
// the current selection
- for (int i = 0; i < textRuns.size(); ++i) {
- TextRun textRun = (TextRun)textRuns.get(i);
+ for (Object textRun1 : textRuns) {
+ TextRun textRun = (TextRun) textRun1;
TextSpanLayout layout = textRun.getLayout();
Shape layoutHighlightedShape = layout.getHighlightShape
- (beginIndex, endIndex);
+ (beginIndex, endIndex);
// append the highlighted shape of this layout to the
// overall hightlighted shape
- if (( layoutHighlightedShape != null) &&
- (!layoutHighlightedShape.getBounds().isEmpty())) {
+ if ((layoutHighlightedShape != null) &&
+ (!layoutHighlightedShape.getBounds().isEmpty())) {
highlightedShape.append(layoutHighlightedShape, false);
}
}
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/TextNode.java b/batik-bridge/src/main/java/org/apache/batik/bridge/TextNode.java
index e701061..17ca0e1 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/TextNode.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/TextNode.java
@@ -421,12 +421,12 @@
}
List list = getTextRuns();
// place coords in text node coordinate system
- for (int i = 0 ; i < list.size(); i++) {
+ for (Object aList : list) {
StrokingTextPainter.TextRun run =
- (StrokingTextPainter.TextRun)list.get(i);
+ (StrokingTextPainter.TextRun) aList;
TextSpanLayout layout = run.getLayout();
- float x = (float)p.getX();
- float y = (float)p.getY();
+ float x = (float) p.getX();
+ float y = (float) p.getY();
TextHit textHit = layout.hitTestChar(x, y);
if (textHit != null && contains(p, layout.getBounds2D())) {
return true;
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/UpdateManager.java b/batik-bridge/src/main/java/org/apache/batik/bridge/UpdateManager.java
index c5e6d77..e5be001 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/UpdateManager.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/UpdateManager.java
@@ -729,9 +729,8 @@
long findNewAllResumeTime() {
long ret = -1;
- Iterator i = suspensionList.iterator();
- while (i.hasNext()) {
- SuspensionInfo si = (SuspensionInfo)i.next();
+ for (Object aSuspensionList : suspensionList) {
+ SuspensionInfo si = (SuspensionInfo) aSuspensionList;
long t = si.getResumeMilli();
if (t > ret) ret = t;
}
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/svg12/DefaultXBLManager.java b/batik-bridge/src/main/java/org/apache/batik/bridge/svg12/DefaultXBLManager.java
index a403312..10ca774 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/svg12/DefaultXBLManager.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/svg12/DefaultXBLManager.java
@@ -200,19 +200,19 @@
docSubtreeListener, true);
// Add definitions.
- for (int i = 0; i < defs.length; i++) {
- if (defs[i].getAttributeNS(null, XBL_REF_ATTRIBUTE).length() != 0) {
- addDefinitionRef(defs[i]);
+ for (XBLOMDefinitionElement def : defs) {
+ if (def.getAttributeNS(null, XBL_REF_ATTRIBUTE).length() != 0) {
+ addDefinitionRef(def);
} else {
- String ns = defs[i].getElementNamespaceURI();
- String ln = defs[i].getElementLocalName();
- addDefinition(ns, ln, defs[i], null);
+ String ns = def.getElementNamespaceURI();
+ String ln = def.getElementLocalName();
+ addDefinition(ns, ln, def, null);
}
}
// Add imports.
- for (int i = 0; i < imports.length; i++) {
- addImport(imports[i]);
+ for (Element anImport : imports) {
+ addImport(anImport);
}
// Bind all of the bindable elements in the document that have a
@@ -250,8 +250,7 @@
int nSlots = imports.values().size();
ImportRecord[] irs = new ImportRecord[ nSlots ];
imports.values().toArray( irs );
- for (int i = 0; i < irs.length; i++) {
- ImportRecord ir = irs[i];
+ for (ImportRecord ir : irs) {
if (ir.importElement.getLocalName().equals(XBL_DEFINITION_TAG)) {
removeDefinitionRef(ir.importElement);
} else {
@@ -262,10 +261,10 @@
// Remove all bindings.
Object[] defRecs = definitions.getValuesArray();
definitions.clear();
- for (int i = 0; i < defRecs.length; i++) {
- DefinitionRecord defRec = (DefinitionRecord) defRecs[i];
+ for (Object defRec1 : defRecs) {
+ DefinitionRecord defRec = (DefinitionRecord) defRec1;
TreeSet defs = (TreeSet) definitionLists.get(defRec.namespaceURI,
- defRec.localName);
+ defRec.localName);
if (defs != null) {
while (!defs.isEmpty()) {
defRec = (DefinitionRecord) defs.first();
@@ -403,8 +402,8 @@
importAttrListener, false);
Object[] defRecs = definitions.getValuesArray();
- for (int i = 0; i < defRecs.length; i++) {
- DefinitionRecord defRec = (DefinitionRecord) defRecs[i];
+ for (Object defRec1 : defRecs) {
+ DefinitionRecord defRec = (DefinitionRecord) defRec1;
if (defRec.importElement == imp) {
removeDefinition(defRec);
}
@@ -1422,10 +1421,10 @@
public void handleEvent(Event evt) {
Object[] defs = importRemovedListener.toBeRemoved.toArray();
importRemovedListener.toBeRemoved.clear();
- for (int i = 0; i < defs.length; i++) {
- XBLOMDefinitionElement def = (XBLOMDefinitionElement) defs[i];
+ for (Object def1 : defs) {
+ XBLOMDefinitionElement def = (XBLOMDefinitionElement) def1;
DefinitionRecord defRec
- = (DefinitionRecord) definitions.get(def, importElement);
+ = (DefinitionRecord) definitions.get(def, importElement);
removeDefinition(defRec);
}
}
@@ -1542,11 +1541,11 @@
public void handleEvent(Event evt) {
Object[] defs = docRemovedListener.defsToBeRemoved.toArray();
docRemovedListener.defsToBeRemoved.clear();
- for (int i = 0; i < defs.length; i++) {
- XBLOMDefinitionElement def = (XBLOMDefinitionElement) defs[i];
+ for (Object def1 : defs) {
+ XBLOMDefinitionElement def = (XBLOMDefinitionElement) def1;
if (def.getAttributeNS(null, XBL_REF_ATTRIBUTE).length() == 0) {
DefinitionRecord defRec
- = (DefinitionRecord) definitions.get(def, null);
+ = (DefinitionRecord) definitions.get(def, null);
removeDefinition(defRec);
} else {
removeDefinitionRef(def);
@@ -1555,14 +1554,14 @@
Object[] imps = docRemovedListener.importsToBeRemoved.toArray();
docRemovedListener.importsToBeRemoved.clear();
- for (int i = 0; i < imps.length; i++) {
- removeImport((Element) imps[i]);
+ for (Object imp : imps) {
+ removeImport((Element) imp);
}
Object[] nodes = docRemovedListener.nodesToBeInvalidated.toArray();
docRemovedListener.nodesToBeInvalidated.clear();
- for (int i = 0; i < nodes.length; i++) {
- invalidateChildNodes((Node) nodes[i]);
+ for (Object node : nodes) {
+ invalidateChildNodes((Node) node);
}
}
}
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/svg12/SVG12BridgeContext.java b/batik-bridge/src/main/java/org/apache/batik/bridge/svg12/SVG12BridgeContext.java
index 3bf735f..b61d992 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/svg12/SVG12BridgeContext.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/svg12/SVG12BridgeContext.java
@@ -18,8 +18,6 @@
*/
package org.apache.batik.bridge.svg12;
-import java.util.Iterator;
-
import org.apache.batik.anim.dom.SVGOMDocument;
import org.apache.batik.anim.dom.XBLEventSupport;
import org.apache.batik.anim.dom.XBLOMShadowTreeElement;
@@ -136,21 +134,20 @@
synchronized (eventListenerSet) {
// remove all listeners added by Bridges
- Iterator iter = eventListenerSet.iterator();
- while (iter.hasNext()) {
- EventListenerMememto m = (EventListenerMememto)iter.next();
+ for (Object anEventListenerSet : eventListenerSet) {
+ EventListenerMememto m = (EventListenerMememto) anEventListenerSet;
NodeEventTarget et = m.getTarget();
- EventListener el = m.getListener();
- boolean uc = m.getUseCapture();
- String t = m.getEventType();
- boolean in = m.getNamespaced();
+ EventListener el = m.getListener();
+ boolean uc = m.getUseCapture();
+ String t = m.getEventType();
+ boolean in = m.getNamespaced();
if (et == null || el == null || t == null) {
continue;
}
if (m instanceof ImplementationEventListenerMememto) {
String ns = m.getNamespaceURI();
- Node nde = (Node)et;
- AbstractNode n = (AbstractNode)nde.getOwnerDocument();
+ Node nde = (Node) et;
+ AbstractNode n = (AbstractNode) nde.getOwnerDocument();
if (n != null) {
XBLEventSupport es;
es = (XBLEventSupport) n.initializeEventSupport();
@@ -175,9 +172,8 @@
animationEngine = null;
}
- Iterator iter = interpreterMap.values().iterator();
- while (iter.hasNext()) {
- Interpreter interpreter = (Interpreter)iter.next();
+ for (Object o : interpreterMap.values()) {
+ Interpreter interpreter = (Interpreter) o;
if (interpreter != null)
interpreter.dispose();
}
@@ -315,15 +311,14 @@
XBLEventSupport es = (XBLEventSupport) n.initializeEventSupport();
synchronized (eventListenerSet) {
- Iterator i = eventListenerSet.iterator();
- while (i.hasNext()) {
- EventListenerMememto elm = (EventListenerMememto)i.next();
+ for (Object anEventListenerSet : eventListenerSet) {
+ EventListenerMememto elm = (EventListenerMememto) anEventListenerSet;
NodeEventTarget et = elm.getTarget();
if (et == evtTarget) {
EventListener el = elm.getListener();
- boolean uc = elm.getUseCapture();
- String t = elm.getEventType();
- boolean in = elm.getNamespaced();
+ boolean uc = elm.getUseCapture();
+ String t = elm.getEventType();
+ boolean in = elm.getNamespaced();
if (et == null || el == null || t == null) {
continue;
}
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/svg12/SVG12BridgeEventSupport.java b/batik-bridge/src/main/java/org/apache/batik/bridge/svg12/SVG12BridgeEventSupport.java
index 9b8911a..97e9551 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/svg12/SVG12BridgeEventSupport.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/svg12/SVG12BridgeEventSupport.java
@@ -20,7 +20,6 @@
import java.awt.Point;
import java.awt.event.KeyEvent;
-import java.awt.geom.Point2D;
import org.apache.batik.bridge.BridgeContext;
import org.apache.batik.bridge.BridgeEventSupport;
diff --git a/batik-bridge/src/main/java/org/apache/batik/bridge/svg12/SVGFlowRootElementBridge.java b/batik-bridge/src/main/java/org/apache/batik/bridge/svg12/SVGFlowRootElementBridge.java
index 2c140ea..9f78d52 100644
--- a/batik-bridge/src/main/java/org/apache/batik/bridge/svg12/SVGFlowRootElementBridge.java
+++ b/batik-bridge/src/main/java/org/apache/batik/bridge/svg12/SVGFlowRootElementBridge.java
@@ -29,7 +29,6 @@
import java.text.AttributedString;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.LinkedList;
import java.util.Map;
@@ -530,16 +529,15 @@
// Note: The Working Group (in conjunction with XHTML working
// group) has decided that multiple line elements collapse.
int prevLN = 0;
- Iterator lnIter = lnLocs.iterator();
- while (lnIter.hasNext()) {
- int nextLN = (Integer) lnIter.next();
+ for (Object lnLoc : lnLocs) {
+ int nextLN = (Integer) lnLoc;
if (nextLN == prevLN) continue;
// System.out.println("Attr: [" + prevLN + "," + nextLN + "]");
ret.addAttribute(FLOW_LINE_BREAK,
- new Object(),
- prevLN, nextLN);
- prevLN = nextLN;
+ new Object(),
+ prevLN, nextLN);
+ prevLN = nextLN;
}
int start=0;
@@ -808,11 +806,10 @@
strippedSome = true;
}
if (strippedSome) {
- Iterator iter = elemTPI.values().iterator();
- while (iter.hasNext()) {
- TextPaintInfo tpi = (TextPaintInfo)iter.next();
+ for (Object o1 : elemTPI.values()) {
+ TextPaintInfo tpi = (TextPaintInfo) o1;
if (tpi.endChar >= asb.length()) {
- tpi.endChar = asb.length()-1;
+ tpi.endChar = asb.length() - 1;
if (tpi.startChar > tpi.endChar)
tpi.startChar = tpi.endChar;
}
diff --git a/batik-codec/src/main/java/org/apache/batik/ext/awt/image/codec/png/PNGImageEncoder.java b/batik-codec/src/main/java/org/apache/batik/ext/awt/image/codec/png/PNGImageEncoder.java
index e40685a..b11de17 100644
--- a/batik-codec/src/main/java/org/apache/batik/ext/awt/image/codec/png/PNGImageEncoder.java
+++ b/batik-codec/src/main/java/org/apache/batik/ext/awt/image/codec/png/PNGImageEncoder.java
@@ -571,8 +571,8 @@
ChunkStream cs = new ChunkStream("sBIT");
int[] significantBits = param.getSignificantBits();
int len = significantBits.length;
- for (int i = 0; i < len; i++) {
- cs.writeByte(significantBits[i]);
+ for (int significantBit : significantBits) {
+ cs.writeByte(significantBit);
}
cs.writeToStream(dataOutput);
cs.close();
@@ -642,8 +642,8 @@
ChunkStream cs = new ChunkStream("hIST");
int[] hist = param.getPaletteHistogram();
- for (int i = 0; i < hist.length; i++) {
- cs.writeShort(hist[i]);
+ for (int aHist : hist) {
+ cs.writeShort(aHist);
}
cs.writeToStream(dataOutput);
@@ -660,8 +660,8 @@
if (param instanceof PNGEncodeParam.Palette) {
byte[] t =
((PNGEncodeParam.Palette)param).getPaletteTransparency();
- for (int i = 0; i < t.length; i++) {
- cs.writeByte(t[i]);
+ for (byte aT : t) {
+ cs.writeByte(aT);
}
} else if (param instanceof PNGEncodeParam.Gray) {
int t = ((PNGEncodeParam.Gray)param).getTransparentGray();
diff --git a/batik-codec/src/main/java/org/apache/batik/ext/awt/image/codec/util/SimpleRenderedImage.java b/batik-codec/src/main/java/org/apache/batik/ext/awt/image/codec/util/SimpleRenderedImage.java
index 57a46af..4b37f3c 100644
--- a/batik-codec/src/main/java/org/apache/batik/ext/awt/image/codec/util/SimpleRenderedImage.java
+++ b/batik-codec/src/main/java/org/apache/batik/ext/awt/image/codec/util/SimpleRenderedImage.java
@@ -276,9 +276,9 @@
prefix = prefix.toLowerCase();
List names = new ArrayList();
- for (int i = 0; i < propertyNames.length; i++) {
- if (propertyNames[i].startsWith(prefix)) {
- names.add(propertyNames[i]);
+ for (String propertyName : propertyNames) {
+ if (propertyName.startsWith(prefix)) {
+ names.add(propertyName);
}
}
diff --git a/batik-css/src/main/java/org/apache/batik/css/engine/CSSEngine.java b/batik-css/src/main/java/org/apache/batik/css/engine/CSSEngine.java
index a8a1cca..8483a40 100644
--- a/batik-css/src/main/java/org/apache/batik/css/engine/CSSEngine.java
+++ b/batik-css/src/main/java/org/apache/batik/css/engine/CSSEngine.java
@@ -679,8 +679,7 @@
if (pseudoElementNames != null) {
int len = pseudoElementNames.length;
- for (int i = 0; i < len; i++) {
- String pe = pseudoElementNames[i];
+ for (String pe : pseudoElementNames) {
sm = srceng.getCascadedStyleMap(csrc, pe);
cdest.setComputedStyleMap(pe, sm);
}
@@ -787,14 +786,14 @@
int slen = snodes.size();
if (slen > 0) {
ArrayList rules = new ArrayList();
- for (int i = 0; i < slen; i++) {
- CSSStyleSheetNode ssn = (CSSStyleSheetNode)snodes.get(i);
+ for (Object snode : snodes) {
+ CSSStyleSheetNode ssn = (CSSStyleSheetNode) snode;
StyleSheet ss = ssn.getCSSStyleSheet();
if (ss != null &&
- (!ss.isAlternate() ||
- ss.getTitle() == null ||
- ss.getTitle().equals(alternateStyleSheet)) &&
- mediaMatch(ss.getMedia())) {
+ (!ss.isAlternate() ||
+ ss.getTitle() == null ||
+ ss.getTitle().equals(alternateStyleSheet)) &&
+ mediaMatch(ss.getMedia())) {
addMatchingRules(rules, ss, elt, pseudo);
}
}
@@ -918,9 +917,9 @@
// Find all the style-sheets in the document.
findStyleSheetNodes(document);
int len = styleSheetNodes.size();
- for (int i = 0; i < len; i++) {
+ for (Object styleSheetNode : styleSheetNodes) {
CSSStyleSheetNode ssn;
- ssn = (CSSStyleSheetNode)styleSheetNodes.get(i);
+ ssn = (CSSStyleSheetNode) styleSheetNode;
StyleSheet ss = ssn.getCSSStyleSheet();
if (ss != null) {
findSelectorAttributes(selectorAttributes, ss);
@@ -1345,21 +1344,21 @@
int rlen = rules.size();
if (origin == StyleMap.AUTHOR_ORIGIN) {
- for (int r = 0; r < rlen; r++) {
- StyleRule sr = (StyleRule)rules.get(r);
+ for (Object rule : rules) {
+ StyleRule sr = (StyleRule) rule;
StyleDeclaration sd = sr.getStyleDeclaration();
int len = sd.size();
for (int i = 0; i < len; i++) {
putAuthorProperty(sm,
- sd.getIndex(i),
- sd.getValue(i),
- sd.getPriority(i),
- origin);
+ sd.getIndex(i),
+ sd.getValue(i),
+ sd.getPriority(i),
+ origin);
}
}
} else {
- for (int r = 0; r < rlen; r++) {
- StyleRule sr = (StyleRule)rules.get(r);
+ for (Object rule : rules) {
+ StyleRule sr = (StyleRule) rule;
StyleDeclaration sd = sr.getStyleDeclaration();
int len = sd.size();
for (int i = 0; i < len; i++) {
@@ -1827,8 +1826,8 @@
int len = ll.length;
if (len > 0) {
CSSEngineEvent evt = new CSSEngineEvent(this, target, props);
- for (int i = 0; i < len; i++) {
- ll[i].propertiesChanged(evt);
+ for (CSSEngineListener aLl : ll) {
+ aLl.propertiesChanged(evt);
}
}
}
@@ -1977,14 +1976,14 @@
System.arraycopy( updated, 0, diffs, 0, updated.length );
}
if (properties != null) {
- for (int i=0; i<properties.length; i++) {
- diffs[properties[i]] = true;
+ for (int property : properties) {
+ diffs[property] = true;
}
}
int count =0;
if (!recascade) {
- for (int i=0; i<diffs.length; i++) {
- if (diffs[i]) {
+ for (boolean diff : diffs) {
+ if (diff) {
count++;
}
}
@@ -2114,9 +2113,9 @@
} else {
inherited = new int[count];
count=0;
- for (int i=0; i<props.length; i++)
- if (props[i] != -1)
- inherited[count++] = props[i];
+ for (int prop : props)
+ if (prop != -1)
+ inherited[count++] = prop;
}
}
diff --git a/batik-dom/src/main/java/org/apache/batik/dom/AbstractDOMImplementation.java b/batik-dom/src/main/java/org/apache/batik/dom/AbstractDOMImplementation.java
index ba0bfc5..80839f4 100644
--- a/batik-dom/src/main/java/org/apache/batik/dom/AbstractDOMImplementation.java
+++ b/batik-dom/src/main/java/org/apache/batik/dom/AbstractDOMImplementation.java
@@ -111,8 +111,8 @@
return version.equals(v);
} else {
String[] va = (String[])v;
- for (int i = 0; i < va.length; i++) {
- if (version.equals(va[i])) {
+ for (String aVa : va) {
+ if (version.equals(aVa)) {
return true;
}
}
diff --git a/batik-dom/src/main/java/org/apache/batik/dom/AbstractDocument.java b/batik-dom/src/main/java/org/apache/batik/dom/AbstractDocument.java
index 4a2b9e4..fdfe50d 100644
--- a/batik-dom/src/main/java/org/apache/batik/dom/AbstractDocument.java
+++ b/batik-dom/src/main/java/org/apache/batik/dom/AbstractDocument.java
@@ -1386,9 +1386,8 @@
if (!namespaceDeclarations) {
// remove namespace declarations
- Iterator i = toRemove.iterator();
- while (i.hasNext()) {
- e.removeAttributeNode((Attr) i.next());
+ for (Object aToRemove : toRemove) {
+ e.removeAttributeNode((Attr) aToRemove);
}
} else {
if (namespaces) {
@@ -2115,8 +2114,8 @@
if (DOMConstants.DOM_ERROR_HANDLER_PARAM.equals(s)) {
return true;
}
- for (int i = 0; i < booleanParamNames.length; i++) {
- if (booleanParamNames[i].equals(s)) {
+ for (String booleanParamName : booleanParamNames) {
+ if (booleanParamName.equals(s)) {
return true;
}
}
diff --git a/batik-dom/src/main/java/org/apache/batik/dom/AbstractElement.java b/batik-dom/src/main/java/org/apache/batik/dom/AbstractElement.java
index 06ad59b..ee1daea 100644
--- a/batik-dom/src/main/java/org/apache/batik/dom/AbstractElement.java
+++ b/batik-dom/src/main/java/org/apache/batik/dom/AbstractElement.java
@@ -813,17 +813,17 @@
return null;
}
int j = 0;
- for ( int i = 0; i < table.length; i++ ) {
- Entry e = table[ i ];
- if ( e == null ) {
+ for (Entry aTable : table) {
+ Entry e = aTable;
+ if (e == null) {
continue;
}
do {
- if ( j++ == index ) {
+ if (j++ == index) {
return e.value;
}
e = e.next;
- } while ( e != null );
+ } while (e != null);
}
return null;
}
diff --git a/batik-dom/src/main/java/org/apache/batik/dom/AbstractNode.java b/batik-dom/src/main/java/org/apache/batik/dom/AbstractNode.java
index 9efb460..ab64413 100644
--- a/batik-dom/src/main/java/org/apache/batik/dom/AbstractNode.java
+++ b/batik-dom/src/main/java/org/apache/batik/dom/AbstractNode.java
@@ -21,7 +21,6 @@
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import org.apache.batik.dom.events.DOMMutationEvent;
@@ -907,17 +906,16 @@
Node newNode) {
AbstractNode an = (AbstractNode) oldNode;
if (an.userData != null) {
- Iterator i = an.userData.entrySet().iterator();
- while (i.hasNext()) {
- Map.Entry e = (Map.Entry) i.next();
+ for (Object o : an.userData.entrySet()) {
+ Map.Entry e = (Map.Entry) o;
UserDataHandler h
- = (UserDataHandler) an.userDataHandlers.get(e.getKey());
+ = (UserDataHandler) an.userDataHandlers.get(e.getKey());
if (h != null) {
h.handle(type,
- (String) e.getKey(),
- e.getValue(),
- oldNode,
- newNode);
+ (String) e.getKey(),
+ e.getValue(),
+ oldNode,
+ newNode);
}
}
}
diff --git a/batik-dom/src/main/java/org/apache/batik/dom/ExtensibleDOMImplementation.java b/batik-dom/src/main/java/org/apache/batik/dom/ExtensibleDOMImplementation.java
index 86c0391..39d8a41 100644
--- a/batik-dom/src/main/java/org/apache/batik/dom/ExtensibleDOMImplementation.java
+++ b/batik-dom/src/main/java/org/apache/batik/dom/ExtensibleDOMImplementation.java
@@ -76,10 +76,9 @@
* Creates a new DOMImplementation.
*/
public ExtensibleDOMImplementation() {
- Iterator iter = getDomExtensions().iterator();
- while(iter.hasNext()) {
- DomExtension de = (DomExtension)iter.next();
+ for (Object o : getDomExtensions()) {
+ DomExtension de = (DomExtension) o;
de.registerTags(this);
}
}
diff --git a/batik-dom/src/main/java/org/apache/batik/dom/events/DOMKeyboardEvent.java b/batik-dom/src/main/java/org/apache/batik/dom/events/DOMKeyboardEvent.java
index 886abee..82e3663 100644
--- a/batik-dom/src/main/java/org/apache/batik/dom/events/DOMKeyboardEvent.java
+++ b/batik-dom/src/main/java/org/apache/batik/dom/events/DOMKeyboardEvent.java
@@ -324,8 +324,8 @@
keyLocation = keyLocationArg;
modifierKeys.clear();
String[] modifiers = split(modifiersList);
- for (int i = 0; i < modifiers.length; i++) {
- modifierKeys.add(modifiers[i]);
+ for (String modifier : modifiers) {
+ modifierKeys.add(modifier);
}
}
@@ -363,8 +363,8 @@
keyLocation = keyLocationArg;
modifierKeys.clear();
String[] modifiers = split(modifiersList);
- for (int i = 0; i < modifiers.length; i++) {
- modifierKeys.add(modifiers[i]);
+ for (String modifier : modifiers) {
+ modifierKeys.add(modifier);
}
}
}
diff --git a/batik-dom/src/main/java/org/apache/batik/dom/events/DOMMouseEvent.java b/batik-dom/src/main/java/org/apache/batik/dom/events/DOMMouseEvent.java
index 84b6857..a717b66 100644
--- a/batik-dom/src/main/java/org/apache/batik/dom/events/DOMMouseEvent.java
+++ b/batik-dom/src/main/java/org/apache/batik/dom/events/DOMMouseEvent.java
@@ -267,8 +267,8 @@
relatedTarget = relatedTargetArg;
modifierKeys.clear();
String[] modifiers = split(modifiersList);
- for (int i = 0; i < modifiers.length; i++) {
- modifierKeys.add(modifiers[i]);
+ for (String modifier : modifiers) {
+ modifierKeys.add(modifier);
}
}
}
diff --git a/batik-dom/src/main/java/org/apache/batik/dom/events/EventSupport.java b/batik-dom/src/main/java/org/apache/batik/dom/events/EventSupport.java
index 914c11d..8b86074 100644
--- a/batik-dom/src/main/java/org/apache/batik/dom/events/EventSupport.java
+++ b/batik-dom/src/main/java/org/apache/batik/dom/events/EventSupport.java
@@ -20,7 +20,6 @@
import java.util.HashSet;
import java.util.List;
-import java.util.Iterator;
import org.apache.batik.dom.AbstractDocument;
import org.apache.batik.dom.AbstractNode;
@@ -252,11 +251,10 @@
e.setEventPhase(Event.CAPTURING_PHASE);
HashSet stoppedGroups = new HashSet();
HashSet toBeStoppedGroups = new HashSet();
- for (int i = 0; i < ancestors.length; i++) {
- NodeEventTarget node = ancestors[i];
+ for (NodeEventTarget node : ancestors) {
e.setCurrentTarget(node);
fireEventListeners(node, e, true, stoppedGroups,
- toBeStoppedGroups);
+ toBeStoppedGroups);
stoppedGroups.addAll(toBeStoppedGroups);
toBeStoppedGroups.clear();
}
@@ -291,9 +289,8 @@
protected void runDefaultActions(AbstractEvent e) {
List runables = e.getDefaultActions();
if (runables != null) {
- Iterator i = runables.iterator();
- while (i.hasNext()) {
- Runnable r = (Runnable)i.next();
+ for (Object runable : runables) {
+ Runnable r = (Runnable) runable;
r.run();
}
}
@@ -312,16 +309,16 @@
}
// fire event listeners
String eventNS = e.getNamespaceURI();
- for (int i = 0; i < listeners.length; i++) {
+ for (EventListenerList.Entry listener : listeners) {
try {
- String listenerNS = listeners[i].getNamespaceURI();
+ String listenerNS = listener.getNamespaceURI();
if (listenerNS != null && eventNS != null
&& !listenerNS.equals(eventNS)) {
continue;
}
- Object group = listeners[i].getGroup();
+ Object group = listener.getGroup();
if (stoppedGroups == null || !stoppedGroups.contains(group)) {
- listeners[i].getListener().handleEvent(e);
+ listener.getListener().handleEvent(e);
if (e.getStopImmediatePropagation()) {
if (stoppedGroups != null) {
stoppedGroups.add(group);
diff --git a/batik-dom/src/main/java/org/apache/batik/dom/traversal/TraversalSupport.java b/batik-dom/src/main/java/org/apache/batik/dom/traversal/TraversalSupport.java
index 251824d..4ad7e1d 100644
--- a/batik-dom/src/main/java/org/apache/batik/dom/traversal/TraversalSupport.java
+++ b/batik-dom/src/main/java/org/apache/batik/dom/traversal/TraversalSupport.java
@@ -19,7 +19,6 @@
package org.apache.batik.dom.traversal;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -94,9 +93,8 @@
*/
public void nodeToBeRemoved(Node removedNode) {
if (iterators != null) {
- Iterator it = iterators.iterator();
- while (it.hasNext()) {
- ((DOMNodeIterator)it.next()).nodeToBeRemoved(removedNode);
+ for (Object iterator : iterators) {
+ ((DOMNodeIterator) iterator).nodeToBeRemoved(removedNode);
}
}
}
diff --git a/batik-dom/src/main/java/org/apache/batik/dom/util/DOMUtilities.java b/batik-dom/src/main/java/org/apache/batik/dom/util/DOMUtilities.java
index 0498d90..02b39bd 100644
--- a/batik-dom/src/main/java/org/apache/batik/dom/util/DOMUtilities.java
+++ b/batik-dom/src/main/java/org/apache/batik/dom/util/DOMUtilities.java
@@ -23,10 +23,7 @@
import java.io.StringWriter;
import java.io.Writer;
import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
import java.util.Map;
-import java.util.Set;
import org.apache.batik.dom.AbstractDocument;
import org.apache.batik.util.XMLConstants;
@@ -526,8 +523,8 @@
*/
public static boolean isAnyNodeAncestorOf(ArrayList ancestorNodes, Node node) {
int n = ancestorNodes.size();
- for (int i = 0; i < n; i++) {
- Node ancestor = (Node) ancestorNodes.get(i);
+ for (Object ancestorNode : ancestorNodes) {
+ Node ancestor = (Node) ancestorNode;
if (isAncestorOf(ancestor, node)) {
return true;
}
@@ -606,8 +603,8 @@
return false;
}
int n = children.size();
- for (int i = 0; i < n; i++) {
- Node child = (Node) children.get(i);
+ for (Object aChildren : children) {
+ Node child = (Node) aChildren;
if (canAppend(child, parentNode)) {
return true;
}
@@ -672,9 +669,8 @@
// Copy the prefixes from the prefixes map to the wrapper element
if (prefixes != null) {
wrapperElementPrefix += " ";
- Iterator iter = prefixes.entrySet().iterator();
- while (iter.hasNext()) {
- Map.Entry e = (Map.Entry) iter.next();
+ for (Object o : prefixes.entrySet()) {
+ Map.Entry e = (Map.Entry) o;
String currentKey = (String) e.getKey();
String currentValue = (String) e.getValue();
wrapperElementPrefix += currentKey + "=\"" + currentValue
diff --git a/batik-dom/src/main/java/org/apache/batik/dom/util/HashTable.java b/batik-dom/src/main/java/org/apache/batik/dom/util/HashTable.java
index 1dc190e..dfd02a1 100644
--- a/batik-dom/src/main/java/org/apache/batik/dom/util/HashTable.java
+++ b/batik-dom/src/main/java/org/apache/batik/dom/util/HashTable.java
@@ -174,17 +174,17 @@
return null;
}
int j = 0;
- for ( int i = 0; i < table.length; i++ ) {
- Entry e = table[ i ];
- if ( e == null ) {
+ for (Entry aTable : table) {
+ Entry e = aTable;
+ if (e == null) {
continue;
}
do {
- if ( j++ == index ) {
+ if (j++ == index) {
return e.key;
}
e = e.next;
- } while ( e != null );
+ } while (e != null);
}
return null;
}
@@ -197,17 +197,17 @@
return null;
}
int j = 0;
- for ( int i = 0; i < table.length; i++ ) {
- Entry e = table[ i ];
- if ( e == null ) {
+ for (Entry aTable : table) {
+ Entry e = aTable;
+ if (e == null) {
continue;
}
do {
- if ( j++ == index ) {
+ if (j++ == index) {
return e.value;
}
e = e.next;
- } while ( e != null );
+ } while (e != null);
}
return null;
}
diff --git a/batik-gui-util/src/main/java/org/apache/batik/util/gui/CSSMediaPanel.java b/batik-gui-util/src/main/java/org/apache/batik/util/gui/CSSMediaPanel.java
index c9f0756..ad8752f 100644
--- a/batik-gui-util/src/main/java/org/apache/batik/util/gui/CSSMediaPanel.java
+++ b/batik-gui-util/src/main/java/org/apache/batik/util/gui/CSSMediaPanel.java
@@ -28,7 +28,6 @@
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -182,9 +181,8 @@
*/
public void setMedia(List mediaList) {
listModel.removeAllElements();
- Iterator iter = mediaList.iterator();
- while (iter.hasNext()) {
- listModel.addElement(iter.next());
+ for (Object aMediaList : mediaList) {
+ listModel.addElement(aMediaList);
}
}
diff --git a/batik-gui-util/src/main/java/org/apache/batik/util/gui/DropDownComponent.java b/batik-gui-util/src/main/java/org/apache/batik/util/gui/DropDownComponent.java
index f0b3e39..ef2b22e 100644
--- a/batik-gui-util/src/main/java/org/apache/batik/util/gui/DropDownComponent.java
+++ b/batik-gui-util/src/main/java/org/apache/batik/util/gui/DropDownComponent.java
@@ -579,8 +579,8 @@
private int getPreferredWidth() {
Component[] components = menuPanel.getComponents();
int maxWidth = 0;
- for (int i = 0; i < components.length; i++) {
- int currentWidth = components[i].getPreferredSize().width;
+ for (Component component : components) {
+ int currentWidth = component.getPreferredSize().width;
if (maxWidth < currentWidth) {
maxWidth = currentWidth;
}
@@ -627,8 +627,8 @@
item.setSelected(wasSelected);
}
} else {
- for (int i = 0; i < n; i++) {
- ScrollablePopupMenuItem item = (ScrollablePopupMenuItem) comps[i];
+ for (Component comp : comps) {
+ ScrollablePopupMenuItem item = (ScrollablePopupMenuItem) comp;
if (item == targetItem) {
break;
}
@@ -667,8 +667,8 @@
public int getSelectedItemsCount() {
int selectionCount = 0;
Component[] components = menuPanel.getComponents();
- for (int i = 0; i < components.length; i++) {
- ScrollablePopupMenuItem item = (ScrollablePopupMenuItem) components[i];
+ for (Component component : components) {
+ ScrollablePopupMenuItem item = (ScrollablePopupMenuItem) component;
if (item.isSelected()) {
selectionCount++;
}
diff --git a/batik-gui-util/src/main/java/org/apache/batik/util/gui/JErrorPane.java b/batik-gui-util/src/main/java/org/apache/batik/util/gui/JErrorPane.java
index 2051325..b57c3a9 100644
--- a/batik-gui-util/src/main/java/org/apache/batik/util/gui/JErrorPane.java
+++ b/batik-gui-util/src/main/java/org/apache/batik/util/gui/JErrorPane.java
@@ -44,7 +44,6 @@
import javax.swing.JScrollPane;
import javax.swing.JSeparator;
import javax.swing.JTextArea;
-import javax.swing.SwingUtilities;
import org.apache.batik.util.gui.resource.ActionMap;
import org.apache.batik.util.gui.resource.ButtonFactory;
diff --git a/batik-gui-util/src/main/java/org/apache/batik/util/gui/MemoryMonitor.java b/batik-gui-util/src/main/java/org/apache/batik/util/gui/MemoryMonitor.java
index 1cd9a24..1159446 100644
--- a/batik-gui-util/src/main/java/org/apache/batik/util/gui/MemoryMonitor.java
+++ b/batik-gui-util/src/main/java/org/apache/batik/util/gui/MemoryMonitor.java
@@ -723,10 +723,9 @@
public void run() {
long free = runtime.freeMemory();
long total = runtime.totalMemory();
- Iterator it = components.iterator();
- while (it.hasNext()) {
- Component c = (Component)it.next();
- ((MemoryChangeListener)c).memoryStateChanged(total, free);
+ for (Object component : components) {
+ Component c = (Component) component;
+ ((MemoryChangeListener) c).memoryStateChanged(total, free);
c.repaint();
}
synchronized (this) { inEventQueue = false; }
diff --git a/batik-gui-util/src/main/java/org/apache/batik/util/gui/resource/MenuFactory.java b/batik-gui-util/src/main/java/org/apache/batik/util/gui/resource/MenuFactory.java
index 7f855d8..06718a4 100644
--- a/batik-gui-util/src/main/java/org/apache/batik/util/gui/resource/MenuFactory.java
+++ b/batik-gui-util/src/main/java/org/apache/batik/util/gui/resource/MenuFactory.java
@@ -19,7 +19,6 @@
package org.apache.batik.util.gui.resource;
import java.net.URL;
-import java.util.Iterator;
import java.util.List;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
@@ -146,10 +145,9 @@
MissingListenerException {
JMenuBar result = new JMenuBar();
List menus = getSpecializedStringList(name, specialization);
- Iterator it = menus.iterator();
- while (it.hasNext()) {
- result.add(createJMenuComponent((String)it.next(), specialization));
+ for (Object menu : menus) {
+ result.add(createJMenuComponent((String) menu, specialization));
}
return result;
}
@@ -295,10 +293,9 @@
initializeJMenuItem(result, name, specialization);
List items = getSpecializedStringList(name, specialization);
- Iterator it = items.iterator();
- while (it.hasNext()) {
- result.add(createJMenuComponent((String)it.next(), specialization));
+ for (Object item : items) {
+ result.add(createJMenuComponent((String) item, specialization));
}
return result;
}
diff --git a/batik-gui-util/src/main/java/org/apache/batik/util/gui/resource/ToolBarFactory.java b/batik-gui-util/src/main/java/org/apache/batik/util/gui/resource/ToolBarFactory.java
index ba4be17..c686828 100644
--- a/batik-gui-util/src/main/java/org/apache/batik/util/gui/resource/ToolBarFactory.java
+++ b/batik-gui-util/src/main/java/org/apache/batik/util/gui/resource/ToolBarFactory.java
@@ -19,7 +19,6 @@
package org.apache.batik.util.gui.resource;
-import java.util.Iterator;
import java.util.List;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
@@ -83,10 +82,9 @@
MissingListenerException {
JToolBar result = new JToolBar();
List buttons = getStringList(name);
- Iterator it = buttons.iterator();
- while (it.hasNext()) {
- String s = (String)it.next();
+ for (Object button : buttons) {
+ String s = (String) button;
if (s.equals(SEPARATOR)) {
result.add(new JToolbarSeparator());
} else {
diff --git a/batik-gui-util/src/main/java/org/apache/batik/util/gui/xmleditor/XMLTextEditor.java b/batik-gui-util/src/main/java/org/apache/batik/util/gui/xmleditor/XMLTextEditor.java
index 07c0708..eec7b5c 100644
--- a/batik-gui-util/src/main/java/org/apache/batik/util/gui/xmleditor/XMLTextEditor.java
+++ b/batik-gui-util/src/main/java/org/apache/batik/util/gui/xmleditor/XMLTextEditor.java
@@ -19,7 +19,6 @@
package org.apache.batik.util.gui.xmleditor;
import java.awt.Color;
-import java.awt.Font;
import javax.swing.JEditorPane;
import javax.swing.event.UndoableEditEvent;
diff --git a/batik-gvt/src/main/java/org/apache/batik/gvt/CompositeGraphicsNode.java b/batik-gvt/src/main/java/org/apache/batik/gvt/CompositeGraphicsNode.java
index ee2197b..68cd16d 100644
--- a/batik-gvt/src/main/java/org/apache/batik/gvt/CompositeGraphicsNode.java
+++ b/batik-gvt/src/main/java/org/apache/batik/gvt/CompositeGraphicsNode.java
@@ -867,10 +867,9 @@
* @param c the collection to be checked for containment
*/
public boolean containsAll(Collection c) {
- Iterator i = c.iterator();
- while (i.hasNext()) {
- if (!contains(i.next())) {
- return false;
+ for (Object aC : c) {
+ if (!contains(aC)) {
+ return false;
}
}
return true;
diff --git a/batik-gvt/src/main/java/org/apache/batik/gvt/MarkerShapePainter.java b/batik-gvt/src/main/java/org/apache/batik/gvt/MarkerShapePainter.java
index 8e947d9..6a05aba 100644
--- a/batik-gvt/src/main/java/org/apache/batik/gvt/MarkerShapePainter.java
+++ b/batik-gvt/src/main/java/org/apache/batik/gvt/MarkerShapePainter.java
@@ -27,7 +27,6 @@
import java.awt.geom.Rectangle2D;
import java.util.List;
import java.util.ArrayList;
-import java.util.Arrays;
import org.apache.batik.ext.awt.geom.ExtendedGeneralPath;
import org.apache.batik.ext.awt.geom.ExtendedPathIterator;
@@ -301,8 +300,8 @@
}
if (middleMarkerProxies != null) {
- for(int i=0; i<middleMarkerProxies.length; i++){
- children.add(middleMarkerProxies[i]);
+ for (ProxyGraphicsNode middleMarkerProxy : middleMarkerProxies) {
+ children.add(middleMarkerProxy);
}
}
diff --git a/batik-gvt/src/main/java/org/apache/batik/gvt/UpdateTracker.java b/batik-gvt/src/main/java/org/apache/batik/gvt/UpdateTracker.java
index e641f0e..9785714 100644
--- a/batik-gvt/src/main/java/org/apache/batik/gvt/UpdateTracker.java
+++ b/batik-gvt/src/main/java/org/apache/batik/gvt/UpdateTracker.java
@@ -25,7 +25,6 @@
import java.awt.geom.Rectangle2D;
import java.lang.ref.WeakReference;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -66,10 +65,9 @@
List ret = new LinkedList();
Set keys = dirtyNodes.keySet();
- Iterator i = keys.iterator();
- while (i.hasNext()) {
- WeakReference gnWRef = (WeakReference)i.next();
- GraphicsNode gn = (GraphicsNode)gnWRef.get();
+ for (Object key : keys) {
+ WeakReference gnWRef = (WeakReference) key;
+ GraphicsNode gn = (GraphicsNode) gnWRef.get();
// GraphicsNode srcGN = gn;
// if the weak ref has been cleared then this node is no
@@ -79,12 +77,12 @@
if (gn == null) continue;
AffineTransform oat;
- oat = (AffineTransform)dirtyNodes.get(gnWRef);
- if (oat != null){
+ oat = (AffineTransform) dirtyNodes.get(gnWRef);
+ if (oat != null) {
oat = new AffineTransform(oat);
}
- Rectangle2D srcORgn = (Rectangle2D)fromBounds.remove(gnWRef);
+ Rectangle2D srcORgn = (Rectangle2D) fromBounds.remove(gnWRef);
Rectangle2D srcNRgn = null;
AffineTransform nat = null;
@@ -112,8 +110,8 @@
if (gn == null)
break; // We reached the top of the tree
- Filter f= gn.getFilter();
- if ( f != null) {
+ Filter f = gn.getFilter();
+ if (f != null) {
srcNRgn = f.getBounds2D();
nat = null;
}
@@ -122,7 +120,7 @@
AffineTransform at = gn.getTransform();
// Get the parent's Affine last time we rendered.
gnWRef = gn.getWeakReference();
- AffineTransform poat = (AffineTransform)dirtyNodes.get(gnWRef);
+ AffineTransform poat = (AffineTransform) dirtyNodes.get(gnWRef);
if (poat == null) poat = at;
if (poat != null) {
if (oat != null)
@@ -131,7 +129,7 @@
oat = new AffineTransform(poat);
}
- if (at != null){
+ if (at != null) {
if (nat != null)
nat.preConcatenate(at);
else
@@ -190,10 +188,9 @@
Rectangle2D ret = null;
if (gn instanceof CompositeGraphicsNode) {
CompositeGraphicsNode cgn = (CompositeGraphicsNode)gn;
- Iterator iter = cgn.iterator();
- while (iter.hasNext()) {
- GraphicsNode childGN = (GraphicsNode)iter.next();
+ for (Object aCgn : cgn) {
+ GraphicsNode childGN = (GraphicsNode) aCgn;
Rectangle2D r2d = getNodeDirtyRegion(childGN, at);
if (r2d != null) {
if (f != null) {
@@ -204,7 +201,7 @@
break;
}
if ((ret == null) || (ret == NULL_RECT)) ret = r2d;
- //else ret = ret.createUnion(r2d);
+ //else ret = ret.createUnion(r2d);
else ret.add(r2d);
}
}
diff --git a/batik-gvt/src/main/java/org/apache/batik/gvt/event/AWTEventDispatcher.java b/batik-gvt/src/main/java/org/apache/batik/gvt/event/AWTEventDispatcher.java
index d3284dd..e4032cb 100644
--- a/batik-gvt/src/main/java/org/apache/batik/gvt/event/AWTEventDispatcher.java
+++ b/batik-gvt/src/main/java/org/apache/batik/gvt/event/AWTEventDispatcher.java
@@ -609,38 +609,38 @@
getListeners(GraphicsNodeMouseListener.class);
switch (evt.getID()) {
case GraphicsNodeMouseEvent.MOUSE_MOVED:
- for (int i = 0; i < listeners.length; i++) {
- listeners[i].mouseMoved(evt);
+ for (GraphicsNodeMouseListener listener6 : listeners) {
+ listener6.mouseMoved(evt);
}
break;
case GraphicsNodeMouseEvent.MOUSE_DRAGGED:
- for (int i = 0; i < listeners.length; i++) {
- listeners[i].mouseDragged(evt);
+ for (GraphicsNodeMouseListener listener5 : listeners) {
+ listener5.mouseDragged(evt);
}
break;
case GraphicsNodeMouseEvent.MOUSE_ENTERED:
- for (int i = 0; i < listeners.length; i++) {
- listeners[i].mouseEntered(evt);
+ for (GraphicsNodeMouseListener listener4 : listeners) {
+ listener4.mouseEntered(evt);
}
break;
case GraphicsNodeMouseEvent.MOUSE_EXITED:
- for (int i = 0; i < listeners.length; i++) {
- listeners[i].mouseExited(evt);
+ for (GraphicsNodeMouseListener listener3 : listeners) {
+ listener3.mouseExited(evt);
}
break;
case GraphicsNodeMouseEvent.MOUSE_CLICKED:
- for (int i = 0; i < listeners.length; i++) {
- listeners[i].mouseClicked(evt);
+ for (GraphicsNodeMouseListener listener2 : listeners) {
+ listener2.mouseClicked(evt);
}
break;
case GraphicsNodeMouseEvent.MOUSE_PRESSED:
- for (int i = 0; i < listeners.length; i++) {
- listeners[i].mousePressed(evt);
+ for (GraphicsNodeMouseListener listener1 : listeners) {
+ listener1.mousePressed(evt);
}
break;
case GraphicsNodeMouseEvent.MOUSE_RELEASED:
- for (int i = 0; i < listeners.length; i++) {
- listeners[i].mouseReleased(evt);
+ for (GraphicsNodeMouseListener listener : listeners) {
+ listener.mouseReleased(evt);
}
break;
default:
@@ -659,8 +659,8 @@
GraphicsNodeMouseWheelListener[] listeners =
(GraphicsNodeMouseWheelListener[])
getListeners(GraphicsNodeMouseWheelListener.class);
- for (int i = 0; i < listeners.length; i++) {
- listeners[i].mouseWheelMoved(evt);
+ for (GraphicsNodeMouseWheelListener listener : listeners) {
+ listener.mouseWheelMoved(evt);
}
}
}
@@ -679,18 +679,18 @@
switch (evt.getID()) {
case GraphicsNodeKeyEvent.KEY_PRESSED:
- for (int i=0; i<listeners.length; ++i) {
- listeners[i].keyPressed(evt);
+ for (GraphicsNodeKeyListener listener2 : listeners) {
+ listener2.keyPressed(evt);
}
break;
case GraphicsNodeKeyEvent.KEY_RELEASED:
- for (int i=0; i<listeners.length; ++i) {
- listeners[i].keyReleased(evt);
+ for (GraphicsNodeKeyListener listener1 : listeners) {
+ listener1.keyReleased(evt);
}
break;
case GraphicsNodeKeyEvent.KEY_TYPED:
- for (int i=0; i<listeners.length; ++i) {
- listeners[i].keyTyped(evt);
+ for (GraphicsNodeKeyListener listener : listeners) {
+ listener.keyTyped(evt);
}
break;
default:
diff --git a/batik-gvt/src/main/java/org/apache/batik/gvt/filter/BackgroundRable8Bit.java b/batik-gvt/src/main/java/org/apache/batik/gvt/filter/BackgroundRable8Bit.java
index 5f353c5..f76f63a 100644
--- a/batik-gvt/src/main/java/org/apache/batik/gvt/filter/BackgroundRable8Bit.java
+++ b/batik-gvt/src/main/java/org/apache/batik/gvt/filter/BackgroundRable8Bit.java
@@ -292,9 +292,8 @@
if (child != null) {
CompositeGraphicsNode cgn = (CompositeGraphicsNode)gn;
List children = cgn.getChildren();
- Iterator i = children.iterator();
- while (i.hasNext()) {
- GraphicsNode childGN = (GraphicsNode)i.next();
+ for (Object aChildren : children) {
+ GraphicsNode childGN = (GraphicsNode) aChildren;
// System.out.println("Parent: " + cgn +
// "\n Child: " + child +
// "\n ChildGN: " + childGN);
@@ -314,7 +313,7 @@
if (aoi.intersects(cbounds)) {
srcs.add(childGN.getEnableBackgroundGraphicsNodeRable
- (true));
+ (true));
}
}
}
diff --git a/batik-gvt/src/main/java/org/apache/batik/gvt/flow/BlockInfo.java b/batik-gvt/src/main/java/org/apache/batik/gvt/flow/BlockInfo.java
index b6a68fc..fbe6603 100644
--- a/batik-gvt/src/main/java/org/apache/batik/gvt/flow/BlockInfo.java
+++ b/batik-gvt/src/main/java/org/apache/batik/gvt/flow/BlockInfo.java
@@ -20,7 +20,6 @@
import java.awt.font.FontRenderContext;
import java.awt.font.TextAttribute;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -95,9 +94,8 @@
if (fsFloat != null)
fontSize = fsFloat;
- Iterator i = fontList.iterator();
- while (i.hasNext()) {
- GVTFont font = (GVTFont)i.next();
+ for (Object aFontList : fontList) {
+ GVTFont font = (GVTFont) aFontList;
GVTLineMetrics lm = font.getLineMetrics("", frc);
this.ascent = lm.getAscent();
this.descent = lm.getDescent();
diff --git a/batik-gvt/src/main/java/org/apache/batik/gvt/font/Kern.java b/batik-gvt/src/main/java/org/apache/batik/gvt/font/Kern.java
index 93e86fe..c81051d 100644
--- a/batik-gvt/src/main/java/org/apache/batik/gvt/font/Kern.java
+++ b/batik-gvt/src/main/java/org/apache/batik/gvt/font/Kern.java
@@ -86,8 +86,8 @@
}
if (glyphUnicode.length() < 1) return false;
char glyphChar = glyphUnicode.charAt(0);
- for (int i = 0; i < firstUnicodeRanges.length; i++) {
- if (firstUnicodeRanges[i].contains(glyphChar))
+ for (UnicodeRange firstUnicodeRange : firstUnicodeRanges) {
+ if (firstUnicodeRange.contains(glyphChar))
return true;
}
return false;
@@ -107,8 +107,8 @@
int pt = Arrays.binarySearch(firstGlyphCodes, glyphCode);
if (pt >= 0) return true;
}
- for (int i = 0; i < firstUnicodeRanges.length; i++) {
- if (firstUnicodeRanges[i].contains(glyphUnicode))
+ for (UnicodeRange firstUnicodeRange : firstUnicodeRanges) {
+ if (firstUnicodeRange.contains(glyphUnicode))
return true;
}
return false;
@@ -131,8 +131,8 @@
}
if (glyphUnicode.length() < 1) return false;
char glyphChar = glyphUnicode.charAt(0);
- for (int i = 0; i < secondUnicodeRanges.length; i++) {
- if (secondUnicodeRanges[i].contains(glyphChar))
+ for (UnicodeRange secondUnicodeRange : secondUnicodeRanges) {
+ if (secondUnicodeRange.contains(glyphChar))
return true;
}
return false;
@@ -153,8 +153,8 @@
int pt = Arrays.binarySearch(secondGlyphCodes, glyphCode);
if (pt >= 0) return true;
}
- for (int i = 0; i < secondUnicodeRanges.length; i++) {
- if (secondUnicodeRanges[i].contains(glyphUnicode))
+ for (UnicodeRange secondUnicodeRange : secondUnicodeRanges) {
+ if (secondUnicodeRange.contains(glyphUnicode))
return true;
}
return false;
diff --git a/batik-gvt/src/main/java/org/apache/batik/gvt/font/KerningTable.java b/batik-gvt/src/main/java/org/apache/batik/gvt/font/KerningTable.java
index c536147..7f7c980 100644
--- a/batik-gvt/src/main/java/org/apache/batik/gvt/font/KerningTable.java
+++ b/batik-gvt/src/main/java/org/apache/batik/gvt/font/KerningTable.java
@@ -57,10 +57,10 @@
int glyphCode2,
String glyphUnicode1,
String glyphUnicode2) {
- for (int i = 0; i < entries.length; i++) {
- if (entries[i].matchesFirstGlyph(glyphCode1, glyphUnicode1) &&
- entries[i].matchesSecondGlyph(glyphCode2, glyphUnicode2)) {
- return entries[i].getAdjustValue();
+ for (Kern entry : entries) {
+ if (entry.matchesFirstGlyph(glyphCode1, glyphUnicode1) &&
+ entry.matchesSecondGlyph(glyphCode2, glyphUnicode2)) {
+ return entry.getAdjustValue();
}
}
return 0f;
diff --git a/batik-gvt/src/main/java/org/apache/batik/gvt/font/MultiGlyphVector.java b/batik-gvt/src/main/java/org/apache/batik/gvt/font/MultiGlyphVector.java
index 0a7e525..9533327 100644
--- a/batik-gvt/src/main/java/org/apache/batik/gvt/font/MultiGlyphVector.java
+++ b/batik-gvt/src/main/java/org/apache/batik/gvt/font/MultiGlyphVector.java
@@ -286,11 +286,11 @@
*/
public Rectangle2D getLogicalBounds() {
Rectangle2D ret = null;
- for (int idx=0; idx<gvs.length; idx++) {
- Rectangle2D b = gvs[idx].getLogicalBounds();
+ for (GVTGlyphVector gv : gvs) {
+ Rectangle2D b = gv.getLogicalBounds();
if (ret == null) ret = b;
- //else ret = ret.createUnion(b);
- else ret.add( b ); // same as union
+ //else ret = ret.createUnion(b);
+ else ret.add(b); // same as union
}
return ret;
}
@@ -301,8 +301,8 @@
*/
public Shape getOutline() {
GeneralPath ret = null;
- for (int idx=0; idx<gvs.length; idx++) {
- Shape s = gvs[idx].getOutline();
+ for (GVTGlyphVector gv : gvs) {
+ Shape s = gv.getOutline();
if (ret == null) ret = new GeneralPath(s);
else ret.append(s, false);
}
@@ -327,13 +327,12 @@
public Rectangle2D getBounds2D(AttributedCharacterIterator aci) {
Rectangle2D ret = null;
int begin = aci.getBeginIndex();
- for (int idx=0; idx<gvs.length; idx++) {
- GVTGlyphVector gv = gvs[idx];
- int end = gv.getCharacterCount(0, gv.getNumGlyphs())+1;
- Rectangle2D b = gvs[idx].getBounds2D
- (new AttributedCharacterSpanIterator(aci, begin, end));
+ for (GVTGlyphVector gv : gvs) {
+ int end = gv.getCharacterCount(0, gv.getNumGlyphs()) + 1;
+ Rectangle2D b = gv.getBounds2D
+ (new AttributedCharacterSpanIterator(aci, begin, end));
if (ret == null) ret = b;
- //else ret = ret.createUnion(b);
+ //else ret = ret.createUnion(b);
else ret.add(b);
begin = end;
}
@@ -347,18 +346,18 @@
*/
public Rectangle2D getGeometricBounds() {
Rectangle2D ret = null;
- for (int idx=0; idx<gvs.length; idx++) {
- Rectangle2D b = gvs[idx].getGeometricBounds();
+ for (GVTGlyphVector gv : gvs) {
+ Rectangle2D b = gv.getGeometricBounds();
if (ret == null) ret = b;
- //else ret = ret.createUnion(b);
+ //else ret = ret.createUnion(b);
else ret.add(b);
}
return ret;
}
public void performDefaultLayout() {
- for (int idx=0; idx<gvs.length; idx++) {
- gvs[idx].performDefaultLayout();
+ for (GVTGlyphVector gv : gvs) {
+ gv.performDefaultLayout();
}
}
@@ -402,9 +401,8 @@
public void draw(Graphics2D g2d,
AttributedCharacterIterator aci) {
int begin = aci.getBeginIndex();
- for (int idx=0; idx<gvs.length; idx++) {
- GVTGlyphVector gv = gvs[idx];
- int end = gv.getCharacterCount(0, gv.getNumGlyphs())+1;
+ for (GVTGlyphVector gv : gvs) {
+ int end = gv.getCharacterCount(0, gv.getNumGlyphs()) + 1;
gv.draw(g2d, new AttributedCharacterSpanIterator(aci, begin, end));
begin = end;
}
diff --git a/batik-gvt/src/main/java/org/apache/batik/gvt/renderer/DynamicRenderer.java b/batik-gvt/src/main/java/org/apache/batik/gvt/renderer/DynamicRenderer.java
index 6bd2d39..fce560b 100644
--- a/batik-gvt/src/main/java/org/apache/batik/gvt/renderer/DynamicRenderer.java
+++ b/batik-gvt/src/main/java/org/apache/batik/gvt/renderer/DynamicRenderer.java
@@ -28,7 +28,6 @@
import java.awt.image.SampleModel;
import java.awt.image.WritableRaster;
import java.util.Collection;
-import java.util.Iterator;
import org.apache.batik.ext.awt.geom.RectListManager;
import org.apache.batik.ext.awt.image.GraphicsUtil;
@@ -215,21 +214,20 @@
Color fillColor = new Color( 0, 0, 255, 50 );
Color borderColor = new Color( 0, 0, 0, 50 );
- Iterator iter = damagedAreas.iterator();
- while (iter.hasNext()) {
- Rectangle r = (Rectangle)iter.next();
+ for (Object damagedArea : damagedAreas) {
+ Rectangle r = (Rectangle) damagedArea;
if (!dr.intersects(r)) continue;
r = dr.intersection(r);
if (sr != null && !sr.intersects(r)) continue;
r = sr.intersection(r);
// System.err.println("Copy: " + r);
Raster src = currentRaster.createWritableChild
- (r.x, r.y, r.width, r.height, r.x, r.y, null);
+ (r.x, r.y, r.width, r.height, r.x, r.y, null);
GraphicsUtil.copyData(src, copyRaster);
if (g2d != null) {
- g2d.setPaint( fillColor );
+ g2d.setPaint(fillColor);
g2d.fill(r);
- g2d.setPaint( borderColor );
+ g2d.setPaint(borderColor);
g2d.draw(r);
}
}
@@ -238,20 +236,19 @@
Color fillColor = new Color( 255, 0, 0, 50 );
Color borderColor = new Color( 0, 0, 0, 50 );
- Iterator iter = devRLM.iterator();
- while (iter.hasNext()) {
- Rectangle r = (Rectangle)iter.next();
+ for (Object aDevRLM : devRLM) {
+ Rectangle r = (Rectangle) aDevRLM;
if (!dr.intersects(r)) continue;
r = dr.intersection(r);
// System.err.println("Render: " + r);
WritableRaster dst = copyRaster.createWritableChild
- (r.x, r.y, r.width, r.height, r.x, r.y, null);
+ (r.x, r.y, r.width, r.height, r.x, r.y, null);
cr.copyData(dst);
if (g2d != null) {
- g2d.setPaint( fillColor );
+ g2d.setPaint(fillColor);
g2d.fill(r);
- g2d.setPaint( borderColor );
+ g2d.setPaint(borderColor);
g2d.draw(r);
}
}
diff --git a/batik-gvt/src/main/java/org/apache/batik/gvt/renderer/MacRenderer.java b/batik-gvt/src/main/java/org/apache/batik/gvt/renderer/MacRenderer.java
index 5e87658..aa8b9dd 100644
--- a/batik-gvt/src/main/java/org/apache/batik/gvt/renderer/MacRenderer.java
+++ b/batik-gvt/src/main/java/org/apache/batik/gvt/renderer/MacRenderer.java
@@ -347,9 +347,8 @@
}
- Iterator iter = devRLM.iterator();
- while (iter.hasNext()) {
- Rectangle r = (Rectangle)iter.next();
+ for (Object aDevRLM : devRLM) {
+ Rectangle r = (Rectangle) aDevRLM;
if (!dr.intersects(r)) continue;
r = dr.intersection(r);
g2d.setTransform(IDENTITY);
diff --git a/batik-gvt/src/main/java/org/apache/batik/gvt/renderer/StaticRenderer.java b/batik-gvt/src/main/java/org/apache/batik/gvt/renderer/StaticRenderer.java
index 24099c7..3f90542 100644
--- a/batik-gvt/src/main/java/org/apache/batik/gvt/renderer/StaticRenderer.java
+++ b/batik-gvt/src/main/java/org/apache/batik/gvt/renderer/StaticRenderer.java
@@ -34,7 +34,6 @@
import java.awt.image.renderable.RenderContext;
import java.lang.ref.SoftReference;
import java.util.Collection;
-import java.util.Iterator;
import org.apache.batik.ext.awt.geom.RectListManager;
import org.apache.batik.ext.awt.image.GraphicsUtil;
@@ -427,9 +426,8 @@
*/
public void flush(Collection areas) {
AffineTransform at = getTransform();
- Iterator i = areas.iterator();
- while (i.hasNext()) {
- Shape s = (Shape)i.next();
+ for (Object area : areas) {
+ Shape s = (Shape) area;
Rectangle r = at.createTransformedShape(s).getBounds();
flush(r);
}
diff --git a/batik-gvt/src/main/java/org/apache/batik/gvt/text/ArabicTextHandler.java b/batik-gvt/src/main/java/org/apache/batik/gvt/text/ArabicTextHandler.java
index 6f3ec02..fa62d12 100644
--- a/batik-gvt/src/main/java/org/apache/batik/gvt/text/ArabicTextHandler.java
+++ b/batik-gvt/src/main/java/org/apache/batik/gvt/text/ArabicTextHandler.java
@@ -378,8 +378,8 @@
int [][]remaps = doubleCharRemappings[ch1-doubleCharFirst];
if (remaps == null) return false;
- for (int i=0; i<remaps.length; i++) {
- if (remaps[i][0] == ch2)
+ for (int[] remap : remaps) {
+ if (remap[0] == ch2)
return true;
}
return false;
@@ -402,9 +402,9 @@
int [][]remaps = doubleCharRemappings[ch1-doubleCharFirst];
if (remaps == null) return -1;
- for (int i=0; i<remaps.length; i++) {
- if (remaps[i][0] == ch2)
- return remaps[i][form];
+ for (int[] remap : remaps) {
+ if (remap[0] == ch2)
+ return remap[form];
}
return -1;
}
diff --git a/batik-gvt/src/main/java/org/apache/batik/gvt/text/BidiAttributedCharacterIterator.java b/batik-gvt/src/main/java/org/apache/batik/gvt/text/BidiAttributedCharacterIterator.java
index efe0ad0..7a1eb1f 100644
--- a/batik-gvt/src/main/java/org/apache/batik/gvt/text/BidiAttributedCharacterIterator.java
+++ b/batik-gvt/src/main/java/org/apache/batik/gvt/text/BidiAttributedCharacterIterator.java
@@ -23,7 +23,6 @@
import java.text.AttributedCharacterIterator;
import java.text.AttributedString;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import java.util.Set;
@@ -99,11 +98,10 @@
Map attrMap = aci.getAttributes();
int extent = aci.getRunLimit();
Map destMap = new HashMap(attrMap.size());
- Iterator it = attrMap.entrySet().iterator();
- while (it.hasNext()) {
+ for (Object o : attrMap.entrySet()) {
// Font doesn't like getting attribute sets with
// null keys or values so we strip them here.
- Map.Entry e = (Map.Entry)it.next();
+ Map.Entry e = (Map.Entry) o;
Object key = e.getKey();
if (key == null) continue;
Object value = e.getValue();
diff --git a/batik-parser/src/main/java/org/apache/batik/parser/FloatArrayProducer.java b/batik-parser/src/main/java/org/apache/batik/parser/FloatArrayProducer.java
index 25bbda4..43c8545 100644
--- a/batik-parser/src/main/java/org/apache/batik/parser/FloatArrayProducer.java
+++ b/batik-parser/src/main/java/org/apache/batik/parser/FloatArrayProducer.java
@@ -18,7 +18,6 @@
*/
package org.apache.batik.parser;
-import java.util.Iterator;
import java.util.LinkedList;
/**
@@ -96,9 +95,8 @@
public void endNumberList() throws ParseException {
float[] all = new float[count];
int pos = 0;
- Iterator it = as.iterator();
- while (it.hasNext()) {
- float[] b = (float[]) it.next();
+ for (Object a1 : as) {
+ float[] b = (float[]) a1;
System.arraycopy(b, 0, all, pos, b.length);
pos += b.length;
}
diff --git a/batik-script/src/main/java/org/apache/batik/script/InterpreterPool.java b/batik-script/src/main/java/org/apache/batik/script/InterpreterPool.java
index 5541908..cab5979 100644
--- a/batik-script/src/main/java/org/apache/batik/script/InterpreterPool.java
+++ b/batik-script/src/main/java/org/apache/batik/script/InterpreterPool.java
@@ -65,8 +65,8 @@
InterpreterFactory factory = null;
factory = (InterpreterFactory)iter.next();
String[] mimeTypes = factory.getMimeTypes();
- for (int i = 0; i < mimeTypes.length; i++) {
- defaultFactories.put(mimeTypes[i], factory);
+ for (String mimeType : mimeTypes) {
+ defaultFactories.put(mimeType, factory);
}
}
}
diff --git a/batik-svg-dom/src/main/java/org/apache/batik/dom/svg/AbstractSVGList.java b/batik-svg-dom/src/main/java/org/apache/batik/dom/svg/AbstractSVGList.java
index 3790643..043ed49 100644
--- a/batik-svg-dom/src/main/java/org/apache/batik/dom/svg/AbstractSVGList.java
+++ b/batik-svg-dom/src/main/java/org/apache/batik/dom/svg/AbstractSVGList.java
@@ -491,9 +491,8 @@
if (list == null) {
return;
}
- Iterator it = list.iterator();
- while (it.hasNext()) {
- SVGItem item = (SVGItem)it.next();
+ for (Object aList : list) {
+ SVGItem item = (SVGItem) aList;
item.setParent(null);
}
list.clear();
diff --git a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/AbstractCompoundCommand.java b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/AbstractCompoundCommand.java
index dda7222..4be655e 100644
--- a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/AbstractCompoundCommand.java
+++ b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/AbstractCompoundCommand.java
@@ -54,8 +54,8 @@
public void execute() {
int n = atomCommands.size();
- for (int i = 0; i < n; i++) {
- UndoableCommand cmd = (UndoableCommand) atomCommands.get(i);
+ for (Object atomCommand : atomCommands) {
+ UndoableCommand cmd = (UndoableCommand) atomCommand;
cmd.execute();
}
}
@@ -70,8 +70,8 @@
public void redo() {
int n = atomCommands.size();
- for (int i = 0; i < n; i++) {
- UndoableCommand cmd = (UndoableCommand) atomCommands.get(i);
+ for (Object atomCommand : atomCommands) {
+ UndoableCommand cmd = (UndoableCommand) atomCommand;
cmd.redo();
}
}
diff --git a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/DOMDocumentTree.java b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/DOMDocumentTree.java
index 590448d..b59d927 100644
--- a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/DOMDocumentTree.java
+++ b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/DOMDocumentTree.java
@@ -48,7 +48,6 @@
import java.util.ArrayList;
import java.util.EventListener;
import java.util.EventObject;
-import java.util.Iterator;
import javax.swing.JPanel;
import javax.swing.JRootPane;
@@ -161,12 +160,11 @@
return;
}
ArrayList nodeList = new ArrayList();
- for (int i = 0; i < paths.length; i++) {
- TreePath path = paths[i];
+ for (TreePath path : paths) {
// If the root node 'being dragged'
if (path.getPathCount() > 1) {
DefaultMutableTreeNode node =
- (DefaultMutableTreeNode) path.getLastPathComponent();
+ (DefaultMutableTreeNode) path.getLastPathComponent();
Node associatedNode = getDomNodeFromTreeNode(node);
if (associatedNode != null) {
nodeList.add(associatedNode);
@@ -324,10 +322,10 @@
.getTransferable();
// Transferable transferable = dtde.getTransferable();
DataFlavor[] flavors = transferable.getTransferDataFlavors();
- for (int i = 0; i < flavors.length; i++) {
- if (transferable.isDataFlavorSupported(flavors[i])) {
+ for (DataFlavor flavor : flavors) {
+ if (transferable.isDataFlavorSupported(flavor)) {
transferData = (TransferData) transferable
- .getTransferData(flavors[i]);
+ .getTransferData(flavor);
return;
}
}
@@ -691,8 +689,8 @@
* @return boolean
*/
public boolean isDataFlavorSupported(DataFlavor flavor) {
- for (int i = 0; i < FLAVORS.length; i++) {
- if (flavor.equals(FLAVORS[i])) {
+ for (DataFlavor FLAVOR : FLAVORS) {
+ if (flavor.equals(FLAVOR)) {
return true;
}
}
@@ -755,9 +753,8 @@
*/
public String getNodesAsXML() {
String toReturn = "";
- Iterator iterator = nodeList.iterator();
- while (iterator.hasNext()) {
- Node node = (Node) iterator.next();
+ for (Object aNodeList : nodeList) {
+ Node node = (Node) aNodeList;
toReturn += DOMUtilities.getXML(node);
}
return toReturn;
@@ -1002,8 +999,8 @@
Node parentNode) {
ArrayList children = new ArrayList();
int n = potentialChildren.size();
- for (int i = 0; i < n; i++) {
- Node node = (Node) potentialChildren.get(i);
+ for (Object aPotentialChildren : potentialChildren) {
+ Node node = (Node) aPotentialChildren;
if (DOMUtilities.canAppend(node, parentNode)) {
children.add(node);
}
diff --git a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/DOMViewer.java b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/DOMViewer.java
index 75960f6..97702ec 100644
--- a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/DOMViewer.java
+++ b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/DOMViewer.java
@@ -38,7 +38,6 @@
import java.util.Comparator;
import java.util.Enumeration;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -1692,8 +1691,8 @@
HashMap menuMap = new HashMap();
ArrayList categoriesList = templates.getCategories();
int n = categoriesList.size();
- for (int i = 0; i < n; i++) {
- String category = categoriesList.get(i).toString();
+ for (Object aCategoriesList : categoriesList) {
+ String category = aCategoriesList.toString();
JMenu currentMenu = new JMenu(category);
submenu.add(currentMenu);
// Add submenus to the map
@@ -1710,17 +1709,16 @@
return n1.getName().compareTo(n2.getName());
}
});
- Iterator iter = values.iterator();
- while (iter.hasNext()) {
+ for (Object value : values) {
NodeTemplateDescriptor desc =
- (NodeTemplateDescriptor) iter .next();
+ (NodeTemplateDescriptor) value;
String toParse = desc.getXmlValue();
short nodeType = desc.getType();
String nodeCategory = desc.getCategory();
JMenuItem currentItem = new JMenuItem(desc.getName());
currentItem.addActionListener
- (new NodeTemplateParser(toParse, nodeType));
- JMenu currentSubmenu = (JMenu)menuMap.get(nodeCategory);
+ (new NodeTemplateParser(toParse, nodeType));
+ JMenu currentSubmenu = (JMenu) menuMap.get(nodeCategory);
currentSubmenu.add(currentItem);
}
return submenu;
@@ -1834,20 +1832,19 @@
*/
protected void handleElementSelection(TreeSelectionEvent ev) {
TreePath[] paths = ev.getPaths();
- for (int i = 0; i < paths.length; i++) {
- TreePath path = paths[i];
+ for (TreePath path : paths) {
DefaultMutableTreeNode mtn =
- (DefaultMutableTreeNode) path.getLastPathComponent();
+ (DefaultMutableTreeNode) path.getLastPathComponent();
Object nodeInfo = mtn.getUserObject();
if (nodeInfo instanceof NodeInfo) {
Node node = ((NodeInfo) nodeInfo).getNode();
if (node.getNodeType() == Node.ELEMENT_NODE) {
if (ev.isAddedPath(path)) {
elementOverlayManager.addElement
- ((Element) node);
+ ((Element) node);
} else {
elementOverlayManager.removeElement
- ((Element) node);
+ ((Element) node);
}
}
}
diff --git a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/DropDownHistoryModel.java b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/DropDownHistoryModel.java
index 4a907c5..35dec3d 100644
--- a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/DropDownHistoryModel.java
+++ b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/DropDownHistoryModel.java
@@ -185,9 +185,9 @@
* @return True if item was successfully removed
*/
protected boolean removeFirstScrollablePopupMenuItem(String details) {
- for (int i = 0; i < items.size(); i++) {
+ for (Object item1 : items) {
ScrollablePopupMenuItem item =
- (ScrollablePopupMenuItem) items.get(i);
+ (ScrollablePopupMenuItem) item1;
removeItem(item, details);
return true;
}
diff --git a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/ElementOverlayManager.java b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/ElementOverlayManager.java
index 411063b..5b97305 100644
--- a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/ElementOverlayManager.java
+++ b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/ElementOverlayManager.java
@@ -137,8 +137,8 @@
protected Rectangle getAllElementsBounds() {
Rectangle resultBound = null;
int n = elements.size();
- for (int i = 0; i < n; i++) {
- Element currentElement = (Element) elements.get(i);
+ for (Object element : elements) {
+ Element currentElement = (Element) element;
Rectangle currentBound = getElementBounds(currentElement);
if (resultBound == null) {
resultBound = currentBound;
@@ -213,13 +213,13 @@
public void paint(Graphics g) {
if (controller.isOverlayEnabled() && isOverlayEnabled()) {
int n = elements.size();
- for (int i = 0; i < n; i++) {
- Element currentElement = (Element) elements.get(i);
+ for (Object element : elements) {
+ Element currentElement = (Element) element;
GraphicsNode nodeToPaint = canvas.getUpdateManager()
.getBridgeContext().getGraphicsNode(currentElement);
if (nodeToPaint != null) {
AffineTransform elementsAt =
- nodeToPaint.getGlobalTransform();
+ nodeToPaint.getGlobalTransform();
Shape selectionHighlight = nodeToPaint.getOutline();
AffineTransform at = canvas.getRenderingTransform();
at.concatenate(elementsAt);
diff --git a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java
index 230ed06..7432d63 100644
--- a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java
+++ b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java
@@ -650,9 +650,9 @@
localHistory = new LocalHistory(mb, this);
String[] uri = application.getVisitedURIs();
- for (int i=0; i<uri.length; i++) {
- if (uri[i] != null && !"".equals(uri[i])) {
- localHistory.update(uri[i]);
+ for (String anUri : uri) {
+ if (anUri != null && !"".equals(anUri)) {
+ localHistory.update(anUri);
}
}
p = new JPanel(new BorderLayout());
@@ -1199,10 +1199,9 @@
Resources.getString(OPEN_TITLE));
fileDialog.setFilenameFilter(new FilenameFilter() {
public boolean accept(File dir, String name) {
- Iterator iter = getHandlers().iterator();
- while (iter.hasNext()) {
+ for (Object o : getHandlers()) {
SquiggleInputHandler handler
- = (SquiggleInputHandler)iter.next();
+ = (SquiggleInputHandler) o;
if (handler.accept(new File(dir, name))) {
return true;
}
@@ -1238,12 +1237,11 @@
//
// Add file filters from the handlers map
//
- Iterator iter = getHandlers().iterator();
- while (iter.hasNext()) {
+ for (Object o : getHandlers()) {
SquiggleInputHandler handler
- = (SquiggleInputHandler)iter.next();
+ = (SquiggleInputHandler) o;
fileChooser.addChoosableFileFilter
- (new SquiggleInputHandlerFilter(handler));
+ (new SquiggleInputHandlerFilter(handler));
}
int choice = fileChooser.showOpenDialog(JSVGViewerFrame.this);
@@ -1476,9 +1474,8 @@
protected void update() {
boolean b = localHistory.canGoBack();
- Iterator it = components.iterator();
- while (it.hasNext()) {
- ((JComponent)it.next()).setEnabled(b);
+ for (Object component : components) {
+ ((JComponent) component).setEnabled(b);
}
}
}
@@ -1503,9 +1500,8 @@
protected void update() {
boolean b = localHistory.canGoForward();
- Iterator it = components.iterator();
- while (it.hasNext()) {
- ((JComponent)it.next()).setEnabled(b);
+ for (Object component : components) {
+ ((JComponent) component).setEnabled(b);
}
}
}
@@ -1976,9 +1972,8 @@
protected void update() {
boolean b = transformHistory.canGoBack();
- Iterator it = components.iterator();
- while (it.hasNext()) {
- ((JComponent)it.next()).setEnabled(b);
+ for (Object component : components) {
+ ((JComponent) component).setEnabled(b);
}
}
}
@@ -2006,9 +2001,8 @@
protected void update() {
boolean b = transformHistory.canGoForward();
- Iterator it = components.iterator();
- while (it.hasNext()) {
- ((JComponent)it.next()).setEnabled(b);
+ for (Object component : components) {
+ ((JComponent) component).setEnabled(b);
}
}
}
@@ -2093,9 +2087,8 @@
}
public void update(boolean enabled) {
- Iterator it = components.iterator();
- while (it.hasNext()) {
- ((JComponent)it.next()).setEnabled(enabled);
+ for (Object component : components) {
+ ((JComponent) component).setEnabled(enabled);
}
}
}
@@ -2117,9 +2110,8 @@
}
public void update(boolean enabled) {
- Iterator it = components.iterator();
- while (it.hasNext()) {
- ((JComponent)it.next()).setEnabled(enabled);
+ for (Object component : components) {
+ ((JComponent) component).setEnabled(enabled);
}
}
}
@@ -2141,9 +2133,8 @@
}
public void update(boolean enabled) {
- Iterator it = components.iterator();
- while (it.hasNext()) {
- ((JComponent)it.next()).setEnabled(enabled);
+ for (Object component : components) {
+ ((JComponent) component).setEnabled(enabled);
}
}
}
diff --git a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/Main.java b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/Main.java
index 2993028..f1b2d05 100644
--- a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/Main.java
+++ b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/Main.java
@@ -35,7 +35,6 @@
import java.net.URLEncoder;
import java.nio.charset.Charset;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
@@ -604,10 +603,9 @@
System.out.println(resources.getString("Command.syntax"));
System.out.println();
System.out.println(resources.getString("Command.options"));
- Iterator it = handlers.keySet().iterator();
- while (it.hasNext()) {
- String s = (String)it.next();
- System.out.println(((OptionHandler)handlers.get(s)).getDescription());
+ for (Object o : handlers.keySet()) {
+ String s = (String) o;
+ System.out.println(((OptionHandler) handlers.get(s)).getDescription());
}
}
@@ -757,9 +755,8 @@
}
private void setPreferences() throws IOException {
- Iterator it = viewerFrames.iterator();
- while (it.hasNext()) {
- setPreferences((JSVGViewerFrame)it.next());
+ for (Object viewerFrame : viewerFrames) {
+ setPreferences((JSVGViewerFrame) viewerFrame);
}
System.setProperty("proxyHost", preferenceManager.getString
@@ -960,11 +957,11 @@
// Now, save the list of visited URL into the preferences
StringBuffer lastVisitedBuffer = new StringBuffer( lastVisited.size() * 8 );
- for (int i=0; i<lastVisited.size(); i++) {
+ for (Object aLastVisited : lastVisited) {
try {
lastVisitedBuffer.append
- (URLEncoder.encode(lastVisited.get(i).toString(),
- Charset.defaultCharset().name()));
+ (URLEncoder.encode(aLastVisited.toString(),
+ Charset.defaultCharset().name()));
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
diff --git a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/NodePickerPanel.java b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/NodePickerPanel.java
index 2f2a743..b0edec4 100644
--- a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/NodePickerPanel.java
+++ b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/NodePickerPanel.java
@@ -1100,8 +1100,8 @@
DefaultTableModel model =
(DefaultTableModel) attributesTable.getModel();
int[] selectedRows = attributesTable.getSelectedRows();
- for (int i = 0; i < selectedRows.length; i++) {
- String attrName = (String) model.getValueAt(selectedRows[i], 0);
+ for (int selectedRow : selectedRows) {
+ String attrName = (String) model.getValueAt(selectedRow, 0);
if (attrName != null) {
String prefix = DOMUtilities.getPrefix(attrName);
String localName = DOMUtilities.getLocalName(attrName);
diff --git a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/NodeTemplates.java b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/NodeTemplates.java
index 3c4b437..ca02034 100644
--- a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/NodeTemplates.java
+++ b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/NodeTemplates.java
@@ -1229,8 +1229,7 @@
*/
private void initializeTemplates() {
Field[] fields = getClass().getDeclaredFields();
- for (int i = 0; i < fields.length; i++) {
- Field currentField = fields[i];
+ for (Field currentField : fields) {
try {
if (currentField.getType() == String.class
&& currentField.getName().endsWith("MemberName")) {
diff --git a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/SVGInputHandler.java b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/SVGInputHandler.java
index 0d614b3..c259d3a 100644
--- a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/SVGInputHandler.java
+++ b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/SVGInputHandler.java
@@ -93,8 +93,8 @@
*/
public boolean accept(String path) {
if (path == null) return false;
- for (int i=0; i<SVG_FILE_EXTENSIONS.length; i++) {
- if (path.endsWith(SVG_FILE_EXTENSIONS[i])) {
+ for (String SVG_FILE_EXTENSION : SVG_FILE_EXTENSIONS) {
+ if (path.endsWith(SVG_FILE_EXTENSION)) {
return true;
}
}
diff --git a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/XMLInputHandler.java b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/XMLInputHandler.java
index 05cbd5e..b8ec6ab 100644
--- a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/XMLInputHandler.java
+++ b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/XMLInputHandler.java
@@ -144,8 +144,8 @@
return false;
}
- for (int i=0; i<XVG_FILE_EXTENSIONS.length; i++) {
- if (path.endsWith(XVG_FILE_EXTENSIONS[i])) {
+ for (String XVG_FILE_EXTENSION : XVG_FILE_EXTENSIONS) {
+ if (path.endsWith(XVG_FILE_EXTENSION)) {
return true;
}
}
diff --git a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/XMLPreferenceManager.java b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/XMLPreferenceManager.java
index 912860a..3915c64 100644
--- a/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/XMLPreferenceManager.java
+++ b/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/XMLPreferenceManager.java
@@ -27,7 +27,6 @@
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
@@ -163,11 +162,10 @@
w.write("<preferences xmlns=\"http://xml.apache.org/batik/preferences\">\n");
- Iterator it = m.keySet().iterator();
- while (it.hasNext()) {
- String n = (String)it.next();
- String v = (String)m.get(n);
-
+ for (Object o : m.keySet()) {
+ String n = (String) o;
+ String v = (String) m.get(n);
+
w.write("<property name=\"" + n + "\">");
try {
w.write(DOMUtilities.contentToString(v, false));
@@ -187,15 +185,11 @@
*/
private synchronized void enumerate(Map m) {
if (defaults != null) {
- Iterator it = m.keySet().iterator();
- while (it.hasNext()) {
- Object k = it.next();
+ for (Object k : m.keySet()) {
m.put(k, defaults.get(k));
}
}
- Iterator it = keySet().iterator();
- while (it.hasNext()) {
- Object k = it.next();
+ for (Object k : keySet()) {
m.put(k, get(k));
}
}
diff --git a/batik-svggen/src/main/java/org/apache/batik/svggen/DOMGroupManager.java b/batik-svggen/src/main/java/org/apache/batik/svggen/DOMGroupManager.java
index 82ac606..1a4b053 100644
--- a/batik-svggen/src/main/java/org/apache/batik/svggen/DOMGroupManager.java
+++ b/batik-svggen/src/main/java/org/apache/batik/svggen/DOMGroupManager.java
@@ -19,7 +19,6 @@
package org.apache.batik.svggen;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import org.apache.batik.ext.awt.g2d.GraphicContext;
@@ -234,11 +233,10 @@
// descriptor. If there is, check if the attribute
// applies to the input element. If there is none,
// assume the attribute applies to the element.
- Iterator iter = groupAttrMap.keySet().iterator();
- while(iter.hasNext()){
- String attrName = (String)iter.next();
+ for (Object o : groupAttrMap.keySet()) {
+ String attrName = (String) o;
SVGAttribute attr = SVGAttributeMap.get(attrName);
- if(attr != null && !attr.appliesTo(tag))
+ if (attr != null && !attr.appliesTo(tag))
groupAttrMap.remove(attrName);
}
}
@@ -315,11 +313,10 @@
static Map processDeltaMap(Map map, Map referenceMap) {
// no need to be synch => HashMap
Map mapDelta = new HashMap();
- Iterator iter = map.keySet().iterator();
- while (iter.hasNext()){
- String key = (String)iter.next();
- String value = (String)map.get(key);
- String refValue = (String)referenceMap.get(key);
+ for (Object o : map.keySet()) {
+ String key = (String) o;
+ String value = (String) map.get(key);
+ String refValue = (String) referenceMap.get(key);
if (!value.equals(refValue)) {
/*if(key.equals(SVG_TRANSFORM_ATTRIBUTE)){
// Special handling for the transform attribute.
diff --git a/batik-svggen/src/main/java/org/apache/batik/svggen/DOMTreeManager.java b/batik-svggen/src/main/java/org/apache/batik/svggen/DOMTreeManager.java
index 16aa38d..f6605f5 100644
--- a/batik-svggen/src/main/java/org/apache/batik/svggen/DOMTreeManager.java
+++ b/batik-svggen/src/main/java/org/apache/batik/svggen/DOMTreeManager.java
@@ -18,7 +18,6 @@
*/
package org.apache.batik.svggen;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -178,9 +177,9 @@
// we iterate over it. If that would happen, we might skip entries
// within the list or ignore new entries at the end. Fix #40686
int nManagers = groupManagers.size();
- for(int i=0; i<nManagers; i++){
- DOMGroupManager gm = (DOMGroupManager)groupManagers.get(i);
- if( gm != groupManager )
+ for (Object groupManager1 : groupManagers) {
+ DOMGroupManager gm = (DOMGroupManager) groupManager1;
+ if (gm != groupManager)
gm.recycleCurrentGroup();
}
}
@@ -204,8 +203,8 @@
// we iterate over it. If that would happen, we might skip entries
// within the list or ignore new entries at the end. Fix #40686
int nManagers = groupManagers.size();
- for(int i=0; i<nManagers; i++){
- DOMGroupManager gm = (DOMGroupManager)groupManagers.get(i);
+ for (Object groupManager : groupManagers) {
+ DOMGroupManager gm = (DOMGroupManager) groupManager;
gm.recycleCurrentGroup();
}
}
@@ -295,9 +294,8 @@
Element genericDefs =
generatorContext.domFactory.createElementNS(SVG_NAMESPACE_URI,
SVG_DEFS_TAG);
- Iterator iter = genericDefSet.iterator();
- while (iter.hasNext()) {
- genericDefs.appendChild((Element)iter.next());
+ for (Object aGenericDefSet : genericDefSet) {
+ genericDefs.appendChild((Element) aGenericDefSet);
}
genericDefs.setAttributeNS(null, SVG_ID_ATTRIBUTE, ID_PREFIX_GENERIC_DEFS);
@@ -408,9 +406,7 @@
topLevelGroup.getFirstChild());
}
- Iterator iter = defSet.iterator();
- while(iter.hasNext())
- defElement.appendChild((Element)iter.next());
+ for (Object aDefSet : defSet) defElement.appendChild((Element) aDefSet);
}
}
diff --git a/batik-svggen/src/main/java/org/apache/batik/svggen/DefaultStyleHandler.java b/batik-svggen/src/main/java/org/apache/batik/svggen/DefaultStyleHandler.java
index 9e54c14..199ce6f 100644
--- a/batik-svggen/src/main/java/org/apache/batik/svggen/DefaultStyleHandler.java
+++ b/batik-svggen/src/main/java/org/apache/batik/svggen/DefaultStyleHandler.java
@@ -20,7 +20,6 @@
import org.apache.batik.util.SVGConstants;
-import java.util.Iterator;
import java.util.Map;
import java.util.HashMap;
import java.util.Set;
@@ -74,13 +73,12 @@
public void setStyle(Element element, Map styleMap,
SVGGeneratorContext generatorContext) {
String tagName = element.getTagName();
- Iterator iter = styleMap.keySet().iterator();
- while (iter.hasNext()) {
- String styleName = (String)iter.next();
- if (element.getAttributeNS(null, styleName).length() == 0){
+ for (Object o : styleMap.keySet()) {
+ String styleName = (String) o;
+ if (element.getAttributeNS(null, styleName).length() == 0) {
if (appliesTo(styleName, tagName)) {
element.setAttributeNS(null, styleName,
- (String)styleMap.get(styleName));
+ (String) styleMap.get(styleName));
}
}
}
diff --git a/batik-svggen/src/main/java/org/apache/batik/svggen/SVGCSSStyler.java b/batik-svggen/src/main/java/org/apache/batik/svggen/SVGCSSStyler.java
index eb7532d..0bc4076 100644
--- a/batik-svggen/src/main/java/org/apache/batik/svggen/SVGCSSStyler.java
+++ b/batik-svggen/src/main/java/org/apache/batik/svggen/SVGCSSStyler.java
@@ -79,8 +79,8 @@
styleAttrBuffer.toString().trim());
int n = toBeRemoved.size();
- for(int i=0; i<n; i++) {
- element.removeAttribute((String)toBeRemoved.get( i ));
+ for (Object aToBeRemoved : toBeRemoved) {
+ element.removeAttribute((String) aToBeRemoved);
}
}
// else
diff --git a/batik-svggen/src/main/java/org/apache/batik/svggen/SVGConvolveOp.java b/batik-svggen/src/main/java/org/apache/batik/svggen/SVGConvolveOp.java
index 667771d..430f25d 100644
--- a/batik-svggen/src/main/java/org/apache/batik/svggen/SVGConvolveOp.java
+++ b/batik-svggen/src/main/java/org/apache/batik/svggen/SVGConvolveOp.java
@@ -94,8 +94,8 @@
// Convert the kernel values
float[] data = kernel.getKernelData(null);
StringBuffer kernelMatrixBuf = new StringBuffer( data.length * 8 );
- for(int i=0; i<data.length; i++){
- kernelMatrixBuf.append(doubleString(data[i]));
+ for (float aData : data) {
+ kernelMatrixBuf.append(doubleString(aData));
kernelMatrixBuf.append(SPACE);
}
diff --git a/batik-svggen/src/main/java/org/apache/batik/svggen/SVGGraphicContextConverter.java b/batik-svggen/src/main/java/org/apache/batik/svggen/SVGGraphicContextConverter.java
index ae4caa3..e0a248a 100644
--- a/batik-svggen/src/main/java/org/apache/batik/svggen/SVGGraphicContextConverter.java
+++ b/batik-svggen/src/main/java/org/apache/batik/svggen/SVGGraphicContextConverter.java
@@ -97,8 +97,8 @@
// no need for synchronized map => use HashMap
Map groupAttrMap = new HashMap();
- for (int i=0; i<converters.length; i++) {
- SVGDescriptor desc = converters[i].toSVG(gc);
+ for (SVGConverter converter : converters) {
+ SVGDescriptor desc = converter.toSVG(gc);
if (desc != null)
desc.getAttributeMap(groupAttrMap);
}
@@ -114,8 +114,7 @@
*/
public List getDefinitionSet() {
List defSet = new LinkedList();
- for(int i=0; i<converters.length; i++)
- defSet.addAll(converters[i].getDefinitionSet());
+ for (SVGConverter converter : converters) defSet.addAll(converter.getDefinitionSet());
return defSet;
}
diff --git a/batik-svggen/src/main/java/org/apache/batik/svggen/SVGGraphics2D.java b/batik-svggen/src/main/java/org/apache/batik/svggen/SVGGraphics2D.java
index 9fcfa5f..aef12f3 100644
--- a/batik-svggen/src/main/java/org/apache/batik/svggen/SVGGraphics2D.java
+++ b/batik-svggen/src/main/java/org/apache/batik/svggen/SVGGraphics2D.java
@@ -47,7 +47,6 @@
import java.io.Writer;
import java.text.AttributedCharacterIterator;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Map;
import java.util.Set;
@@ -1527,9 +1526,8 @@
if (unsupportedAttributes == null) return false;
Set allAttrs = aci.getAllAttributeKeys();
- Iterator iter = allAttrs.iterator();
- while (iter.hasNext()) {
- if (unsupportedAttributes.contains(iter.next())) {
+ for (Object allAttr : allAttrs) {
+ if (unsupportedAttributes.contains(allAttr)) {
return true;
}
}
diff --git a/batik-svggen/src/main/java/org/apache/batik/svggen/font/Font.java b/batik-svggen/src/main/java/org/apache/batik/svggen/font/Font.java
index abc782d..c3c08e9 100644
--- a/batik-svggen/src/main/java/org/apache/batik/svggen/font/Font.java
+++ b/batik-svggen/src/main/java/org/apache/batik/svggen/font/Font.java
@@ -66,9 +66,9 @@
}
public Table getTable(int tableType) {
- for (int i = 0; i < tables.length; i++) {
- if ((tables[i] != null) && (tables[i].getType() == tableType)) {
- return tables[i];
+ for (Table table : tables) {
+ if ((table != null) && (table.getType() == tableType)) {
+ return table;
}
}
return null;
diff --git a/batik-svggen/src/main/java/org/apache/batik/svggen/font/Glyph.java b/batik-svggen/src/main/java/org/apache/batik/svggen/font/Glyph.java
index c2deb2b..fc78226 100644
--- a/batik-svggen/src/main/java/org/apache/batik/svggen/font/Glyph.java
+++ b/batik-svggen/src/main/java/org/apache/batik/svggen/font/Glyph.java
@@ -64,11 +64,11 @@
* @param factor a 16.16 fixed value
*/
public void scale(int factor) {
- for (int i = 0; i < points.length; i++) {
+ for (Point point : points) {
//points[i].x = ( points[i].x * factor ) >> 6;
//points[i].y = ( points[i].y * factor ) >> 6;
- points[i].x = ((points[i].x<<10) * factor) >> 26;
- points[i].y = ((points[i].y<<10) * factor) >> 26;
+ point.x = ((point.x << 10) * factor) >> 26;
+ point.y = ((point.y << 10) * factor) >> 26;
}
leftSideBearing = (short)(( leftSideBearing * factor) >> 6);
advanceWidth = (advanceWidth * factor) >> 6;
diff --git a/batik-svggen/src/main/java/org/apache/batik/svggen/font/table/GlyfCompositeDescript.java b/batik-svggen/src/main/java/org/apache/batik/svggen/font/table/GlyfCompositeDescript.java
index 0ad1b7e..82cd427 100644
--- a/batik-svggen/src/main/java/org/apache/batik/svggen/font/table/GlyfCompositeDescript.java
+++ b/batik-svggen/src/main/java/org/apache/batik/svggen/font/table/GlyfCompositeDescript.java
@@ -20,7 +20,6 @@
import java.io.ByteArrayInputStream;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
/**
@@ -66,9 +65,8 @@
int firstIndex = 0;
int firstContour = 0;
- Iterator i = components.iterator();
- while (i.hasNext()) {
- GlyfCompositeComp comp = (GlyfCompositeComp)i.next();
+ for (Object component : components) {
+ GlyfCompositeComp comp = (GlyfCompositeComp) component;
comp.setFirstIndex(firstIndex);
comp.setFirstContour(firstContour);
@@ -76,7 +74,7 @@
desc = parentTable.getDescription(comp.getGlyphIndex());
if (desc != null) {
desc.resolve();
- firstIndex += desc.getPointCount();
+ firstIndex += desc.getPointCount();
firstContour += desc.getContourCount();
}
}
@@ -162,8 +160,8 @@
protected GlyfCompositeComp getCompositeComp(int i) {
GlyfCompositeComp c;
- for (int n = 0; n < components.size(); n++) {
- c = (GlyfCompositeComp) components.get(n);
+ for (Object component : components) {
+ c = (GlyfCompositeComp) component;
GlyphDescription gd = parentTable.getDescription(c.getGlyphIndex());
if (c.getFirstIndex() <= i && i < (c.getFirstIndex() + gd.getPointCount())) {
return c;
@@ -174,8 +172,8 @@
protected GlyfCompositeComp getCompositeCompEndPt(int i) {
GlyfCompositeComp c;
- for (int j = 0; j < components.size(); j++) {
- c = (GlyfCompositeComp) components.get(j);
+ for (Object component : components) {
+ c = (GlyfCompositeComp) component;
GlyphDescription gd = parentTable.getDescription(c.getGlyphIndex());
if (c.getFirstContour() <= i && i < (c.getFirstContour() + gd.getContourCount())) {
return c;
diff --git a/batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/Main.java b/batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/Main.java
index 0167916..9d70aec 100644
--- a/batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/Main.java
+++ b/batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/Main.java
@@ -21,7 +21,6 @@
import java.awt.Color;
import java.awt.geom.Rectangle2D;
import java.io.File;
-import java.util.Iterator;
import java.util.Map;
import java.util.StringTokenizer;
import java.util.List;
@@ -840,8 +839,8 @@
public Main(String[] args){
this.args = new ArrayList();
- for (int i=0; i<args.length; i++){
- this.args.add(args[i]);
+ for (String arg : args) {
+ this.args.add(arg);
}
}
@@ -969,14 +968,13 @@
*/
protected String[] expandSources(List sources){
List expandedSources = new ArrayList();
- Iterator iter = sources.iterator();
- while (iter.hasNext()){
- String v = (String)iter.next();
+ for (Object source : sources) {
+ String v = (String) source;
File f = new File(v);
- if (f.exists() && f.isDirectory()){
+ if (f.exists() && f.isDirectory()) {
File[] fl = f.listFiles(new SVGConverter.SVGFileFilter());
- for (int i=0; i<fl.length; i++){
- expandedSources.add(fl[i].getPath());
+ for (File aFl : fl) {
+ expandedSources.add(aFl.getPath());
}
} else {
expandedSources.add(v);
diff --git a/batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/SVGConverter.java b/batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/SVGConverter.java
index 2e859fc..ae69134 100644
--- a/batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/SVGConverter.java
+++ b/batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/SVGConverter.java
@@ -470,9 +470,9 @@
}
else{
this.sources = new ArrayList();
- for (int i=0; i<sources.length; i++){
- if (sources[i] != null){
- this.sources.add(sources[i]);
+ for (String source : sources) {
+ if (source != null) {
+ this.sources.add(source);
}
}
@@ -736,11 +736,11 @@
// exist and we may fail later on in createOutputDir
//
int n = sources.size();
- for(int i=0; i<n; i++){
- SVGConverterSource src = (SVGConverterSource)sources.get(i);
+ for (Object source : sources) {
+ SVGConverterSource src = (SVGConverterSource) source;
// Generate output filename from input filename.
File outputName = new File(dst.getPath(),
- getDestinationFile(src.getName()));
+ getDestinationFile(src.getName()));
dstFiles.add(outputName);
}
@@ -751,17 +751,17 @@
// sources. This only work if sources are files.
//
int n = sources.size();
- for(int i=0; i<n; i++){
- SVGConverterSource src = (SVGConverterSource)sources.get(i);
+ for (Object source : sources) {
+ SVGConverterSource src = (SVGConverterSource) source;
if (!(src instanceof SVGConverterFileSource)) {
throw new SVGConverterException(ERROR_CANNOT_COMPUTE_DESTINATION,
- new Object[]{src});
+ new Object[]{src});
}
// Generate output filename from input filename.
- SVGConverterFileSource fs = (SVGConverterFileSource)src;
+ SVGConverterFileSource fs = (SVGConverterFileSource) src;
File outputName = new File(fs.getFile().getParent(),
- getDestinationFile(src.getName()));
+ getDestinationFile(src.getName()));
dstFiles.add(outputName);
}
@@ -784,17 +784,17 @@
}
int n = this.sources.size();
- for (int i=0; i<n; i++){
- String sourceString = (String)(this.sources.get(i));
+ for (Object source : this.sources) {
+ String sourceString = (String) source;
File file = new File(sourceString);
if (file.exists()) {
sources.add(new SVGConverterFileSource(file));
} else {
String[] fileNRef = getFileNRef(sourceString);
file = new File(fileNRef[0]);
- if (file.exists()){
+ if (file.exists()) {
sources.add(new SVGConverterFileSource(file, fileNRef[1]));
- } else{
+ } else {
sources.add(new SVGConverterURLSource(sourceString));
}
}
diff --git a/batik-swing/src/main/java/org/apache/batik/swing/JSVGCanvas.java b/batik-swing/src/main/java/org/apache/batik/swing/JSVGCanvas.java
index 863828c..60df8ff 100644
--- a/batik-swing/src/main/java/org/apache/batik/swing/JSVGCanvas.java
+++ b/batik-swing/src/main/java/org/apache/batik/swing/JSVGCanvas.java
@@ -30,7 +30,6 @@
import java.awt.geom.AffineTransform;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.WeakHashMap;
@@ -562,23 +561,22 @@
protected void installSVGDocument(SVGDocument doc) {
if (toolTipDocs != null) {
- Iterator i = toolTipDocs.keySet().iterator();
- while (i.hasNext()) {
+ for (Object o : toolTipDocs.keySet()) {
SVGDocument ttdoc;
- ttdoc = (SVGDocument)i.next();
+ ttdoc = (SVGDocument) o;
if (ttdoc == null) continue;
NodeEventTarget root;
- root = (NodeEventTarget)ttdoc.getRootElement();
+ root = (NodeEventTarget) ttdoc.getRootElement();
if (root == null) continue;
root.removeEventListenerNS
- (XMLConstants.XML_EVENTS_NAMESPACE_URI,
- SVGConstants.SVG_EVENT_MOUSEOVER,
- toolTipListener, false);
+ (XMLConstants.XML_EVENTS_NAMESPACE_URI,
+ SVGConstants.SVG_EVENT_MOUSEOVER,
+ toolTipListener, false);
root.removeEventListenerNS
- (XMLConstants.XML_EVENTS_NAMESPACE_URI,
- SVGConstants.SVG_EVENT_MOUSEOUT,
- toolTipListener, false);
+ (XMLConstants.XML_EVENTS_NAMESPACE_URI,
+ SVGConstants.SVG_EVENT_MOUSEOUT,
+ toolTipListener, false);
}
toolTipDocs = null;
}
diff --git a/batik-swing/src/main/java/org/apache/batik/swing/gvt/JGVTComponent.java b/batik-swing/src/main/java/org/apache/batik/swing/gvt/JGVTComponent.java
index 88f09f4..fb99b8c 100644
--- a/batik-swing/src/main/java/org/apache/batik/swing/gvt/JGVTComponent.java
+++ b/batik-swing/src/main/java/org/apache/batik/swing/gvt/JGVTComponent.java
@@ -577,9 +577,8 @@
g2d.drawRenderedImage(image, null);
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_OFF);
- Iterator it = overlays.iterator();
- while (it.hasNext()) {
- ((Overlay)it.next()).paint(g);
+ for (Object overlay : overlays) {
+ ((Overlay) overlay).paint(g);
}
}
}
@@ -733,10 +732,9 @@
visRect.width, visRect.height);
gvtTreeRenderer.setPriority(Thread.MIN_PRIORITY);
- Iterator it = gvtTreeRendererListeners.iterator();
- while (it.hasNext()) {
+ for (Object gvtTreeRendererListener : gvtTreeRendererListeners) {
gvtTreeRenderer.addGVTTreeRendererListener
- ((GVTTreeRendererListener)it.next());
+ ((GVTTreeRendererListener) gvtTreeRendererListener);
}
// Disable the dispatch during the rendering
@@ -1238,9 +1236,8 @@
!suspendInteractions &&
interactor == null &&
gvtRoot != null) {
- Iterator it = interactors.iterator();
- while (it.hasNext()) {
- Interactor i = (Interactor)it.next();
+ for (Object interactor1 : interactors) {
+ Interactor i = (Interactor) interactor1;
if (i.startInteraction(ie)) {
interactor = i;
break;
diff --git a/batik-swing/src/main/java/org/apache/batik/swing/svg/JSVGComponent.java b/batik-swing/src/main/java/org/apache/batik/swing/svg/JSVGComponent.java
index 3905548..e4b59ad 100644
--- a/batik-swing/src/main/java/org/apache/batik/swing/svg/JSVGComponent.java
+++ b/batik-swing/src/main/java/org/apache/batik/swing/svg/JSVGComponent.java
@@ -601,10 +601,9 @@
nextDocumentLoader = new SVGDocumentLoader(url, loader);
nextDocumentLoader.setPriority(Thread.MIN_PRIORITY);
- Iterator it = svgDocumentLoaderListeners.iterator();
- while (it.hasNext()) {
+ for (Object svgDocumentLoaderListener : svgDocumentLoaderListeners) {
nextDocumentLoader.addSVGDocumentLoaderListener
- ((SVGDocumentLoaderListener)it.next());
+ ((SVGDocumentLoaderListener) svgDocumentLoaderListener);
}
startDocumentLoader();
}
@@ -771,10 +770,9 @@
nextGVTTreeBuilder = new GVTTreeBuilder(doc, bridgeContext);
nextGVTTreeBuilder.setPriority(Thread.MIN_PRIORITY);
- Iterator it = gvtTreeBuilderListeners.iterator();
- while (it.hasNext()) {
+ for (Object gvtTreeBuilderListener : gvtTreeBuilderListeners) {
nextGVTTreeBuilder.addGVTTreeBuilderListener
- ((GVTTreeBuilderListener)it.next());
+ ((GVTTreeBuilderListener) gvtTreeBuilderListener);
}
initializeEventHandling();
@@ -885,10 +883,9 @@
svgDocument,
bridgeContext,
um);
- Iterator it = svgLoadEventDispatcherListeners.iterator();
- while (it.hasNext()) {
+ for (Object svgLoadEventDispatcherListener : svgLoadEventDispatcherListeners) {
svgLoadEventDispatcher.addSVGLoadEventDispatcherListener
- ((SVGLoadEventDispatcherListener)it.next());
+ ((SVGLoadEventDispatcherListener) svgLoadEventDispatcherListener);
}
svgLoadEventDispatcher.start();
@@ -1864,9 +1861,9 @@
Object[] dll = updateManagerListeners.toArray();
if (dll.length > 0) {
- for (int i = 0; i < dll.length; i++) {
- ((UpdateManagerListener)dll[i]).
- managerStarted(e);
+ for (Object aDll : dll) {
+ ((UpdateManagerListener) aDll).
+ managerStarted(e);
}
}
}
@@ -1882,9 +1879,9 @@
Object[] dll = updateManagerListeners.toArray();
if (dll.length > 0) {
- for (int i = 0; i < dll.length; i++) {
- ((UpdateManagerListener)dll[i]).
- managerSuspended(e);
+ for (Object aDll : dll) {
+ ((UpdateManagerListener) aDll).
+ managerSuspended(e);
}
}
}
@@ -1900,9 +1897,9 @@
Object[] dll = updateManagerListeners.toArray();
if (dll.length > 0) {
- for (int i = 0; i < dll.length; i++) {
- ((UpdateManagerListener)dll[i]).
- managerResumed(e);
+ for (Object aDll : dll) {
+ ((UpdateManagerListener) aDll).
+ managerResumed(e);
}
}
}
@@ -1921,9 +1918,9 @@
Object[] dll = updateManagerListeners.toArray();
if (dll.length > 0) {
- for (int i = 0; i < dll.length; i++) {
- ((UpdateManagerListener)dll[i]).
- managerStopped(e);
+ for (Object aDll : dll) {
+ ((UpdateManagerListener) aDll).
+ managerStopped(e);
}
}
@@ -1958,9 +1955,9 @@
Object[] dll = updateManagerListeners.toArray();
if (dll.length > 0) {
- for (int i = 0; i < dll.length; i++) {
- ((UpdateManagerListener)dll[i]).
- updateStarted(e);
+ for (Object aDll : dll) {
+ ((UpdateManagerListener) aDll).
+ updateStarted(e);
}
}
}
@@ -1991,9 +1988,8 @@
List l = e.getDirtyAreas();
if (l != null) {
- Iterator i = l.iterator();
- while (i.hasNext()) {
- Rectangle r = (Rectangle)i.next();
+ for (Object aL : l) {
+ Rectangle r = (Rectangle) aL;
if (updateOverlay != null) {
updateOverlay.addRect(r);
r = getRenderRect();
@@ -2019,9 +2015,9 @@
Object[] dll = updateManagerListeners.toArray();
if (dll.length > 0) {
- for (int i = 0; i < dll.length; i++) {
- ((UpdateManagerListener)dll[i]).
- updateCompleted(e);
+ for (Object aDll : dll) {
+ ((UpdateManagerListener) aDll).
+ updateCompleted(e);
}
}
}
@@ -2037,9 +2033,9 @@
Object[] dll = updateManagerListeners.toArray();
if (dll.length > 0) {
- for (int i = 0; i < dll.length; i++) {
- ((UpdateManagerListener)dll[i]).
- updateFailed(e);
+ for (Object aDll : dll) {
+ ((UpdateManagerListener) aDll).
+ updateFailed(e);
}
}
}
@@ -3379,8 +3375,8 @@
LinkActivationEvent ev;
ev = new LinkActivationEvent(JSVGComponent.this, elt, href);
- for (int i = 0; i < ll.length; i++) {
- LinkActivationListener l = (LinkActivationListener)ll[i];
+ for (Object aLl : ll) {
+ LinkActivationListener l = (LinkActivationListener) aLl;
l.linkActivated(ev);
}
}
diff --git a/batik-test-svg/src/main/java/org/apache/batik/test/svg/AbstractRenderingAccuracyTest.java b/batik-test-svg/src/main/java/org/apache/batik/test/svg/AbstractRenderingAccuracyTest.java
index 33ddaf2..4763424 100644
--- a/batik-test-svg/src/main/java/org/apache/batik/test/svg/AbstractRenderingAccuracyTest.java
+++ b/batik-test-svg/src/main/java/org/apache/batik/test/svg/AbstractRenderingAccuracyTest.java
@@ -31,7 +31,6 @@
import java.net.URL;
import java.net.MalformedURLException;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
@@ -533,9 +532,8 @@
// computed difference.
//
if (variationURLs != null) {
- Iterator it = variationURLs.iterator();
- while (it.hasNext()) {
- URL variationURL = (URL) it.next();
+ for (Object variationURL1 : variationURLs) {
+ URL variationURL = (URL) variationURL1;
File tmpDiff = imageToFile(diff, IMAGE_TYPE_DIFF);
InputStream variationURLStream = null;
@@ -544,18 +542,18 @@
} catch (IOException e) {
// Could not open variationURL stream. Just trace that
System.err.println
- (Messages.formatMessage
- (COULD_NOT_OPEN_VARIATION_URL,
- new Object[] { variationURL.toString() }));
+ (Messages.formatMessage
+ (COULD_NOT_OPEN_VARIATION_URL,
+ new Object[]{variationURL.toString()}));
}
if (variationURLStream != null) {
InputStream refDiffStream =
- new BufferedInputStream(variationURLStream);
+ new BufferedInputStream(variationURLStream);
InputStream tmpDiffStream =
- new BufferedInputStream
- (new FileInputStream(tmpDiff));
+ new BufferedInputStream
+ (new FileInputStream(tmpDiff));
if (compare(refDiffStream, tmpDiffStream)) {
// We accept the generated result.
diff --git a/batik-test-svg/src/main/java/org/apache/batik/test/svg/JSVGRenderingAccuracyTest.java b/batik-test-svg/src/main/java/org/apache/batik/test/svg/JSVGRenderingAccuracyTest.java
index 80f8e1d..8cac508 100644
--- a/batik-test-svg/src/main/java/org/apache/batik/test/svg/JSVGRenderingAccuracyTest.java
+++ b/batik-test-svg/src/main/java/org/apache/batik/test/svg/JSVGRenderingAccuracyTest.java
@@ -27,7 +27,6 @@
import java.net.URL;
import java.util.List;
-import java.util.Iterator;
import org.apache.batik.test.DefaultTestReport;
import org.apache.batik.test.TestReport;
@@ -134,9 +133,8 @@
// Paint the overlays
Graphics2D g = theImage.createGraphics();
- Iterator it = overlays.iterator();
- while (it.hasNext()) {
- ((Overlay)it.next()).paint(g);
+ for (Object overlay : overlays) {
+ ((Overlay) overlay).paint(g);
}
saveImage(theImage, fos);
diff --git a/batik-test-svg/src/main/java/org/apache/batik/test/svg/ParametrizedRenderingAccuracyTest.java b/batik-test-svg/src/main/java/org/apache/batik/test/svg/ParametrizedRenderingAccuracyTest.java
index 695fa77..33ecf6b 100644
--- a/batik-test-svg/src/main/java/org/apache/batik/test/svg/ParametrizedRenderingAccuracyTest.java
+++ b/batik-test-svg/src/main/java/org/apache/batik/test/svg/ParametrizedRenderingAccuracyTest.java
@@ -66,8 +66,8 @@
buildRefImgURL(dirNfile[0], dirNfile[1]));
String[] variationURLs = buildVariationURLs(dirNfile[0], dirNfile[1]);
- for (int i = 0; i < variationURLs.length; i++) {
- addVariationURL(variationURLs[i]);
+ for (String variationURL : variationURLs) {
+ addVariationURL(variationURL);
}
setSaveVariation(new File(buildSaveVariationFile(dirNfile[0], dirNfile[1])));
setCandidateReference(new File(buildCandidateReferenceFile(dirNfile[0], dirNfile[1])));
diff --git a/batik-test-svg/src/main/java/org/apache/batik/test/svg/PreconfiguredRenderingTest.java b/batik-test-svg/src/main/java/org/apache/batik/test/svg/PreconfiguredRenderingTest.java
index 11b9677..a243204 100644
--- a/batik-test-svg/src/main/java/org/apache/batik/test/svg/PreconfiguredRenderingTest.java
+++ b/batik-test-svg/src/main/java/org/apache/batik/test/svg/PreconfiguredRenderingTest.java
@@ -62,8 +62,8 @@
buildRefImgURL(dirNfile[0], dirNfile[1]));
String[] variationURLs = buildVariationURLs(dirNfile[0], dirNfile[1]);
- for (int i = 0; i < variationURLs.length; i++) {
- addVariationURL(variationURLs[i]);
+ for (String variationURL : variationURLs) {
+ addVariationURL(variationURL);
}
setSaveVariation(new File(buildSaveVariationFile(dirNfile[0], dirNfile[1])));
setCandidateReference(new File(buildCandidateReferenceFile(dirNfile[0],dirNfile[1])));
diff --git a/batik-test-svg/src/main/java/org/apache/batik/test/svg/SVGOnLoadExceptionTest.java b/batik-test-svg/src/main/java/org/apache/batik/test/svg/SVGOnLoadExceptionTest.java
index c9c9792..45d0fe9 100644
--- a/batik-test-svg/src/main/java/org/apache/batik/test/svg/SVGOnLoadExceptionTest.java
+++ b/batik-test-svg/src/main/java/org/apache/batik/test/svg/SVGOnLoadExceptionTest.java
@@ -402,7 +402,7 @@
//
String parserClassName = XMLResourceDescriptor.getXMLParserClassName();
SAXSVGDocumentFactory f = new SAXSVGDocumentFactory(parserClassName);
- f.setValidating(validate.booleanValue());
+ f.setValidating(validate);
Document doc = null;
try {
diff --git a/batik-test-svg/src/main/java/org/apache/batik/test/svg/SVGReferenceRenderingAccuracyTest.java b/batik-test-svg/src/main/java/org/apache/batik/test/svg/SVGReferenceRenderingAccuracyTest.java
index 244cb96..b0c5fb8 100644
--- a/batik-test-svg/src/main/java/org/apache/batik/test/svg/SVGReferenceRenderingAccuracyTest.java
+++ b/batik-test-svg/src/main/java/org/apache/batik/test/svg/SVGReferenceRenderingAccuracyTest.java
@@ -67,8 +67,8 @@
buildRefImgURL(dirNfile[0], dirNfile[1]));
String[] variationURLs = buildVariationURLs(dirNfile[0], dirNfile[1]);
- for (int i = 0; i < variationURLs.length; i++) {
- addVariationURL(variationURLs[i]);
+ for (String variationURL : variationURLs) {
+ addVariationURL(variationURL);
}
setSaveVariation(new File(buildSaveVariationFile(dirNfile[0], dirNfile[1])));
setCandidateReference(new File(buildCandidateReferenceFile(dirNfile[0], dirNfile[1])));
diff --git a/batik-test-svg/src/main/java/org/apache/batik/test/svg/SVGRenderingAccuracyTest.java b/batik-test-svg/src/main/java/org/apache/batik/test/svg/SVGRenderingAccuracyTest.java
index 2cf6d95..cdb45cf 100644
--- a/batik-test-svg/src/main/java/org/apache/batik/test/svg/SVGRenderingAccuracyTest.java
+++ b/batik-test-svg/src/main/java/org/apache/batik/test/svg/SVGRenderingAccuracyTest.java
@@ -98,7 +98,7 @@
if (validate == null){
throw new IllegalArgumentException();
}
- this.validate = validate.booleanValue();
+ this.validate = validate;
}
public boolean getValidating(){
diff --git a/batik-test/src/main/java/org/apache/batik/test/MemoryLeakTest.java b/batik-test/src/main/java/org/apache/batik/test/MemoryLeakTest.java
index 7ce58e4..ac64450 100644
--- a/batik-test/src/main/java/org/apache/batik/test/MemoryLeakTest.java
+++ b/batik-test/src/main/java/org/apache/batik/test/MemoryLeakTest.java
@@ -22,7 +22,6 @@
import java.util.List;
import java.util.Map;
import java.util.HashMap;
-import java.util.Iterator;
import org.apache.batik.test.AbstractTest;
import org.apache.batik.test.DefaultTestReport;
@@ -95,9 +94,8 @@
// System.err.println("FreeMemory: " + rt.freeMemory() +
// " of " +rt.totalMemory());
- for (int i=0; i<descs.length; i++) {
- String desc = descs[i];
- WeakRef wr = (WeakRef)objs.get(desc);
+ for (String desc : descs) {
+ WeakRef wr = (WeakRef) objs.get(desc);
if ((wr == null) || (wr.get() == null)) continue;
passed = false;
break;
@@ -122,9 +120,8 @@
StringBuffer sb = new StringBuffer();
boolean passed = true;
synchronized (objs) {
- for (int i=0; i<descs.length; i++) {
- String desc = descs[i];
- WeakRef wr = (WeakRef)objs.get(desc);
+ for (String desc : descs) {
+ WeakRef wr = (WeakRef) objs.get(desc);
if (wr == null) continue;
Object o = wr.get();
if (o == null) continue;
@@ -169,9 +166,8 @@
boolean passed = true;
synchronized (objs) {
- Iterator iter = objs.values().iterator();
- while (iter.hasNext()) {
- WeakRef wr = (WeakRef)iter.next();
+ for (Object o : objs.values()) {
+ WeakRef wr = (WeakRef) o;
if ((wr != null) && (wr.get() != null)) {
passed = false;
break;
@@ -198,9 +194,8 @@
StringBuffer sb = new StringBuffer();
synchronized (objs) {
boolean passed = true;
- Iterator iter = objs.values().iterator();
- while (iter.hasNext()) {
- WeakRef wr = (WeakRef)iter.next();
+ for (Object o1 : objs.values()) {
+ WeakRef wr = (WeakRef) o1;
Object o = wr.get();
if (o == null) continue;
if (!passed)
diff --git a/batik-test/src/main/java/org/apache/batik/test/xml/XMLReflect.java b/batik-test/src/main/java/org/apache/batik/test/xml/XMLReflect.java
index 3abe115..37c22ba 100644
--- a/batik-test/src/main/java/org/apache/batik/test/xml/XMLReflect.java
+++ b/batik-test/src/main/java/org/apache/batik/test/xml/XMLReflect.java
@@ -94,8 +94,8 @@
String argsClassesStr = "null";
if (argsClasses != null) {
argsClassesStr = "";
- for (int i=0; i<argsClasses.length; i++) {
- argsClassesStr += argsClasses[i].getName() + " / ";
+ for (Class argsClass : argsClasses) {
+ argsClassesStr += argsClass.getName() + " / ";
}
}
throw new Exception(Messages.formatMessage(NO_MATCHING_CONSTRUCTOR,
@@ -203,24 +203,23 @@
public static Constructor getDeclaredConstructor(Class cl,
Class[] argClasses){
Constructor[] cs = cl.getDeclaredConstructors();
- for(int i=0; i<cs.length; i++){
- Class[] reqArgClasses = cs[i].getParameterTypes();
- if(reqArgClasses != null && reqArgClasses.length > 0){
- if(reqArgClasses.length == argClasses.length){
- int j=0;
- for(; j<argClasses.length; j++){
- if(!reqArgClasses[j].isAssignableFrom(argClasses[j])){
+ for (Constructor c : cs) {
+ Class[] reqArgClasses = c.getParameterTypes();
+ if (reqArgClasses != null && reqArgClasses.length > 0) {
+ if (reqArgClasses.length == argClasses.length) {
+ int j = 0;
+ for (; j < argClasses.length; j++) {
+ if (!reqArgClasses[j].isAssignableFrom(argClasses[j])) {
break;
}
}
- if(j == argClasses.length){
- return cs[i];
+ if (j == argClasses.length) {
+ return c;
}
}
- }
- else{
- if(argClasses == null || argClasses.length == 0){
- return cs[i];
+ } else {
+ if (argClasses == null || argClasses.length == 0) {
+ return c;
}
}
}
diff --git a/batik-test/src/main/java/org/apache/batik/test/xml/XMLTestSuiteRunner.java b/batik-test/src/main/java/org/apache/batik/test/xml/XMLTestSuiteRunner.java
index 47eee62..ca183e9 100644
--- a/batik-test/src/main/java/org/apache/batik/test/xml/XMLTestSuiteRunner.java
+++ b/batik-test/src/main/java/org/apache/batik/test/xml/XMLTestSuiteRunner.java
@@ -127,8 +127,8 @@
public IdBasedTestFilter(String[] ids){
this.ids = ids;
- for(int i=0; i<ids.length; i++){
- unmatchedIds.add(ids[i]);
+ for (String id : ids) {
+ unmatchedIds.add(id);
}
}
@@ -194,7 +194,7 @@
}
protected boolean isRequestedId(String id){
- for(int i=0; i<ids.length; i++){
+ for (String id1 : ids) {
//
// id substring of ids[i]
// ======================
@@ -213,15 +213,15 @@
// "all.B" (ids[0]) is a substring of "all.B.B3" (id)
// Conclusion: id is accepted because it is a child test of ids[0]
//
- if(ids[i].lastIndexOf(id) == 0){
+ if (id1.lastIndexOf(id) == 0) {
// System.out.println("accepting " + id + ". It is (or is the a parent of) " + ids[i]);
- unmatchedIds.remove(ids[i]);
+ unmatchedIds.remove(id1);
return true;
}
- if(id.lastIndexOf(ids[i]) != -1){
+ if (id.lastIndexOf(id1) != -1) {
// System.out.println("accepting " + id + " it is (or is a child of) the requested " + ids[i]);
- unmatchedIds.remove(ids[i]);
+ unmatchedIds.remove(id1);
return true;
}
}
diff --git a/batik-test/src/main/java/org/apache/batik/test/xml/XMLTestSuiteRunnerValidator.java b/batik-test/src/main/java/org/apache/batik/test/xml/XMLTestSuiteRunnerValidator.java
index 33248c1..58c5c4e 100644
--- a/batik-test/src/main/java/org/apache/batik/test/xml/XMLTestSuiteRunnerValidator.java
+++ b/batik-test/src/main/java/org/apache/batik/test/xml/XMLTestSuiteRunnerValidator.java
@@ -146,8 +146,8 @@
"all.A.AG.AG1", "all.A.AG.AG2"}}
};
- for(int i=0; i<config.length; i++){
- addTest(new XMLTestSuiteRunnerTest(config[i]));
+ for (Object[] aConfig : config) {
+ addTest(new XMLTestSuiteRunnerTest(aConfig));
}
}
@@ -266,8 +266,8 @@
if(r instanceof TestSuiteReport){
TestReport[] c = ((TestSuiteReport)r).getChildrenReports();
if(c != null){
- for(int i=0; i<c.length; i++){
- appendReportIds(c[i], sb);
+ for (TestReport aC : c) {
+ appendReportIds(aC, sb);
}
}
}
@@ -287,8 +287,8 @@
if(r instanceof TestSuiteReport){
TestReport[] c = ((TestSuiteReport)r).getChildrenReports();
if(c != null){
- for(int i=0; i<c.length; i++){
- appendReportIds(c[i], sb);
+ for (TestReport aC : c) {
+ appendReportIds(aC, sb);
}
}
}
@@ -328,11 +328,11 @@
if(report instanceof TestSuiteReport){
TestReport[] childReports = ((TestSuiteReport)report).getChildrenReports();
if(childReports != null){
- for(int i=0; i<childReports.length; i++){
+ for (TestReport childReport : childReports) {
String idNotExpected
- = checkTestReport(childReports[i],
- idSet);
- if(idNotExpected != null){
+ = checkTestReport(childReport,
+ idSet);
+ if (idNotExpected != null) {
return idNotExpected;
}
}
diff --git a/batik-transcoder/src/main/java/org/apache/batik/transcoder/TranscodingHints.java b/batik-transcoder/src/main/java/org/apache/batik/transcoder/TranscodingHints.java
index 8f9d72c..c2ebb62 100644
--- a/batik-transcoder/src/main/java/org/apache/batik/transcoder/TranscodingHints.java
+++ b/batik-transcoder/src/main/java/org/apache/batik/transcoder/TranscodingHints.java
@@ -19,7 +19,6 @@
package org.apache.batik.transcoder;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
/**
@@ -129,9 +128,8 @@
if (m instanceof TranscodingHints) {
putAll(((TranscodingHints) m));
} else {
- Iterator iter = m.entrySet().iterator();
- while (iter.hasNext()) {
- Map.Entry entry = (Map.Entry) iter.next();
+ for (Object o : m.entrySet()) {
+ Entry entry = (Entry) o;
put(entry.getKey(), entry.getValue());
}
}
diff --git a/batik-transcoder/src/main/java/org/apache/batik/transcoder/print/PrintTranscoder.java b/batik-transcoder/src/main/java/org/apache/batik/transcoder/print/PrintTranscoder.java
index ab5e45a..0f23e37 100644
--- a/batik-transcoder/src/main/java/org/apache/batik/transcoder/print/PrintTranscoder.java
+++ b/batik-transcoder/src/main/java/org/apache/batik/transcoder/print/PrintTranscoder.java
@@ -781,9 +781,9 @@
// First, request the transcoder to transcode
// each of the input files
//
- for(int i=0; i<args.length; i++){
- transcoder.transcode(new TranscoderInput(new File(args[i]).toURI().toURL().toString()),
- null);
+ for (String arg : args) {
+ transcoder.transcode(new TranscoderInput(new File(arg).toURI().toURL().toString()),
+ null);
}
//
diff --git a/batik-transcoder/src/main/java/org/apache/batik/transcoder/svg2svg/OutputManager.java b/batik-transcoder/src/main/java/org/apache/batik/transcoder/svg2svg/OutputManager.java
index 4546e96..ac5653e 100644
--- a/batik-transcoder/src/main/java/org/apache/batik/transcoder/svg2svg/OutputManager.java
+++ b/batik-transcoder/src/main/java/org/apache/batik/transcoder/svg2svg/OutputManager.java
@@ -134,8 +134,8 @@
* Prints a char array.
*/
public void printCharacters(char[] ca) throws IOException {
- for (int i = 0; i < ca.length; i++) {
- printCharacter(ca[i]);
+ for (char aCa : ca) {
+ printCharacter(aCa);
}
}
@@ -507,16 +507,15 @@
printCharacter(ai.delimiter);
}
} else {
- Iterator it = attributes.iterator();
- while (it.hasNext()) {
- AttributeInfo ai = (AttributeInfo)it.next();
+ for (Object attribute : attributes) {
+ AttributeInfo ai = (AttributeInfo) attribute;
if (ai.isAttribute("xml:space")) {
xmlSpace.set(0, (ai.value.equals("preserve")
- ? Boolean.TRUE
- : Boolean.FALSE));
+ ? Boolean.TRUE
+ : Boolean.FALSE));
}
-
+
printSpaces(ai.space, false);
printCharacters(ai.name);
@@ -725,8 +724,8 @@
*/
protected int newlines(char[] text) {
int result = 0;
- for (int i = 0; i < text.length; i++) {
- if (text[i] == 10) {
+ for (char aText : text) {
+ if (aText == 10) {
result++;
}
}
@@ -737,8 +736,8 @@
* Tells whether the given character represents white spaces.
*/
protected boolean isWhiteSpace(char[] text) {
- for (int i = 0; i < text.length; i++) {
- if (!XMLUtilities.isXMLSpace(text[i])) {
+ for (char aText : text) {
+ if (!XMLUtilities.isXMLSpace(aText)) {
return false;
}
}
diff --git a/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/WMFPainter.java b/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/WMFPainter.java
index fc5b319..6857095 100644
--- a/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/WMFPainter.java
+++ b/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/WMFPainter.java
@@ -43,7 +43,6 @@
import java.awt.image.ImageObserver;
import java.io.BufferedInputStream;
import java.text.AttributedCharacterIterator;
-import java.util.Iterator;
import java.util.Stack;
import java.util.List;
import java.util.ArrayList;
@@ -1065,9 +1064,8 @@
/** Just to be consistent with PolyPolygon filling.
*/
private void drawPolyPolygon(Graphics2D g2d, List pols) {
- Iterator it = pols.iterator();
- while (it.hasNext()) {
- Polygon2D pol = (Polygon2D)(it.next());
+ for (Object pol1 : pols) {
+ Polygon2D pol = (Polygon2D) (pol1);
g2d.draw(pol);
}
}
@@ -1081,8 +1079,8 @@
g2d.fill((Polygon2D)(pols.get(0)));
} else {
GeneralPath path = new GeneralPath(GeneralPath.WIND_EVEN_ODD);
- for (int i = 0; i < pols.size(); i++) {
- Polygon2D pol = (Polygon2D)(pols.get(i));
+ for (Object pol1 : pols) {
+ Polygon2D pol = (Polygon2D) pol1;
path.append(pol, false);
}
g2d.fill(path);
diff --git a/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/WMFTranscoder.java b/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/WMFTranscoder.java
index 38ab412..d68fa1b 100644
--- a/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/WMFTranscoder.java
+++ b/batik-transcoder/src/main/java/org/apache/batik/transcoder/wmf/tosvg/WMFTranscoder.java
@@ -248,13 +248,11 @@
WMFTranscoder transcoder = new WMFTranscoder();
int nFiles = args.length;
- for(int i=0; i<nFiles; i++){
- String fileName = args[i];
- if(!fileName.toLowerCase().endsWith(WMF_EXTENSION)){
- System.err.println(args[i] + " does not have the " + WMF_EXTENSION + " extension. It is ignored");
- }
- else{
- System.out.print("Processing : " + args[i] + "...");
+ for (String fileName : args) {
+ if (!fileName.toLowerCase().endsWith(WMF_EXTENSION)) {
+ System.err.println(fileName + " does not have the " + WMF_EXTENSION + " extension. It is ignored");
+ } else {
+ System.out.print("Processing : " + fileName + "...");
String outputFileName = fileName.substring(0, fileName.toLowerCase().indexOf(WMF_EXTENSION)) + SVG_EXTENSION;
File inputFile = new File(fileName);
File outputFile = new File(outputFileName);
@@ -262,9 +260,9 @@
TranscoderInput input = new TranscoderInput(inputFile.toURI().toURL().toString());
TranscoderOutput output = new TranscoderOutput(new FileOutputStream(outputFile));
transcoder.transcode(input, output);
- }catch(MalformedURLException e){
+ } catch (MalformedURLException e) {
throw new TranscoderException(e);
- }catch(IOException e){
+ } catch (IOException e) {
throw new TranscoderException(e);
}
System.out.println(".... Done");
diff --git a/batik-util/src/main/java/org/apache/batik/util/ClassFileUtilities.java b/batik-util/src/main/java/org/apache/batik/util/ClassFileUtilities.java
index 28e9394..a733175 100644
--- a/batik-util/src/main/java/org/apache/batik/util/ClassFileUtilities.java
+++ b/batik-util/src/main/java/org/apache/batik/util/ClassFileUtilities.java
@@ -90,9 +90,9 @@
File cwd = new File(".");
File buildDir = null;
String[] cwdFiles = cwd.list();
- for (int i = 0; i < cwdFiles.length; i++) {
- if (cwdFiles[i].startsWith("batik-")) {
- buildDir = new File(cwdFiles[i]);
+ for (String cwdFile : cwdFiles) {
+ if (cwdFile.startsWith("batik-")) {
+ buildDir = new File(cwdFile);
if (!buildDir.isDirectory()) {
buildDir = null;
} else {
@@ -122,9 +122,8 @@
// System.out.println(fromFile.name);
Set result = getClassDependencies(fromFile.getInputStream(),
classpath, false);
- Iterator j = result.iterator();
- while (j.hasNext()) {
- ClassFile toFile = (ClassFile) cs.get(j.next());
+ for (Object aResult : result) {
+ ClassFile toFile = (ClassFile) cs.get(aResult);
if (fromFile != toFile && toFile != null) {
fromFile.deps.add(toFile);
}
@@ -134,9 +133,8 @@
i = cs.values().iterator();
while (i.hasNext()) {
ClassFile fromFile = (ClassFile) i.next();
- Iterator j = fromFile.deps.iterator();
- while (j.hasNext()) {
- ClassFile toFile = (ClassFile) j.next();
+ for (Object dep : fromFile.deps) {
+ ClassFile toFile = (ClassFile) dep;
Jar fromJar = fromFile.jar;
Jar toJar = toFile.jar;
if (fromFile.name.equals(toFile.name)
@@ -157,9 +155,8 @@
i = js.values().iterator();
while (i.hasNext()) {
Jar fromJar = (Jar) i.next();
- Iterator j = fromJar.deps.keySet().iterator();
- while (j.hasNext()) {
- Jar toJar = (Jar) j.next();
+ for (Object o : fromJar.deps.keySet()) {
+ Jar toJar = (Jar) o;
Triple t = new Triple();
t.from = fromJar;
t.to = toJar;
@@ -175,17 +172,15 @@
System.out.println
(t.count + "," + t.from.name + "," + t.to.name);
if (showFiles) {
- Iterator j = t.from.files.iterator();
- while (j.hasNext()) {
- ClassFile fromFile = (ClassFile) j.next();
- Iterator k = fromFile.deps.iterator();
- while (k.hasNext()) {
- ClassFile toFile = (ClassFile) k.next();
+ for (Object file : t.from.files) {
+ ClassFile fromFile = (ClassFile) file;
+ for (Object dep : fromFile.deps) {
+ ClassFile toFile = (ClassFile) dep;
if (toFile.jar == t.to
&& !t.from.files.contains(toFile.name)) {
System.out.println
- ("\t" + fromFile.name + " --> "
- + toFile.name);
+ ("\t" + fromFile.name + " --> "
+ + toFile.name);
}
}
}
@@ -224,13 +219,13 @@
private static void collectJars(File dir, Map jars, Map classFiles) throws IOException {
File[] files = dir.listFiles();
- for (int i = 0; i < files.length; i++) {
- String n = files[i].getName();
- if (n.endsWith(".jar") && files[i].isFile()) {
+ for (File file : files) {
+ String n = file.getName();
+ if (n.endsWith(".jar") && file.isFile()) {
Jar j = new Jar();
- j.name = files[i].getPath();
- j.file = files[i];
- j.jarFile = new JarFile(files[i]);
+ j.name = file.getPath();
+ j.file = file;
+ j.jarFile = new JarFile(file);
jars.put(j.name, j);
Enumeration entries = j.jarFile.entries();
@@ -245,8 +240,8 @@
j.files.add(cf);
}
}
- } else if (files[i].isDirectory()) {
- collectJars(files[i], jars, classFiles);
+ } else if (file.isDirectory()) {
+ collectJars(file, jars, classFiles);
}
}
}
@@ -286,17 +281,15 @@
boolean rec)
throws IOException {
- Iterator it = getClassDependencies(is).iterator();
- while (it.hasNext()) {
- String s = (String)it.next();
+ for (Object o : getClassDependencies(is)) {
+ String s = (String) o;
if (!done.contains(s)) {
done.add(s);
- Iterator cpit = classpath.iterator();
- while (cpit.hasNext()) {
+ for (Object aClasspath : classpath) {
InputStream depis = null;
String path = null;
- Object cpEntry = cpit.next();
+ Object cpEntry = aClasspath;
if (cpEntry instanceof JarFile) {
JarFile jarFile = (JarFile) cpEntry;
String classFileName = s + ".class";
@@ -318,7 +311,7 @@
if (rec) {
computeClassDependencies
- (depis, classpath, done, result, rec);
+ (depis, classpath, done, result, rec);
}
}
}
diff --git a/batik-util/src/main/java/org/apache/batik/util/DoublyIndexedTable.java b/batik-util/src/main/java/org/apache/batik/util/DoublyIndexedTable.java
index 65e31df..d17240e 100644
--- a/batik-util/src/main/java/org/apache/batik/util/DoublyIndexedTable.java
+++ b/batik-util/src/main/java/org/apache/batik/util/DoublyIndexedTable.java
@@ -168,8 +168,8 @@
Object[] values = new Object[count];
int i = 0;
- for (int index = 0; index < table.length; index++) {
- for (Entry e = table[index]; e != null; e = e.next) {
+ for (Entry aTable : table) {
+ for (Entry e = aTable; e != null; e = e.next) {
values[i++] = e.value;
}
}
diff --git a/batik-util/src/main/java/org/apache/batik/util/ParsedURL.java b/batik-util/src/main/java/org/apache/batik/util/ParsedURL.java
index d2065d8..c74907b 100644
--- a/batik-util/src/main/java/org/apache/batik/util/ParsedURL.java
+++ b/batik-util/src/main/java/org/apache/batik/util/ParsedURL.java
@@ -424,8 +424,7 @@
*/
public InputStream openStream(String [] mimeTypes) throws IOException {
List mt = new ArrayList(mimeTypes.length);
- for (int i=0; i<mimeTypes.length; i++)
- mt.add(mimeTypes[i]);
+ for (String mimeType : mimeTypes) mt.add(mimeType);
return data.openStream(userAgent, mt.iterator());
}
diff --git a/batik-util/src/main/java/org/apache/batik/util/PreferenceManager.java b/batik-util/src/main/java/org/apache/batik/util/PreferenceManager.java
index 6dc3a32..cc7fe83 100644
--- a/batik-util/src/main/java/org/apache/batik/util/PreferenceManager.java
+++ b/batik-util/src/main/java/org/apache/batik/util/PreferenceManager.java
@@ -720,9 +720,9 @@
{
int j = 0;
if (values != null)
- for (int i = 0; i < values.length; i++) {
- if (values[i] != null) {
- setString(mkey+j, values[i]);
+ for (String value : values) {
+ if (value != null) {
+ setString(mkey + j, value);
j++;
}
}
@@ -756,9 +756,9 @@
{
int j = 0;
if (values != null)
- for (int i = 0 ; i < values.length; i++) {
- if (values[i] != null) {
- setURL(mkey+j, values[i]);
+ for (URL value : values) {
+ if (value != null) {
+ setURL(mkey + j, value);
j++;
}
}
@@ -792,9 +792,9 @@
{
int j = 0;
if (values != null)
- for (int i = 0 ; i < values.length; i++) {
- if (values[i] != null) {
- setFile(mkey+j, values[i]);
+ for (File value : values) {
+ if (value != null) {
+ setFile(mkey + j, value);
j++;
}
}
diff --git a/test-sources/org/apache/batik/apps/rasterizer/SVGConverterTest.java b/test-sources/org/apache/batik/apps/rasterizer/SVGConverterTest.java
index 189f764..d704543 100644
--- a/test-sources/org/apache/batik/apps/rasterizer/SVGConverterTest.java
+++ b/test-sources/org/apache/batik/apps/rasterizer/SVGConverterTest.java
@@ -84,7 +84,7 @@
t.setId("HintsConfigTest.KEY_AOI");
t = new HintsConfigTest(new Object[][]{
- {JPEGTranscoder.KEY_QUALITY, Float.valueOf(.5f)}}){
+ {JPEGTranscoder.KEY_QUALITY, .5f}}){
protected void deltaConfigure(SVGConverter c){
c.setQuality(.5f);
}
@@ -94,7 +94,7 @@
t.setId("HintsConfigTest.KEY_QUALITY");
t = new HintsConfigTest(new Object[][]{
- {PNGTranscoder.KEY_INDEXED, Integer.valueOf(8)}}){
+ {PNGTranscoder.KEY_INDEXED, 8}}){
protected void deltaConfigure(SVGConverter c){
c.setIndexed(8);
}
@@ -113,7 +113,7 @@
t.setId("HintsConfigTest.KEY_BACKGROUND_COLOR");
t = new HintsConfigTest(new Object[][]{
- {ImageTranscoder.KEY_HEIGHT, Float.valueOf(50)}}){
+ {ImageTranscoder.KEY_HEIGHT, 50f}}){
protected void deltaConfigure(SVGConverter c){
c.setHeight(50);
}
@@ -123,7 +123,7 @@
t.setId("HintsConfigTest.KEY_HEIGHT");
t = new HintsConfigTest(new Object[][]{
- {ImageTranscoder.KEY_WIDTH, Float.valueOf(50)}}){
+ {ImageTranscoder.KEY_WIDTH, 50f}}){
protected void deltaConfigure(SVGConverter c){
c.setWidth(50);
}
@@ -133,7 +133,7 @@
t.setId("HintsConfigTest.KEY_WIDTH");
t = new HintsConfigTest(new Object[][]{
- {ImageTranscoder.KEY_MAX_HEIGHT, Float.valueOf(50)}}){
+ {ImageTranscoder.KEY_MAX_HEIGHT, 50f}}){
protected void deltaConfigure(SVGConverter c){
c.setMaxHeight(50);
}
@@ -142,7 +142,7 @@
t.setId("HintsConfigTest.KEY_MAX_HEIGHT");
t = new HintsConfigTest(new Object[][]{
- {ImageTranscoder.KEY_MAX_WIDTH, Float.valueOf(50)}}){
+ {ImageTranscoder.KEY_MAX_WIDTH, 50f}}){
protected void deltaConfigure(SVGConverter c){
c.setMaxWidth(50);
}
@@ -199,7 +199,7 @@
t.setId("HintsConfigTest.KEY_LANGUAGE");
t = new HintsConfigTest(new Object[][]{
- {ImageTranscoder.KEY_PIXEL_UNIT_TO_MILLIMETER, Float.valueOf(.5f)}}){
+ {ImageTranscoder.KEY_PIXEL_UNIT_TO_MILLIMETER, .5f}}){
protected void deltaConfigure(SVGConverter c){
c.setPixelUnitToMillimeter(.5f);
}
@@ -545,8 +545,8 @@
protected String makeSourceList(List v){
int n = v.size();
StringBuffer sb = new StringBuffer( n * 8 );
- for (int i=0; i<n; i++){
- sb.append( v.get(i).toString() );
+ for (Object aV : v) {
+ sb.append(aV.toString());
}
return sb.toString();
@@ -690,25 +690,23 @@
return report;
}
- Iterator iter = expectedConfig.hints.keySet().iterator();
- while (iter.hasNext()){
- Object hintKey = iter.next();
+ for (Object hintKey : expectedConfig.hints.keySet()) {
Object expectedHintValue = expectedConfig.hints.get(hintKey);
Object computedHintValue = computedConfig.hints.get(hintKey);
- if (!expectedHintValue.equals(computedHintValue)){
+ if (!expectedHintValue.equals(computedHintValue)) {
TestReport report = reportError(ERROR_UNEXPECTED_TRANSCODING_HINT);
report.addDescriptionEntry(ENTRY_KEY_EXPECTED_HINT_KEY,
- hintKey.toString());
+ hintKey.toString());
report.addDescriptionEntry(ENTRY_KEY_EXPECTED_HINT_VALUE,
- expectedHintValue.toString());
+ expectedHintValue.toString());
report.addDescriptionEntry(ENTRY_KEY_COMPUTED_HINT_VALUE,
- "" + computedHintValue);
+ "" + computedHintValue);
report.addDescriptionEntry(ENTRY_KEY_EXPECTED_HINTS,
- makeHintsString(expectedConfig.hints));
+ makeHintsString(expectedConfig.hints));
report.addDescriptionEntry(ENTRY_KEY_COMPUTED_HINTS,
- makeHintsString(computedConfig.hints));
+ makeHintsString(computedConfig.hints));
return report;
}
@@ -840,8 +838,8 @@
// Add hints from constructor argument
//
int n = hintsMap.length;
- for (int i=0; i<n; i++){
- hints.put(hintsMap[i][0], hintsMap[i][1]);
+ for (Object[] aHintsMap : hintsMap) {
+ hints.put(aHintsMap[0], aHintsMap[1]);
}
config.hints = hints;
@@ -883,9 +881,9 @@
List sources = new ArrayList();
List dest = new ArrayList();
- for (int i=0; i<expectedSources.length; i++){
- sources.add(new SVGConverterFileSource(new File(expectedSources[i] + SVG_EXTENSION)));
- dest.add(new File(expectedSources[i] + DST_TYPE.getExtension()));
+ for (Object expectedSource : expectedSources) {
+ sources.add(new SVGConverterFileSource(new File(expectedSource + SVG_EXTENSION)));
+ dest.add(new File(expectedSource + DST_TYPE.getExtension()));
}
config.sources = sources;
config.dest = dest;
@@ -929,12 +927,12 @@
List sources = new ArrayList();
List dest = new ArrayList();
- for (int i=0; i<sourcesStrings.length; i++){
- sources.add(new SVGConverterFileSource(new File(sourcesStrings[i])));
+ for (String sourcesString : sourcesStrings) {
+ sources.add(new SVGConverterFileSource(new File(sourcesString)));
}
- for (int i=0; i<expectedDest.length; i++){
- dest.add(new File(expectedDest[i]));
+ for (String anExpectedDest : expectedDest) {
+ dest.add(new File(anExpectedDest));
}
config.sources = sources;
diff --git a/test-sources/org/apache/batik/bridge/EcmaLoadTest.java b/test-sources/org/apache/batik/bridge/EcmaLoadTest.java
index cce1d44..900a47f 100644
--- a/test-sources/org/apache/batik/bridge/EcmaLoadTest.java
+++ b/test-sources/org/apache/batik/bridge/EcmaLoadTest.java
@@ -55,10 +55,10 @@
//
for (int i=0; i<scriptSource.length; i++) {
for (int j=0; j<scriptOrigin[i].length; j++) {
- for (int k=0; k<secure.length; k++) {
- ScriptSelfTest t= buildTest(scripts, scriptSource[i],
- scriptOrigin[i][j],
- secure[k]);
+ for (boolean aSecure : secure) {
+ ScriptSelfTest t = buildTest(scripts, scriptSource[i],
+ scriptOrigin[i][j],
+ aSecure);
addTest(t);
}
}
diff --git a/test-sources/org/apache/batik/bridge/EcmaNoLoadTest.java b/test-sources/org/apache/batik/bridge/EcmaNoLoadTest.java
index dc8114d..c0ffbe0 100644
--- a/test-sources/org/apache/batik/bridge/EcmaNoLoadTest.java
+++ b/test-sources/org/apache/batik/bridge/EcmaNoLoadTest.java
@@ -45,15 +45,15 @@
// should not be loaded, no matter their origin or the
// other security settings.
//
- for (int i=0; i<scriptSource.length; i++) {
- for (int j=0; j<secure.length; j++) {
- for (int k=0; k<scriptOrigin.length; k++) {
+ for (String aScriptSource : scriptSource) {
+ for (boolean aSecure : secure) {
+ for (String aScriptOrigin : scriptOrigin) {
SVGOnLoadExceptionTest t = buildTest(scripts,
- scriptSource[i],
- scriptOrigin[k],
- secure[j],
- false,
- false);
+ aScriptSource,
+ aScriptOrigin,
+ aSecure,
+ false,
+ false);
addTest(t);
}
}
@@ -90,12 +90,12 @@
max = j+1;
}
for (int i=0; i<max; i++) {
- for (int k=0; k<secure.length; k++) {
- SVGOnLoadExceptionTest t= buildTest(scripts, scriptSource[i],
- scriptOrigin[j],
- secure[k],
- false,
- false);
+ for (boolean aSecure : secure) {
+ SVGOnLoadExceptionTest t = buildTest(scripts, scriptSource[i],
+ scriptOrigin[j],
+ aSecure,
+ false,
+ false);
addTest(t);
}
}
diff --git a/test-sources/org/apache/batik/bridge/ExternalResourcesTest.java b/test-sources/org/apache/batik/bridge/ExternalResourcesTest.java
index 5c87a58..439cb37 100644
--- a/test-sources/org/apache/batik/bridge/ExternalResourcesTest.java
+++ b/test-sources/org/apache/batik/bridge/ExternalResourcesTest.java
@@ -176,7 +176,7 @@
}
public void setSecure(Boolean secure) {
- this.secure = secure.booleanValue();
+ this.secure = secure;
}
/**
@@ -315,20 +315,19 @@
ids[i] = st.nextToken().trim();
}
- for (int i=0; i<ids.length; i++) {
- String id = ids[i];
+ for (String id : ids) {
userAgent = buildUserAgent();
builder = new GVTBuilder();
ctx = new BridgeContext(userAgent);
ctx.setDynamic(true);
- Document cloneDoc = (Document)doc.cloneNode(true);
+ Document cloneDoc = (Document) doc.cloneNode(true);
Element insertionPoint = cloneDoc.getElementById(INSERTION_POINT_ID);
if (insertionPoint == null) {
report.setErrorCode(ERROR_NO_INSERTION_POINT_IN_DOCUMENT);
report.addDescriptionEntry(ENTRY_KEY_INSERTION_POINT_ID,
- INSERTION_POINT_ID);
+ INSERTION_POINT_ID);
report.setPassed(false);
return report;
}
@@ -338,7 +337,7 @@
if (target == null) {
report.setErrorCode(ERROR_TARGET_ID_NOT_FOUND);
report.addDescriptionEntry(ENTRY_KEY_TARGET_ID,
- id);
+ id);
report.setPassed(false);
return report;
}
@@ -349,7 +348,7 @@
GraphicsNode gn = builder.build(ctx, cloneDoc);
gn.getBounds();
th = userAgent.getDisplayError();
- } catch (BridgeException e){
+ } catch (BridgeException e) {
th = e;
} catch (SecurityException e) {
th = e;
@@ -363,12 +362,12 @@
if (!secure)
failures.add(id);
} else if (th instanceof BridgeException) {
- BridgeException be = (BridgeException)th;
- if (!secure ||
- (secure && !ERR_URI_UNSECURE.equals(be.getCode()))) {
+ BridgeException be = (BridgeException) th;
+ if (!secure ||
+ (secure && !ERR_URI_UNSECURE.equals(be.getCode()))) {
report.setErrorCode(ERROR_WHILE_PROCESSING_SVG_DOCUMENT);
report.addDescriptionEntry(ENTRY_KEY_ERROR_DESCRIPTION,
- be.getMessage());
+ be.getMessage());
report.setPassed(false);
return report;
}
@@ -376,7 +375,7 @@
// Some unknown exception was displayed...
report.setErrorCode(ERROR_WHILE_PROCESSING_SVG_DOCUMENT);
report.addDescriptionEntry(ENTRY_KEY_ERROR_DESCRIPTION,
- th.getMessage());
+ th.getMessage());
report.setPassed(false);
return report;
}
@@ -389,15 +388,15 @@
if (secure) {
report.setErrorCode(ERROR_UNTHROWN_SECURITY_EXCEPTIONS);
- for (int i=0; i<failures.size(); i++) {
+ for (Object failure : failures) {
report.addDescriptionEntry(ENTRY_KEY_EXPECTED_EXCEPTION_ON,
- failures.get(i));
+ failure);
}
} else {
report.setErrorCode(ERROR_THROWN_SECURITY_EXCEPTIONS);
- for (int i=0; i<failures.size(); i++) {
+ for (Object failure : failures) {
report.addDescriptionEntry(ENTRY_KEY_UNEXPECTED_EXCEPTION_ON,
- failures.get(i));
+ failure);
}
}
diff --git a/test-sources/org/apache/batik/bridge/JarLoadTest.java b/test-sources/org/apache/batik/bridge/JarLoadTest.java
index 105501b..7e9d3bf 100644
--- a/test-sources/org/apache/batik/bridge/JarLoadTest.java
+++ b/test-sources/org/apache/batik/bridge/JarLoadTest.java
@@ -49,10 +49,10 @@
//
for (int i=0; i<scriptSource.length; i++) {
for (int j=0; j<=i; j++) {
- for (int k=0; k<secure.length; k++) {
- ScriptSelfTest t= buildTest(scripts, scriptSource[i],
- scriptOrigin[j],
- secure[k]);
+ for (boolean aSecure : secure) {
+ ScriptSelfTest t = buildTest(scripts, scriptSource[i],
+ scriptOrigin[j],
+ aSecure);
addTest(t);
}
}
diff --git a/test-sources/org/apache/batik/bridge/JarNoLoadTest.java b/test-sources/org/apache/batik/bridge/JarNoLoadTest.java
index 68f4ff3..11414ac 100644
--- a/test-sources/org/apache/batik/bridge/JarNoLoadTest.java
+++ b/test-sources/org/apache/batik/bridge/JarNoLoadTest.java
@@ -44,13 +44,13 @@
// should not be loaded, no matter their origin or the
// other security settings.
//
- for (int i=0; i<scriptSource.length; i++) {
- for (int j=0; j<secure.length; j++) {
- for (int k=0; k<scriptOrigin.length; k++) {
+ for (String aScriptSource : scriptSource) {
+ for (boolean aSecure : secure) {
+ for (String aScriptOrigin : scriptOrigin) {
SVGOnLoadExceptionTest t = buildTest(scripts,
- scriptSource[i],
- scriptOrigin[k],
- secure[j]);
+ aScriptSource,
+ aScriptOrigin,
+ aSecure);
addTest(t);
}
}
@@ -65,10 +65,10 @@
scripts = "application/java-archive";
for (int j=0; j<scriptOrigin.length; j++) {
for (int i=0; i<j; i++) {
- for (int k=0; k<secure.length; k++) {
- SVGOnLoadExceptionTest t= buildTest(scripts, scriptSource[i],
- scriptOrigin[j],
- secure[k]);
+ for (boolean aSecure : secure) {
+ SVGOnLoadExceptionTest t = buildTest(scripts, scriptSource[i],
+ scriptOrigin[j],
+ aSecure);
addTest(t);
}
}
diff --git a/test-sources/org/apache/batik/css/engine/value/PropertyManagerTest.java b/test-sources/org/apache/batik/css/engine/value/PropertyManagerTest.java
index 6c3b40c..ae577a6 100644
--- a/test-sources/org/apache/batik/css/engine/value/PropertyManagerTest.java
+++ b/test-sources/org/apache/batik/css/engine/value/PropertyManagerTest.java
@@ -151,7 +151,7 @@
}
// test if the property is inherited or not
- if (isInherited.booleanValue() != manager.isInheritedProperty()) {
+ if (isInherited != manager.isInheritedProperty()) {
report.setErrorCode(ERROR_IS_INHERITED);
report.setPassed(false);
report.addDescriptionEntry(ERROR_IS_INHERITED, "");
@@ -177,15 +177,15 @@
// test all possible identifiers
if (identValues != null) {
try {
- for (int i=0; i < identValues.length; ++i) {
- LexicalUnit lu = cssParser.parsePropertyValue(identValues[i]);
+ for (String identValue : identValues) {
+ LexicalUnit lu = cssParser.parsePropertyValue(identValue);
Value v = manager.createValue(lu, null);
String s = v.getCssText();
- if (!identValues[i].equalsIgnoreCase(s)) {
+ if (!identValue.equalsIgnoreCase(s)) {
report.setErrorCode(ERROR_INVALID_VALUE);
report.setPassed(false);
report.addDescriptionEntry(ERROR_INVALID_VALUE,
- identValues[i]+ '/' +s);
+ identValue + '/' + s);
}
}
} catch (Exception ex) {
diff --git a/test-sources/org/apache/batik/gvt/TextSelectionTest.java b/test-sources/org/apache/batik/gvt/TextSelectionTest.java
index 84cac26..5439767 100644
--- a/test-sources/org/apache/batik/gvt/TextSelectionTest.java
+++ b/test-sources/org/apache/batik/gvt/TextSelectionTest.java
@@ -126,8 +126,8 @@
public TextSelectionTest(String file, String textID,
Integer start, Integer end) {
this.textID = textID;
- this.start = start.intValue();
- this.end = end.intValue();
+ this.start = start;
+ this.end = end;
super.setFile(file);
}
diff --git a/test-sources/org/apache/batik/script/rhino/ScriptSelfTest.java b/test-sources/org/apache/batik/script/rhino/ScriptSelfTest.java
index 90b0c74..ecc42c2 100644
--- a/test-sources/org/apache/batik/script/rhino/ScriptSelfTest.java
+++ b/test-sources/org/apache/batik/script/rhino/ScriptSelfTest.java
@@ -50,7 +50,7 @@
}
public void setSecure(Boolean secure){
- this.secure = secure.booleanValue();
+ this.secure = secure;
}
public Boolean getSecure(){
@@ -58,7 +58,7 @@
}
public void setConstrain(Boolean constrain){
- this.constrain = constrain.booleanValue();
+ this.constrain = constrain;
}
public Boolean getConstrain(){
diff --git a/test-sources/org/apache/batik/svggen/AttributedCharacterIterator.java b/test-sources/org/apache/batik/svggen/AttributedCharacterIterator.java
index 3022cb8..9931e39 100644
--- a/test-sources/org/apache/batik/svggen/AttributedCharacterIterator.java
+++ b/test-sources/org/apache/batik/svggen/AttributedCharacterIterator.java
@@ -46,7 +46,7 @@
//
Font font = new Font(fontName, Font.PLAIN, fontSize);
styledText.addAttribute(TextAttribute.FAMILY, font.getFamily());
- styledText.addAttribute(TextAttribute.SIZE, Float.valueOf(font.getSize()));
+ styledText.addAttribute(TextAttribute.SIZE, (float) font.getSize());
styledText.addAttribute(TextAttribute.FOREGROUND, Color.black);
//
diff --git a/test-sources/org/apache/batik/svggen/BStroke.java b/test-sources/org/apache/batik/svggen/BStroke.java
index 584ff7d..60b4088 100644
--- a/test-sources/org/apache/batik/svggen/BStroke.java
+++ b/test-sources/org/apache/batik/svggen/BStroke.java
@@ -108,8 +108,8 @@
// Varying width
g.setPaint(Color.black);
g.drawString("Varying width", 10, 10);
- for(int i=0; i<strokesWidth.length; i++){
- g.setStroke(strokesWidth[i]);
+ for (BasicStroke aStrokesWidth : strokesWidth) {
+ g.setStroke(aStrokesWidth);
g.drawLine(10, 30, 10, 80);
g.translate(20, 0);
}
@@ -118,8 +118,8 @@
g.setTransform(defaultTransform);
g.translate(0, 120);
g.drawString("Varying end caps", 10, 10);
- for(int i=0; i<strokesCap.length; i++){
- g.setStroke(strokesCap[i]);
+ for (BasicStroke aStrokesCap : strokesCap) {
+ g.setStroke(aStrokesCap);
g.drawLine(15, 30, 15, 80);
g.translate(30, 0);
}
@@ -133,8 +133,8 @@
g.translate(0, 240);
g.drawString("Varying line joins", 10, 10);
g.translate(20, 20);
- for(int i=0; i<strokesJoin.length; i++){
- g.setStroke(strokesJoin[i]);
+ for (BasicStroke aStrokesJoin : strokesJoin) {
+ g.setStroke(aStrokesJoin);
g.draw(needle);
g.translate(35, 0);
}
@@ -149,8 +149,8 @@
miterShape.lineTo(0, 30); // 45 degree elbow.
g.drawString("Varying miter limit", 10, 10);
g.translate(10, 30);
- for(int i=0; i<strokesMiter.length; i++){
- g.setStroke(strokesMiter[i]);
+ for (BasicStroke aStrokesMiter : strokesMiter) {
+ g.setStroke(aStrokesMiter);
g.draw(miterShape);
g.translate(40, 0);
}
@@ -160,8 +160,8 @@
g.translate(150, 0);
g.drawString("Varying dash patterns", 10, 10);
g.translate(20, 0);
- for(int i=0; i<strokesDash.length; i++){
- g.setStroke(strokesDash[i]);
+ for (BasicStroke aStrokesDash : strokesDash) {
+ g.setStroke(aStrokesDash);
g.drawLine(10, 20, 10, 80);
g.translate(20, 0);
}
diff --git a/test-sources/org/apache/batik/svggen/DoubleStringPerformanceTest.java b/test-sources/org/apache/batik/svggen/DoubleStringPerformanceTest.java
index f2cad9c..f6a5e72 100644
--- a/test-sources/org/apache/batik/svggen/DoubleStringPerformanceTest.java
+++ b/test-sources/org/apache/batik/svggen/DoubleStringPerformanceTest.java
@@ -49,8 +49,8 @@
int maxLength = 0;
for (int i=0; i<1000; i++) {
- for (int j=0; j<testValues.length; j++) {
- maxLength = Math.max((gc.doubleString(testValues[j])).length(), maxLength);
+ for (double testValue : testValues) {
+ maxLength = Math.max((gc.doubleString(testValue)).length(), maxLength);
}
}
}
diff --git a/test-sources/org/apache/batik/svggen/Font1.java b/test-sources/org/apache/batik/svggen/Font1.java
index 7c72c52..f2236e5 100644
--- a/test-sources/org/apache/batik/svggen/Font1.java
+++ b/test-sources/org/apache/batik/svggen/Font1.java
@@ -57,14 +57,14 @@
g.setPaint(fontColor);
g.translate(0, 20);
int[] fontSizes = { 6, 8, 10, 12, 18, 36, 48 };
- for(int i=0; i<fontSizes.length; i++){
- java.awt.Font font = new java.awt.Font(defaultFont.getFamily(),
- java.awt.Font.PLAIN,
- fontSizes[i]);
+ for (int fontSize : fontSizes) {
+ Font font = new Font(defaultFont.getFamily(),
+ Font.PLAIN,
+ fontSize);
g.setFont(font);
g.drawString("aA", 10, 40);
double width = font.createGlyphVector(frc, "aA").getVisualBounds().getWidth();
- g.translate(width*1.2, 0);
+ g.translate(width * 1.2, 0);
}
g.setTransform(defaultTransform);
@@ -110,12 +110,12 @@
g.drawString("Font Families", 10, 30);
g.setPaint(fontColor);
- for(int i=0; i<fontFamilies.length; i++){
- java.awt.Font font = new java.awt.Font(fontFamilies[i], java.awt.Font.PLAIN, 18);
+ for (String fontFamily : fontFamilies) {
+ Font font = new Font(fontFamily, Font.PLAIN, 18);
g.setFont(font);
- double height = font.createGlyphVector(frc, fontFamilies[i]).getVisualBounds().getHeight();
- g.translate(0, height*1.4);
- g.drawString(fontFamilies[i], 10, 40);
+ double height = font.createGlyphVector(frc, fontFamily).getVisualBounds().getHeight();
+ g.translate(0, height * 1.4);
+ g.drawString(fontFamily, 10, 40);
}
//
@@ -133,11 +133,10 @@
g.drawString("Logical Fonts", 10, 0);
g.setPaint(fontColor);
- for(int i=0; i<logicalFonts.length; i++){
- Font font = logicalFonts[i];
+ for (Font font : logicalFonts) {
g.setFont(font);
double height = font.createGlyphVector(frc, font.getName()).getVisualBounds().getHeight();
- g.translate(0, height*1.4);
+ g.translate(0, height * 1.4);
g.drawString(font.getName(), 10, 0);
}
}
diff --git a/test-sources/org/apache/batik/svggen/Font2.java b/test-sources/org/apache/batik/svggen/Font2.java
index 880a2aa..4c99333 100644
--- a/test-sources/org/apache/batik/svggen/Font2.java
+++ b/test-sources/org/apache/batik/svggen/Font2.java
@@ -60,14 +60,14 @@
g.setPaint(fontColor);
g.translate(0, 20);
int[] fontSizes = { 6, 8, 10, 12, 18, 36, 48 };
- for(int i=0; i<fontSizes.length; i++){
+ for (int fontSize : fontSizes) {
Font font = new Font(defaultFont.getFamily(),
- Font.PLAIN,
- fontSizes[i]);
+ Font.PLAIN,
+ fontSize);
g.setFont(font);
g.drawString("aA", 10, 40);
double width = font.createGlyphVector(frc, "aA").getVisualBounds().getWidth();
- g.translate(width*1.2, 0);
+ g.translate(width * 1.2, 0);
}
g.setTransform(defaultTransform);
@@ -113,12 +113,12 @@
g.drawString("Font Families", 10, 30);
g.setPaint(fontColor);
- for(int i=0; i<fontFamilies.length; i++){
- Font font = new Font(fontFamilies[i], Font.PLAIN, 18);
+ for (String fontFamily : fontFamilies) {
+ Font font = new Font(fontFamily, Font.PLAIN, 18);
g.setFont(font);
- double height = font.createGlyphVector(frc, fontFamilies[i]).getVisualBounds().getHeight();
- g.translate(0, height*1.4);
- g.drawString(fontFamilies[i], 10, 40);
+ double height = font.createGlyphVector(frc, fontFamily).getVisualBounds().getHeight();
+ g.translate(0, height * 1.4);
+ g.drawString(fontFamily, 10, 40);
}
//
@@ -136,12 +136,11 @@
g.drawString("Logical Fonts", 10, 0);
g.setPaint(fontColor);
- for(int i=0; i<logicalFonts.length; i++){
- Font font = logicalFonts[i];
- g.setFont(font);
- double height = font.createGlyphVector(frc, font.getName()).getVisualBounds().getHeight();
- g.translate(0, height*1.4);
- g.drawString(font.getName(), 10, 0);
- }
+ for (Font font : logicalFonts) {
+ g.setFont(font);
+ double height = font.createGlyphVector(frc, font.getName()).getVisualBounds().getHeight();
+ g.translate(0, height * 1.4);
+ g.drawString(font.getName(), 10, 0);
+ }
}
}
diff --git a/test-sources/org/apache/batik/svggen/SVGAccuracyTest.java b/test-sources/org/apache/batik/svggen/SVGAccuracyTest.java
index a3b8b2a..8e40f5c 100644
--- a/test-sources/org/apache/batik/svggen/SVGAccuracyTest.java
+++ b/test-sources/org/apache/batik/svggen/SVGAccuracyTest.java
@@ -274,8 +274,8 @@
}
report.setErrorCode(ERROR_GENERATED_SVG_INACCURATE);
- report.addDescriptionEntry(Messages.formatMessage(ENTRY_KEY_LINE_NUMBER,null), Integer.valueOf(ln));
- report.addDescriptionEntry(Messages.formatMessage(ENTRY_KEY_COLUMN_NUMBER,null), Integer.valueOf(cn));
+ report.addDescriptionEntry(Messages.formatMessage(ENTRY_KEY_LINE_NUMBER,null), ln);
+ report.addDescriptionEntry(Messages.formatMessage(ENTRY_KEY_COLUMN_NUMBER,null), cn);
report.addDescriptionEntry(Messages.formatMessage(ENTRY_KEY_COLUMN_EXPECTED_VALUE,null), expectedChar);
report.addDescriptionEntry(Messages.formatMessage(ENTRY_KEY_COLUMN_FOUND_VALUE,null), foundChar);
report.addDescriptionEntry(Messages.formatMessage(ENTRY_KEY_REFERENCE_LINE,null), refLine);
diff --git a/test-sources/org/apache/batik/svggen/SVGGeneratorTests.java b/test-sources/org/apache/batik/svggen/SVGGeneratorTests.java
index 020e0ff..33a5f0c 100644
--- a/test-sources/org/apache/batik/svggen/SVGGeneratorTests.java
+++ b/test-sources/org/apache/batik/svggen/SVGGeneratorTests.java
@@ -153,8 +153,8 @@
String candidateReference = GENERATOR_REFERENCE_BASE + RENDERING_DIR + "/" + RENDERING_CANDIDATE_REF_DIR + "/" + cl + PNG_EXTENSION;
SVGRenderingAccuracyTest test = new SVGRenderingAccuracyTest(testSource, testReference);
- for (int i = 0; i < variationURLs.length; i++) {
- test.addVariationURL(variationURLs[i]);
+ for (String variationURL : variationURLs) {
+ test.addVariationURL(variationURL);
}
test.setSaveVariation(new File(saveVariation));
test.setCandidateReference(new File(candidateReference));
diff --git a/test-sources/org/apache/batik/swing/JSVGMemoryLeakTest.java b/test-sources/org/apache/batik/swing/JSVGMemoryLeakTest.java
index 1eceaf0..98887c8 100644
--- a/test-sources/org/apache/batik/swing/JSVGMemoryLeakTest.java
+++ b/test-sources/org/apache/batik/swing/JSVGMemoryLeakTest.java
@@ -150,14 +150,14 @@
UpdateManager um = getTheCanvas().getUpdateManager();
BridgeContext bc = um.getBridgeContext();
BridgeContext[] ctxs = bc.getChildContexts();
- for (int i = 0; i < ctxs.length; i++) {
- bc = ctxs[i];
+ for (BridgeContext ctx : ctxs) {
+ bc = ctx;
if (bc == null) {
continue;
}
String url = ((SVGOMDocument) bc.getDocument()).getURL();
if (url.indexOf(uriSubstring) != -1) {
- registerObjectDesc(ctxs[i], desc);
+ registerObjectDesc(ctx, desc);
}
}
}
@@ -195,10 +195,10 @@
registerObjectDesc(um, "updateManager");
registerObjectDesc(bc, "bridgeContext");
BridgeContext[] subCtxs = bc.getChildContexts();
- for (int i = 0; i < subCtxs.length; i++) {
- if (subCtxs[i] != null) {
- SVGOMDocument doc = (SVGOMDocument) subCtxs[i].getDocument();
- registerObjectDesc(subCtxs[i], "BridgeContext_" + doc.getURL());
+ for (BridgeContext subCtx : subCtxs) {
+ if (subCtx != null) {
+ SVGOMDocument doc = (SVGOMDocument) subCtx.getDocument();
+ registerObjectDesc(subCtx, "BridgeContext_" + doc.getURL());
}
}
}
diff --git a/test-sources/org/apache/batik/transcoder/image/AOITest.java b/test-sources/org/apache/batik/transcoder/image/AOITest.java
index 99c6604..83d76f7 100644
--- a/test-sources/org/apache/batik/transcoder/image/AOITest.java
+++ b/test-sources/org/apache/batik/transcoder/image/AOITest.java
@@ -69,9 +69,9 @@
x,
y,
width,
- height,
- Float.valueOf(-1),
- Float.valueOf(-1));
+ height,
+ (float) -1,
+ (float) -1);
}
/**
@@ -96,10 +96,10 @@
Float imgHeight) {
this.inputURI = inputURI;
this.refImageURI = refImageURI;
- this.aoi = new Rectangle2D.Float(x.floatValue(),
- y.floatValue(),
- width.floatValue(),
- height.floatValue());
+ this.aoi = new Rectangle2D.Float(x,
+ y,
+ width,
+ height);
this.imgWidth = imgWidth;
this.imgHeight = imgHeight;
}
@@ -117,10 +117,10 @@
protected Map createTranscodingHints() {
Map hints = new HashMap(11);
hints.put(ImageTranscoder.KEY_AOI, aoi);
- if (imgWidth.floatValue() > 0) {
+ if (imgWidth > 0) {
hints.put(ImageTranscoder.KEY_WIDTH, imgWidth);
}
- if (imgHeight.floatValue() > 0) {
+ if (imgHeight > 0) {
hints.put(ImageTranscoder.KEY_HEIGHT, imgHeight);
}
return hints;
diff --git a/test-sources/org/apache/batik/transcoder/image/DimensionTest.java b/test-sources/org/apache/batik/transcoder/image/DimensionTest.java
index 3d0bb1f..53ec702 100644
--- a/test-sources/org/apache/batik/transcoder/image/DimensionTest.java
+++ b/test-sources/org/apache/batik/transcoder/image/DimensionTest.java
@@ -74,10 +74,10 @@
*/
protected Map createTranscodingHints() {
Map hints = new HashMap(7);
- if (width.floatValue() > 0) {
+ if (width > 0) {
hints.put(ImageTranscoder.KEY_WIDTH, width);
}
- if (height.floatValue() > 0) {
+ if (height > 0) {
hints.put(ImageTranscoder.KEY_HEIGHT, height);
}
return hints;
diff --git a/test-sources/org/apache/batik/transcoder/image/MaxDimensionTest.java b/test-sources/org/apache/batik/transcoder/image/MaxDimensionTest.java
index 3988f57..fc6feb4 100644
--- a/test-sources/org/apache/batik/transcoder/image/MaxDimensionTest.java
+++ b/test-sources/org/apache/batik/transcoder/image/MaxDimensionTest.java
@@ -38,13 +38,13 @@
/** The URI of the reference image. */
protected String refImageURI;
/** The maximum width of the image. */
- protected Float maxWidth = Float.valueOf(Float.NaN);
+ protected Float maxWidth = Float.NaN;
/** The maximum height of the image. */
- protected Float maxHeight = Float.valueOf(Float.NaN);
+ protected Float maxHeight = Float.NaN;
/** The width of the image. */
- protected Float width = Float.valueOf(Float.NaN);
+ protected Float width = Float.NaN;
/** The height of the image. */
- protected Float height = Float.valueOf(Float.NaN);
+ protected Float height = Float.NaN;
//-- Constructors --------------------------------------------------------
@@ -98,16 +98,16 @@
*/
protected Map createTranscodingHints() {
Map hints = new HashMap(7);
- if (!width.isNaN() && width.floatValue() > 0) {
+ if (!width.isNaN() && width > 0) {
hints.put(ImageTranscoder.KEY_WIDTH, width);
}
- if (!height.isNaN() && height.floatValue() > 0) {
+ if (!height.isNaN() && height > 0) {
hints.put(ImageTranscoder.KEY_HEIGHT, height);
}
- if (maxWidth.floatValue() > 0) {
+ if (maxWidth > 0) {
hints.put(ImageTranscoder.KEY_MAX_WIDTH, maxWidth);
}
- if (maxHeight.floatValue() > 0) {
+ if (maxHeight > 0) {
hints.put(ImageTranscoder.KEY_MAX_HEIGHT, maxHeight);
}
return hints;
diff --git a/test-sources/org/apache/batik/transcoder/wmf/WMFAccuracyTest.java b/test-sources/org/apache/batik/transcoder/wmf/WMFAccuracyTest.java
index dd8c77d..806f9bf 100644
--- a/test-sources/org/apache/batik/transcoder/wmf/WMFAccuracyTest.java
+++ b/test-sources/org/apache/batik/transcoder/wmf/WMFAccuracyTest.java
@@ -316,9 +316,9 @@
report.setErrorCode(ERROR_GENERATED_SVG_INACCURATE);
report.addDescriptionEntry(fmtMsg(ENTRY_KEY_LINE_NUMBER),
- Integer.valueOf(line));
+ line);
report.addDescriptionEntry(fmtMsg(ENTRY_KEY_COLUMN_NUMBER),
- Integer.valueOf(cn));
+ cn);
report.addDescriptionEntry(fmtMsg(ENTRY_KEY_COLUMN_EXPECTED_VALUE),
expectedChar);
report.addDescriptionEntry(fmtMsg(ENTRY_KEY_COLUMN_FOUND_VALUE),
