Skip to content

Commit 7780129

Browse files
RunemoroRunemoro
committed
Remove dependency on slf4j
1 parent ec26cb3 commit 7780129

10 files changed

Lines changed: 19 additions & 51 deletions

File tree

‎poly2tri-core/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11

22
description = 'Poly2Tri Core'
33
dependencies {
4-
compile group: 'org.slf4j', name: 'slf4j-jdk14', version:'1.5.10'
54
}

‎poly2tri-core/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121

2222

2323
<dependencies>
24-
<dependency>
25-
<groupId>org.slf4j</groupId>
26-
<artifactId>slf4j-jdk14</artifactId>
27-
</dependency>
2824
</dependencies>
2925

3026
<scm>

‎poly2tri-core/src/main/java/org/poly2tri/Poly2Tri.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,9 @@
4242
import org.poly2tri.triangulation.sets.ConstrainedPointSet;
4343
import org.poly2tri.triangulation.sets.PointSet;
4444
import org.poly2tri.triangulation.util.PolygonGenerator;
45-
import org.slf4j.Logger;
46-
import org.slf4j.LoggerFactory;
4745

4846
public class Poly2Tri
4947
{
50-
private final static Logger logger = LoggerFactory.getLogger( Poly2Tri.class );
5148

5249
private static final TriangulationAlgorithm _defaultAlgorithm = TriangulationAlgorithm.DTSweep;
5350

@@ -96,7 +93,7 @@ public static void triangulate( TriangulationAlgorithm algorithm,
9693
tcx = createContext( algorithm );
9794
tcx.prepareTriangulation( t );
9895
triangulate( tcx );
99-
// logger.info( "Triangulation of {} points [{}ms]", tcx.getPoints().size(), ( System.nanoTime() - time ) / 1e6 );
96+
// System.out.println( "Triangulation of {} points [{}ms]", tcx.getPoints().size(), ( System.nanoTime() - time ) / 1e6 );
10097
}
10198

10299
public static void triangulate( TriangulationContext<?> tcx )

‎poly2tri-core/src/main/java/org/poly2tri/geometry/polygon/Polygon.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,9 @@
99
import org.poly2tri.triangulation.TriangulationMode;
1010
import org.poly2tri.triangulation.TriangulationPoint;
1111
import org.poly2tri.triangulation.delaunay.DelaunayTriangle;
12-
import org.slf4j.Logger;
13-
import org.slf4j.LoggerFactory;
1412

1513
public class Polygon implements Triangulatable
1614
{
17-
private final static Logger logger = LoggerFactory.getLogger( Polygon.class );
1815

1916
protected ArrayList<TriangulationPoint> _points = new ArrayList<TriangulationPoint>();
2017
protected ArrayList<TriangulationPoint> _steinerPoints;
@@ -55,7 +52,7 @@ public Polygon( List<PolygonPoint> points )
5552
// Its something that often happen when importing polygon data from other formats
5653
if( points.get(0).equals( points.get(points.size()-1) ) )
5754
{
58-
logger.warn( "Removed duplicate point");
55+
System.out.println( "Warning: Removed duplicate point");
5956
points.remove( points.size()-1 );
6057
}
6158
_points.addAll( points );

‎poly2tri-core/src/main/java/org/poly2tri/triangulation/TriangulationProcess.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,14 @@
3939
import org.poly2tri.geometry.polygon.PolygonSet;
4040
import org.poly2tri.triangulation.sets.ConstrainedPointSet;
4141
import org.poly2tri.triangulation.sets.PointSet;
42-
import org.slf4j.Logger;
43-
import org.slf4j.LoggerFactory;
44-
4542

4643
/**
4744
*
48-
* @author Thomas Åhlén, thahlen@gmail.com
45+
* @author Thomas �hl�n, thahlen@gmail.com
4946
*
5047
*/
5148
public class TriangulationProcess implements Runnable
5249
{
53-
private final static Logger logger = LoggerFactory.getLogger( TriangulationProcess.class );
5450

5551
private final TriangulationAlgorithm _algorithm;
5652

@@ -236,15 +232,15 @@ public void run()
236232
Poly2Tri.triangulate( _tcx );
237233
}
238234
_triangulationTime = ( System.nanoTime() - time ) / 1e6;
239-
logger.info( "Triangulation of {} points [{}ms]", _pointCount, _triangulationTime );
235+
System.out.println( "Triangulation of " + _pointCount + " points [" + _triangulationTime + "ms]" );
240236
sendEvent( TriangulationProcessEvent.Done );
241237
}
242238
catch( RuntimeException e )
243239
{
244240
if( _awaitingTermination )
245241
{
246242
_awaitingTermination = false;
247-
logger.info( "Thread[{}] : {}", _thread.getName(), e.getMessage() );
243+
System.out.println( "Thread[" + _thread.getName()+ "] : "+ e.getMessage() );
248244
sendEvent( TriangulationProcessEvent.Aborted );
249245
}
250246
else
@@ -256,7 +252,7 @@ public void run()
256252
catch( Exception e )
257253
{
258254
e.printStackTrace();
259-
logger.info( "Triangulation exception {}", e.getMessage() );
255+
System.out.println( "Triangulation exception " + e.getMessage() );
260256
sendEvent( TriangulationProcessEvent.Failed );
261257
}
262258
finally

‎poly2tri-core/src/main/java/org/poly2tri/triangulation/delaunay/DelaunayTriangle.java‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,10 @@
3535
import org.poly2tri.triangulation.TriangulationPoint;
3636
import org.poly2tri.triangulation.delaunay.sweep.DTSweepConstraint;
3737
import org.poly2tri.triangulation.point.TPoint;
38-
import org.slf4j.Logger;
39-
import org.slf4j.LoggerFactory;
4038

4139

4240
public class DelaunayTriangle
4341
{
44-
private final static Logger logger = LoggerFactory.getLogger( DelaunayTriangle.class );
4542

4643
/** Neighbor pointers */
4744
public final DelaunayTriangle[] neighbors = new DelaunayTriangle[3];
@@ -134,7 +131,7 @@ else if( ( p1 == points[0] && p2 == points[1] ) || ( p1 == points[1] && p2 == po
134131
}
135132
else
136133
{
137-
logger.error( "Neighbor error, please report!" );
134+
System.err.println( "Neighbor error, please report!" );
138135
// throw new Exception("Neighbor error, please report!");
139136
}
140137
}
@@ -159,7 +156,7 @@ else if( t.contains( points[0], points[1] ) )
159156
}
160157
else
161158
{
162-
logger.error( "markNeighbor failed" );
159+
System.err.println( "markNeighbor failed" );
163160
}
164161
}
165162

@@ -269,7 +266,7 @@ else if( point == points[2] )
269266
{
270267
return points[0];
271268
}
272-
logger.error( "point location error" );
269+
System.err.println( "point location error" );
273270
throw new RuntimeException("[FIXME] point location error");
274271
}
275272

