Skip to content

Commit e1c01f9

Browse files
baltzellbaltzell
committed
remove slf4j dependency
1 parent f53aab1 commit e1c01f9

8 files changed

Lines changed: 25 additions & 50 deletions

File tree

‎common-tools/clas-jcsg/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@
4848
<groupId>java3d</groupId>
4949
<artifactId>vecmath</artifactId>
5050
</dependency>
51-
<dependency>
52-
<groupId>org.slf4j</groupId>
53-
<artifactId>slf4j-api</artifactId>
54-
</dependency>
5551
</dependencies>
5652

5753
</project>

‎common-tools/clas-jcsg/src/main/java/eu/mihosoft/vrl/v3d/ext/org/poly2tri/DTSweep.java‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,9 @@
6666
import static eu.mihosoft.vrl.v3d.ext.org.poly2tri.TriangulationUtil.smartIncircle;
6767

6868
import java.util.List;
69+
import java.util.logging.Logger;
6970

70-
import eu.mihosoft.vrl.v3d.ext.org.poly2tri.TriangulationMode;
71-
import eu.mihosoft.vrl.v3d.ext.org.poly2tri.TriangulationPoint;
7271
import eu.mihosoft.vrl.v3d.ext.org.poly2tri.TriangulationUtil.Orientation;
73-
import eu.mihosoft.vrl.v3d.ext.org.poly2tri.DelaunayTriangle;
74-
75-
import org.slf4j.Logger;
76-
import org.slf4j.LoggerFactory;
7772

7873
/**
7974
* Sweep-line, Constrained Delauney Triangulation (CDT) See: Domiter, V. and
@@ -86,7 +81,7 @@
8681
*/
8782
class DTSweep {
8883

89-
private final static Logger logger = LoggerFactory.getLogger(DTSweep.class);
84+
private final static Logger logger = Logger.getLogger(DTSweep.class.getName());
9085

9186
private final static double PI_div2 = Math.PI / 2;
9287
private final static double PI_3div4 = 3 * Math.PI / 4;
@@ -359,7 +354,7 @@ private static void edgeEvent(DTSweepContext tcx,
359354

360355
edgeEvent(tcx, edge.p, edge.q, node.triangle, edge.q);
361356
} catch (PointOnEdgeException e) {
362-
logger.warn("Skipping edge: {}", e.getMessage());
357+
logger.warning(() -> "Skipping edge: "+e.getMessage());
363358
}
364359
}
365360

‎common-tools/clas-jcsg/src/main/java/eu/mihosoft/vrl/v3d/ext/org/poly2tri/DTSweepConstraint.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@
6060
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6161
*/
6262

63-
import org.slf4j.Logger;
64-
import org.slf4j.LoggerFactory;
63+
import java.util.logging.Logger;
6564

6665
/**
6766
*
@@ -70,7 +69,7 @@
7069
*/
7170
class DTSweepConstraint extends TriangulationConstraint
7271
{
73-
private final static Logger logger = LoggerFactory.getLogger( DTSweepConstraint.class );
72+
private final static Logger logger = Logger.getLogger( DTSweepConstraint.class.getName() );
7473

7574
public TriangulationPoint p;
7675
public TriangulationPoint q;
@@ -101,7 +100,7 @@ else if( p1.getY() == p2.getY() )
101100
}
102101
else if( p1.getX() == p2.getX() )
103102
{
104-
logger.info( "Failed to create constraint {}={}", p1, p2 );
103+
logger.info(() -> "Failed to create constraint "+p1+"="+p2);
105104
// throw new DuplicatePointException( p1 + "=" + p2 );
106105
// return;
107106
}

‎common-tools/clas-jcsg/src/main/java/eu/mihosoft/vrl/v3d/ext/org/poly2tri/DTSweepContext.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,20 +60,16 @@
6060
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6161
*/
6262

63-
6463
import java.util.ArrayDeque;
6564
import java.util.Collections;
66-
import org.slf4j.Logger;
67-
import org.slf4j.LoggerFactory;
68-
69-
65+
import java.util.logging.Logger;
7066

7167
/**
7268
* @author Thomas ??? (thahlen@gmail.com)
7369
*/
7470
class DTSweepContext extends TriangulationContext<DTSweepDebugContext>
7571
{
76-
private final static Logger logger = LoggerFactory.getLogger( DTSweepContext.class );
72+
private final static Logger logger = Logger.getLogger( DTSweepContext.class.getName() );
7773

7874
// Inital triangle factor, seed triangle will extend 30% of
7975
// PointSet width to both left and right.

‎common-tools/clas-jcsg/src/main/java/eu/mihosoft/vrl/v3d/ext/org/poly2tri/DelaunayTriangle.java‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,11 @@
6060
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6161
*/
6262
import java.util.ArrayList;
63-
64-
import org.slf4j.Logger;
65-
import org.slf4j.LoggerFactory;
66-
63+
import java.util.logging.Logger;
6764

6865
class DelaunayTriangle
6966
{
70-
private final static Logger logger = LoggerFactory.getLogger( DelaunayTriangle.class );
67+
private final static Logger logger = Logger.getLogger( DelaunayTriangle.class.getName() );
7168

7269
/** Neighbor pointers */
7370
public final DelaunayTriangle[] neighbors = new DelaunayTriangle[3];
@@ -160,7 +157,7 @@ else if( ( p1 == points[0] && p2 == points[1] ) || ( p1 == points[1] && p2 == po
160157
}
161158
else
162159
{
163-
logger.error( "Neighbor error, please report!" );
160+
logger.severe( "Neighbor error, please report!" );
164161
// throw new Exception("Neighbor error, please report!");
165162
}
166163
}
@@ -185,7 +182,7 @@ else if( t.contains( points[0], points[1] ) )
185182
}
186183
else
187184
{
188-
logger.error( "markNeighbor failed" );
185+
logger.severe( "markNeighbor failed" );
189186
}
190187
}
191188

