Skip to content

Commit 5e363d0

Browse files
blackearsblackears
authored
Remove batik dependency. (#3)
* Removing batik dependency. * Removing dependency on Batik gradient code.
1 parent 9d03f97 commit 5e363d0

11 files changed

+20
-4212
lines changed

‎svg-core/src/main/java/com/kitfox/svg/LinearGradient.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737

3838
import com.kitfox.svg.xml.StyleAttribute;
3939
import java.awt.Color;
40+
import java.awt.LinearGradientPaint;
41+
import java.awt.MultipleGradientPaint;
4042
import java.awt.Paint;
4143
import java.awt.geom.AffineTransform;
4244
import java.awt.geom.Point2D;
@@ -96,18 +98,18 @@ protected void build() throws SVGException
9698

9799
public Paint getPaint(Rectangle2D bounds, AffineTransform xform)
98100
{
99-
com.kitfox.svg.batik.MultipleGradientPaint.CycleMethodEnum method;
101+
MultipleGradientPaint.CycleMethod method;
100102
switch (spreadMethod)
101103
{
102104
default:
103105
case SM_PAD:
104-
method = com.kitfox.svg.batik.MultipleGradientPaint.NO_CYCLE;
106+
method = MultipleGradientPaint.CycleMethod.NO_CYCLE;
105107
break;
106108
case SM_REPEAT:
107-
method = com.kitfox.svg.batik.MultipleGradientPaint.REPEAT;
109+
method = MultipleGradientPaint.CycleMethod.REPEAT;
108110
break;
109111
case SM_REFLECT:
110-
method = com.kitfox.svg.batik.MultipleGradientPaint.REFLECT;
112+
method = MultipleGradientPaint.CycleMethod.REFLECT;
111113
break;
112114
}
113115

@@ -120,13 +122,13 @@ public Paint getPaint(Rectangle2D bounds, AffineTransform xform)
120122
paint = colors.length > 0 ? colors[0] : Color.black;
121123
} else if (gradientUnits == GU_USER_SPACE_ON_USE)
122124
{
123-
paint = new com.kitfox.svg.batik.LinearGradientPaint(
125+
paint = new LinearGradientPaint(
124126
pt1,
125127
pt2,
126128
getStopFractions(),
127129
getStopColors(),
128130
method,
129-
com.kitfox.svg.batik.MultipleGradientPaint.SRGB,
131+
MultipleGradientPaint.ColorSpaceType.SRGB,
130132
gradientTransform == null
131133
? new AffineTransform()
132134
: gradientTransform);
@@ -145,13 +147,13 @@ public Paint getPaint(Rectangle2D bounds, AffineTransform xform)
145147
viewXform.concatenate(gradientTransform);
146148
}
147149

148-
paint = new com.kitfox.svg.batik.LinearGradientPaint(
150+
paint = new LinearGradientPaint(
149151
pt1,
150152
pt2,
151153
getStopFractions(),
152154
getStopColors(),
153155
method,
154-
com.kitfox.svg.batik.MultipleGradientPaint.SRGB,
156+
MultipleGradientPaint.ColorSpaceType.SRGB,
155157
viewXform);
156158
}
157159

‎svg-core/src/main/java/com/kitfox/svg/Path.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import java.awt.geom.GeneralPath;
4242
import java.awt.geom.Rectangle2D;
4343

44-
//import org.apache.batik.ext.awt.geom.ExtendedGeneralPath;
4544
/**
4645
* @author Mark McKay
4746
* @author <a href="mailto:mark@kitfox.com">Mark McKay</a>

‎svg-core/src/main/java/com/kitfox/svg/RadialGradient.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@
3636
package com.kitfox.svg;
3737

3838
import com.kitfox.svg.xml.StyleAttribute;
39-
import java.awt.Color;
39+
import java.awt.MultipleGradientPaint;
4040
import java.awt.Paint;
41+
import java.awt.RadialGradientPaint;
4142
import java.awt.geom.AffineTransform;
4243
import java.awt.geom.Point2D;
4344
import java.awt.geom.Rectangle2D;
@@ -106,18 +107,18 @@ protected void build() throws SVGException
106107

107108
public Paint getPaint(Rectangle2D bounds, AffineTransform xform)
108109
{
109-
com.kitfox.svg.batik.MultipleGradientPaint.CycleMethodEnum method;
110+
MultipleGradientPaint.CycleMethod method;
110111
switch (spreadMethod)
111112
{
112113
default:
113114
case SM_PAD:
114-
method = com.kitfox.svg.batik.MultipleGradientPaint.NO_CYCLE;
115+
method = MultipleGradientPaint.CycleMethod.NO_CYCLE;
115116
break;
116117
case SM_REPEAT:
117-
method = com.kitfox.svg.batik.MultipleGradientPaint.REPEAT;
118+
method = MultipleGradientPaint.CycleMethod.REPEAT;
118119
break;
119120
case SM_REFLECT:
120-
method = com.kitfox.svg.batik.MultipleGradientPaint.REFLECT;
121+
method = MultipleGradientPaint.CycleMethod.REFLECT;
121122
break;
122123
}
123124

@@ -126,14 +127,14 @@ public Paint getPaint(Rectangle2D bounds, AffineTransform xform)
126127
Point2D.Float pt2 = hasFocus ? new Point2D.Float(fx, fy) : pt1;
127128
if (gradientUnits == GU_USER_SPACE_ON_USE)
128129
{
129-
paint = new com.kitfox.svg.batik.RadialGradientPaint(
130+
paint = new RadialGradientPaint(
130131
pt1,
131132
r,
132133
pt2,
133134
getStopFractions(),
134135
getStopColors(),
135136
method,
136-
com.kitfox.svg.batik.MultipleGradientPaint.SRGB,
137+
MultipleGradientPaint.ColorSpaceType.SRGB,
137138
gradientTransform);
138139
} else
139140
{
@@ -143,14 +144,14 @@ public Paint getPaint(Rectangle2D bounds, AffineTransform xform)
143144

144145
viewXform.concatenate(gradientTransform);
145146

146-
paint = new com.kitfox.svg.batik.RadialGradientPaint(
147+
paint = new RadialGradientPaint(
147148
pt1,
148149
r,
149150
pt2,
150151
getStopFractions(),
151152
getStopColors(),
152153
method,
153-
com.kitfox.svg.batik.MultipleGradientPaint.SRGB,
154+
MultipleGradientPaint.ColorSpaceType.SRGB,
154155
viewXform);
155156
}
156157

‎svg-core/src/main/java/com/kitfox/svg/Text.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,9 @@
3636
package com.kitfox.svg;
3737

3838
import com.kitfox.svg.util.FontSystem;
39-
import com.kitfox.svg.util.TextBuilder;
4039
import com.kitfox.svg.xml.StyleAttribute;
4140
import java.awt.Graphics2D;
4241
import java.awt.Shape;
43-
import java.awt.font.FontRenderContext;
4442
import java.awt.geom.AffineTransform;
4543
import java.awt.geom.GeneralPath;
4644
import java.awt.geom.Point2D;
@@ -50,7 +48,6 @@
5048
import java.util.regex.Matcher;
5149
import java.util.regex.Pattern;
5250

53-
//import org.apache.batik.ext.awt.geom.ExtendedGeneralPath;
5451
/**
5552
* @author Mark McKay
5653
* @author <a href="mailto:mark@kitfox.com">Mark McKay</a>

0 commit comments

Comments
 (0)