@@ -288,7 +285,7 @@ else if( point == points[2] )
288285
{
289286
return points[1];
290287
}
291-
logger.error( "point location error" );
288+
System.err.println( "point location error" );
292289
throw new RuntimeException("[FIXME] point location error");
293290
}
294291

@@ -315,7 +312,7 @@ else if( oPoint == points[2] )
315312
}
316313
else
317314
{
318-
logger.error( "legalization error" );
315+
System.err.println( "legalization error" );
319316
throw new RuntimeException("legalization bug");
320317
}
321318
}

‎poly2tri-core/src/main/java/org/poly2tri/triangulation/delaunay/sweep/DTSweep.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
import org.poly2tri.triangulation.TriangulationPoint;
4242
import org.poly2tri.triangulation.TriangulationUtil.Orientation;
4343
import org.poly2tri.triangulation.delaunay.DelaunayTriangle;
44-
import org.slf4j.Logger;
45-
import org.slf4j.LoggerFactory;
4644

4745
/**
4846
* Sweep-line, Constrained Delauney Triangulation (CDT) See: Domiter, V. and
@@ -51,12 +49,11 @@
5149
*
5250
* "FlipScan" Constrained Edge Algorithm invented by author of this code.
5351
*
54-
* Author: Thomas Åhlén, thahlen@gmail.com
52+
* Author: Thomas �hl�n, thahlen@gmail.com
5553
*/
5654

5755
public class DTSweep
5856
{
59-
private final static Logger logger = LoggerFactory.getLogger( DTSweep.class );
6057

6158
private final static double PI_div2 = Math.PI/2;
6259
private final static double PI_3div4 = 3*Math.PI/4;
@@ -349,7 +346,7 @@ private static void edgeEvent( DTSweepContext tcx,
349346
}
350347
catch( PointOnEdgeException e )
351348
{
352-
logger.warn( "Skipping edge: {}", e.getMessage() );
349+
System.out.println( "Warning: Skipping edge: " + e.getMessage());
353350
}
354351
}
355352