@@ -295,7 +292,7 @@ else if( point == points[2] )
295292
{
296293
return points[0];
297294
}
298-
logger.error( "point location error" );
295+
logger.severe( "point location error" );
299296
throw new RuntimeException("[FIXME] point location error");
300297
}
301298

@@ -314,7 +311,7 @@ else if( point == points[2] )
314311
{
315312
return points[1];
316313
}
317-
logger.error( "point location error" );
314+
logger.severe( "point location error" );
318315
throw new RuntimeException("[FIXME] point location error");
319316
}
320317

@@ -341,7 +338,7 @@ else if( oPoint == points[2] )
341338
}
342339
else
343340
{
344-
logger.error( "legalization error" );
341+
logger.severe( "legalization error" );
345342
throw new RuntimeException("legalization bug");
346343
}
347344
}

‎common-tools/clas-jcsg/src/main/java/eu/mihosoft/vrl/v3d/ext/org/poly2tri/Poly2Tri.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,11 @@
6060
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6161
*/
6262

63-
64-
import org.slf4j.Logger;
65-
import org.slf4j.LoggerFactory;
63+
import java.util.logging.Logger;
6664

6765
class Poly2Tri
6866
{
69-
private final static Logger logger = LoggerFactory.getLogger( Poly2Tri.class );
67+
private final static Logger logger = Logger.getLogger( Poly2Tri.class.getName() );
7068

7169
private static final TriangulationAlgorithm _defaultAlgorithm = TriangulationAlgorithm.DTSweep;
7270

‎common-tools/clas-jcsg/src/main/java/eu/mihosoft/vrl/v3d/ext/org/poly2tri/Polygon.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,11 @@
6363
import java.util.ArrayList;
6464
import java.util.Arrays;
6565
import java.util.List;
66-
67-
import org.slf4j.Logger;
68-
import org.slf4j.LoggerFactory;
66+
import java.util.logging.Logger;
6967

7068
class Polygon implements Triangulatable
7169
{
72-
private final static Logger logger = LoggerFactory.getLogger( Polygon.class );
70+
private final static Logger logger = Logger.getLogger( Polygon.class.getName() );
7371

7472
protected ArrayList<TriangulationPoint> _points = new ArrayList<TriangulationPoint>();
7573
protected ArrayList<TriangulationPoint> _steinerPoints;
@@ -110,7 +108,7 @@ public Polygon( List<PolygonPoint> points )
110108
// Its something that often happen when importing polygon data from other formats
111109
if( points.get(0).equals( points.get(points.size()-1) ) )
112110
{
113-
logger.warn( "Removed duplicate point");
111+
logger.warning( "Removed duplicate point");
114112
points.remove( points.size()-1 );
115113
}
116114
_points.addAll( points );

‎common-tools/clas-jcsg/src/main/java/eu/mihosoft/vrl/v3d/ext/org/poly2tri/TriangulationProcess.java‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,7 @@
6262
import java.lang.Thread.State;
6363
import java.util.ArrayList;
6464
import java.util.List;
65-
import org.slf4j.Logger;
66-
import org.slf4j.LoggerFactory;
67-
68-
69-
65+
import java.util.logging.Logger;
7066

7167
/**
7268
*
@@ -75,7 +71,7 @@
7571
*/
7672
class TriangulationProcess implements Runnable
7773
{
78-
private final static Logger logger = LoggerFactory.getLogger( TriangulationProcess.class );
74+
private final static Logger logger = Logger.getLogger(TriangulationProcess.class.getName());
7975

8076
private final TriangulationAlgorithm _algorithm;
8177

@@ -261,15 +257,15 @@ public void run()
261257
Poly2Tri.triangulate( _tcx );
262258
}
263259
_triangulationTime = ( System.nanoTime() - time ) / 1e6;
264-
logger.info( "Triangulation of {} points [{}ms]", _pointCount, _triangulationTime );
260+
logger.info(() -> "Triangulation of "+_pointCount+" points ["+_triangulationTime+"ms]");
265261
sendEvent( TriangulationProcessEvent.Done );
266262
}
267263
catch( RuntimeException e )
268264
{
269265
if( _awaitingTermination )
270266
{
271267
_awaitingTermination = false;
272-
logger.info( "Thread[{}] : {}", _thread.getName(), e.getMessage() );
268+
logger.info(() -> "Thread["+_thread.getName()+")] : "+e.getMessage() );
273269
sendEvent( TriangulationProcessEvent.Aborted );
274270
}
275271
else
@@ -281,7 +277,7 @@ public void run()
281277
catch( Exception e )
282278
{
283279
e.printStackTrace();
284-
logger.info( "Triangulation exception {}", e.getMessage() );
280+
logger.info(() -> "Triangulation exception "+e.getMessage());
285281
sendEvent( TriangulationProcessEvent.Failed );
286282
}
287283
finally

0 commit comments

Comments
 (0)