diff options
Diffstat (limited to 'src')
17 files changed, 17 insertions, 28 deletions
diff --git a/src/jogl/classes/com/jogamp/graph/curve/OutlineShapeXForm.java b/src/jogl/classes/com/jogamp/graph/curve/OutlineShapeXForm.java index cf4d38450..1a21ea74f 100644 --- a/src/jogl/classes/com/jogamp/graph/curve/OutlineShapeXForm.java +++ b/src/jogl/classes/com/jogamp/graph/curve/OutlineShapeXForm.java @@ -1,6 +1,6 @@ package com.jogamp.graph.curve; -import jogamp.graph.geom.plane.AffineTransform; +import com.jogamp.graph.geom.plane.AffineTransform; public class OutlineShapeXForm { public final OutlineShape shape; diff --git a/src/jogl/classes/com/jogamp/graph/curve/Region.java b/src/jogl/classes/com/jogamp/graph/curve/Region.java index dde3858de..264b00b92 100644 --- a/src/jogl/classes/com/jogamp/graph/curve/Region.java +++ b/src/jogl/classes/com/jogamp/graph/curve/Region.java @@ -30,11 +30,11 @@ package com.jogamp.graph.curve; import java.util.ArrayList; import java.util.List; -import jogamp.graph.geom.plane.AffineTransform; import jogamp.opengl.Debug; import com.jogamp.graph.geom.Triangle; import com.jogamp.graph.geom.Vertex; +import com.jogamp.graph.geom.plane.AffineTransform; import com.jogamp.graph.curve.opengl.GLRegion; import com.jogamp.opengl.math.geom.AABBox; import com.jogamp.opengl.math.geom.Frustum; diff --git a/src/jogl/classes/com/jogamp/graph/curve/opengl/TextRegionUtil.java b/src/jogl/classes/com/jogamp/graph/curve/opengl/TextRegionUtil.java index 5423cde95..344e1e51f 100644 --- a/src/jogl/classes/com/jogamp/graph/curve/opengl/TextRegionUtil.java +++ b/src/jogl/classes/com/jogamp/graph/curve/opengl/TextRegionUtil.java @@ -33,15 +33,13 @@ import java.util.Iterator; import com.jogamp.opengl.GL2ES2; import com.jogamp.opengl.GLException; - -import jogamp.graph.geom.plane.AffineTransform; - import com.jogamp.graph.curve.OutlineShape; import com.jogamp.graph.curve.Region; import com.jogamp.graph.font.Font; import com.jogamp.graph.font.Font.Glyph; import com.jogamp.graph.geom.Vertex; import com.jogamp.graph.geom.Vertex.Factory; +import com.jogamp.graph.geom.plane.AffineTransform; /** * Text {@link GLRegion} Utility Class diff --git a/src/jogl/classes/com/jogamp/graph/font/Font.java b/src/jogl/classes/com/jogamp/graph/font/Font.java index 52ad4076d..597a7e76f 100644 --- a/src/jogl/classes/com/jogamp/graph/font/Font.java +++ b/src/jogl/classes/com/jogamp/graph/font/Font.java @@ -27,9 +27,8 @@ */ package com.jogamp.graph.font; -import jogamp.graph.geom.plane.AffineTransform; - import com.jogamp.graph.curve.OutlineShape; +import com.jogamp.graph.geom.plane.AffineTransform; import com.jogamp.opengl.math.geom.AABBox; /** diff --git a/src/jogl/classes/com/jogamp/graph/geom/Outline.java b/src/jogl/classes/com/jogamp/graph/geom/Outline.java index ec0225b37..486e787a2 100644 --- a/src/jogl/classes/com/jogamp/graph/geom/Outline.java +++ b/src/jogl/classes/com/jogamp/graph/geom/Outline.java @@ -29,9 +29,8 @@ package com.jogamp.graph.geom; import java.util.ArrayList; -import jogamp.graph.geom.plane.AffineTransform; - import com.jogamp.graph.geom.Vertex; +import com.jogamp.graph.geom.plane.AffineTransform; import com.jogamp.graph.curve.OutlineShape; import com.jogamp.graph.curve.Region; import com.jogamp.opengl.math.FloatUtil; diff --git a/src/jogl/classes/com/jogamp/graph/geom/Triangle.java b/src/jogl/classes/com/jogamp/graph/geom/Triangle.java index fc345f2a7..1c63c4005 100644 --- a/src/jogl/classes/com/jogamp/graph/geom/Triangle.java +++ b/src/jogl/classes/com/jogamp/graph/geom/Triangle.java @@ -27,10 +27,9 @@ */ package com.jogamp.graph.geom; +import com.jogamp.graph.geom.plane.AffineTransform; import com.jogamp.opengl.math.VectorUtil; -import jogamp.graph.geom.plane.AffineTransform; - public class Triangle { private final Vertex[] vertices = new Vertex[3]; private final boolean[] boundaryEdges = new boolean[3]; diff --git a/src/jogl/classes/com/jogamp/graph/geom/plane/AffineTransform.java b/src/jogl/classes/com/jogamp/graph/geom/plane/AffineTransform.java index a9978abe5..a5b3cac93 100644 --- a/src/jogl/classes/com/jogamp/graph/geom/plane/AffineTransform.java +++ b/src/jogl/classes/com/jogamp/graph/geom/plane/AffineTransform.java @@ -17,7 +17,7 @@ /** * @author Denis M. Kishenko */ -package jogamp.graph.geom.plane; +package com.jogamp.graph.geom.plane; // import jogamp.opengl.util.HashCode; diff --git a/src/jogl/classes/com/jogamp/graph/geom/plane/Crossing.java b/src/jogl/classes/com/jogamp/graph/geom/plane/Crossing.java index 2ae9d1867..173f1d4b4 100644 --- a/src/jogl/classes/com/jogamp/graph/geom/plane/Crossing.java +++ b/src/jogl/classes/com/jogamp/graph/geom/plane/Crossing.java @@ -17,7 +17,7 @@ /** * @author Denis M. Kishenko */ -package jogamp.graph.geom.plane; +package com.jogamp.graph.geom.plane; import com.jogamp.opengl.math.FloatUtil; diff --git a/src/jogl/classes/com/jogamp/graph/geom/plane/IllegalPathStateException.java b/src/jogl/classes/com/jogamp/graph/geom/plane/IllegalPathStateException.java index 2c18e0834..be0a14a76 100644 --- a/src/jogl/classes/com/jogamp/graph/geom/plane/IllegalPathStateException.java +++ b/src/jogl/classes/com/jogamp/graph/geom/plane/IllegalPathStateException.java @@ -17,7 +17,7 @@ /** * @author Denis M. Kishenko */ -package jogamp.graph.geom.plane; +package com.jogamp.graph.geom.plane; public class IllegalPathStateException extends RuntimeException { diff --git a/src/jogl/classes/com/jogamp/graph/geom/plane/NoninvertibleTransformException.java b/src/jogl/classes/com/jogamp/graph/geom/plane/NoninvertibleTransformException.java index 6e49607b7..fb90cedfc 100644 --- a/src/jogl/classes/com/jogamp/graph/geom/plane/NoninvertibleTransformException.java +++ b/src/jogl/classes/com/jogamp/graph/geom/plane/NoninvertibleTransformException.java @@ -17,7 +17,7 @@ /** * @author Denis M. Kishenko */ -package jogamp.graph.geom.plane; +package com.jogamp.graph.geom.plane; public class NoninvertibleTransformException extends java.lang.Exception { diff --git a/src/jogl/classes/com/jogamp/graph/geom/plane/Path2D.java b/src/jogl/classes/com/jogamp/graph/geom/plane/Path2D.java index 191b191b5..02260d604 100644 --- a/src/jogl/classes/com/jogamp/graph/geom/plane/Path2D.java +++ b/src/jogl/classes/com/jogamp/graph/geom/plane/Path2D.java @@ -17,7 +17,7 @@ /** * @author Denis M. Kishenko */ -package jogamp.graph.geom.plane; +package com.jogamp.graph.geom.plane; import java.util.NoSuchElementException; diff --git a/src/jogl/classes/com/jogamp/graph/geom/plane/PathIterator.java b/src/jogl/classes/com/jogamp/graph/geom/plane/PathIterator.java index 8868a8c58..b4681df0a 100644 --- a/src/jogl/classes/com/jogamp/graph/geom/plane/PathIterator.java +++ b/src/jogl/classes/com/jogamp/graph/geom/plane/PathIterator.java @@ -17,7 +17,7 @@ /** * @author Denis M. Kishenko */ -package jogamp.graph.geom.plane; +package com.jogamp.graph.geom.plane; public interface PathIterator { diff --git a/src/jogl/classes/com/jogamp/opengl/math/geom/AABBox.java b/src/jogl/classes/com/jogamp/opengl/math/geom/AABBox.java index 29cc2b51a..d54142e38 100644 --- a/src/jogl/classes/com/jogamp/opengl/math/geom/AABBox.java +++ b/src/jogl/classes/com/jogamp/opengl/math/geom/AABBox.java @@ -27,8 +27,7 @@ */ package com.jogamp.opengl.math.geom; -import jogamp.graph.geom.plane.AffineTransform; - +import com.jogamp.graph.geom.plane.AffineTransform; import com.jogamp.opengl.math.FloatUtil; import com.jogamp.opengl.math.Quaternion; import com.jogamp.opengl.math.Ray; diff --git a/src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java b/src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java index c48ef99ca..b3c1885d4 100644 --- a/src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java +++ b/src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java @@ -34,7 +34,6 @@ import jogamp.graph.font.typecast.ot.table.CmapIndexEntry; import jogamp.graph.font.typecast.ot.table.CmapTable; import jogamp.graph.font.typecast.ot.table.HdmxTable; import jogamp.graph.font.typecast.ot.table.ID; -import jogamp.graph.geom.plane.AffineTransform; import com.jogamp.common.util.IntObjectHashMap; import com.jogamp.graph.curve.OutlineShape; @@ -42,6 +41,7 @@ import com.jogamp.graph.font.Font; import com.jogamp.graph.font.FontFactory; import com.jogamp.graph.geom.SVertex; import com.jogamp.graph.geom.Vertex; +import com.jogamp.graph.geom.plane.AffineTransform; import com.jogamp.opengl.math.geom.AABBox; class TypecastFont implements Font { diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/Label.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/Label.java index e0c2adf6b..7d046e687 100644 --- a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/Label.java +++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/Label.java @@ -28,15 +28,13 @@ package com.jogamp.opengl.test.junit.graph.demos.ui; import com.jogamp.opengl.GL2ES2; - -import jogamp.graph.geom.plane.AffineTransform; - import com.jogamp.graph.curve.OutlineShape; import com.jogamp.graph.curve.opengl.RegionRenderer; import com.jogamp.graph.curve.opengl.TextRegionUtil; import com.jogamp.graph.font.Font; import com.jogamp.graph.geom.Vertex; import com.jogamp.graph.geom.Vertex.Factory; +import com.jogamp.graph.geom.plane.AffineTransform; public class Label extends UIShape { protected Font font; diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/Label0.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/Label0.java index 9a12b7175..7882c713d 100644 --- a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/Label0.java +++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/Label0.java @@ -27,12 +27,11 @@ */ package com.jogamp.opengl.test.junit.graph.demos.ui; -import jogamp.graph.geom.plane.AffineTransform; - import com.jogamp.graph.curve.OutlineShape; import com.jogamp.graph.curve.Region; import com.jogamp.graph.curve.opengl.TextRegionUtil; import com.jogamp.graph.font.Font; +import com.jogamp.graph.geom.plane.AffineTransform; import com.jogamp.opengl.math.geom.AABBox; public class Label0 { diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/RoundButton.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/RoundButton.java index 80c27218e..e6a95d880 100644 --- a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/RoundButton.java +++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/RoundButton.java @@ -28,13 +28,11 @@ package com.jogamp.opengl.test.junit.graph.demos.ui; import com.jogamp.opengl.GL2ES2; - -import jogamp.graph.geom.plane.AffineTransform; - import com.jogamp.graph.curve.OutlineShape; import com.jogamp.graph.curve.opengl.RegionRenderer; import com.jogamp.graph.geom.Vertex; import com.jogamp.graph.geom.Vertex.Factory; +import com.jogamp.graph.geom.plane.AffineTransform; public abstract class RoundButton extends UIShape { |