@@ -586,7 +583,7 @@ private static void edgeEvent( DTSweepContext tcx,
586583
{
587584
throw new PointOnEdgeException( "EdgeEvent - Point on constrained edge not supported yet" );
588585
}
589-
if( tcx.isDebugEnabled() ) { logger.info( "EdgeEvent - Point on constrained edge" ); }
586+
if( tcx.isDebugEnabled() ) { System.out.println( "EdgeEvent - Point on constrained edge" ); }
590587
return;
591588
}
592589

@@ -607,7 +604,7 @@ private static void edgeEvent( DTSweepContext tcx,
607604
{
608605
throw new PointOnEdgeException( "EdgeEvent - Point on constrained edge not supported yet" );
609606
}
610-
if( tcx.isDebugEnabled() ) { logger.info( "EdgeEvent - Point on constrained edge" ); }
607+
if( tcx.isDebugEnabled() ) { System.out.println( "EdgeEvent - Point on constrained edge" ); }
611608
return;
612609
}
613610

‎poly2tri-core/src/main/java/org/poly2tri/triangulation/delaunay/sweep/DTSweepConstraint.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,14 @@
3232

3333
import org.poly2tri.triangulation.TriangulationConstraint;
3434
import org.poly2tri.triangulation.TriangulationPoint;
35-
import org.slf4j.Logger;
36-
import org.slf4j.LoggerFactory;
3735

3836
/**
3937
*
40-
* @author Thomas Åhlén, thahlen@gmail.com
38+
* @author Thomas �hl�n, thahlen@gmail.com
4139
*
4240
*/
4341
public class DTSweepConstraint extends TriangulationConstraint
4442
{
45-
private final static Logger logger = LoggerFactory.getLogger( DTSweepConstraint.class );
4643

4744
public TriangulationPoint p;
4845
public TriangulationPoint q;
@@ -73,7 +70,7 @@ else if( p1.getY() == p2.getY() )
7370
}
7471
else if( p1.getX() == p2.getX() )
7572
{
76-
logger.info( "Failed to create constraint {}={}", p1, p2 );
73+
System.out.println( "Failed to create constraint " + p1 + "=" + p2 );
7774
// throw new DuplicatePointException( p1 + "=" + p2 );
7875
// return;
7976
}

‎poly2tri-core/src/main/java/org/poly2tri/triangulation/delaunay/sweep/DTSweepContext.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,14 @@
4040
import org.poly2tri.triangulation.TriangulationPoint;
4141
import org.poly2tri.triangulation.delaunay.DelaunayTriangle;
4242
import org.poly2tri.triangulation.point.TPoint;
43-
import org.slf4j.Logger;
44-
import org.slf4j.LoggerFactory;
4543

4644
/**
4745
*
48-
* @author Thomas Åhlén, thahlen@gmail.com
46+
* @author Thomas �hl�n, thahlen@gmail.com
4947
*
5048
*/
5149
public class DTSweepContext extends TriangulationContext<DTSweepDebugContext>
5250
{
53-
private final static Logger logger = LoggerFactory.getLogger( DTSweepContext.class );
5451

5552
// Inital triangle factor, seed triangle will extend 30% of
5653
// PointSet width to both left and right.
@@ -260,7 +257,7 @@ public void prepareTriangulation( Triangulatable t )
260257
// long time = System.nanoTime();
261258
// Sort the points along y-axis
262259
Collections.sort( _points, _comparator );
263-
// logger.info( "Triangulation setup [{}ms]", ( System.nanoTime() - time ) / 1e6 );
260+
// System.out.println( "Triangulation setup [{}ms]", ( System.nanoTime() - time ) / 1e6 );
264261
}
265262

266263

‎pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,6 @@
134134
</build>
135135
<dependencyManagement>
136136
<dependencies>
137-
<dependency>
138-
<groupId>org.slf4j</groupId>
139-
<artifactId>slf4j-jdk14</artifactId>
140-
<version>1.5.10</version>
141-
</dependency>
142137
</dependencies>
143138
</dependencyManagement>
144139
</project>

0 commit comments

Comments
 (0)