aboutsummaryrefslogtreecommitdiff
path: root/tests/TestNetSwing.java
diff options
context:
space:
mode:
Diffstat (limited to 'tests/TestNetSwing.java')
-rw-r--r--tests/TestNetSwing.java15
1 files changed, 8 insertions, 7 deletions
diff --git a/tests/TestNetSwing.java b/tests/TestNetSwing.java
index f2dc0eb..7aed6e2 100644
--- a/tests/TestNetSwing.java
+++ b/tests/TestNetSwing.java
@@ -15,7 +15,7 @@ import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import fr.dgac.ivy.*;
-import org.apache.regexp.*;
+import java.util.regex.*;
import gnu.getopt.*;
class TestNetSwing implements Runnable {
@@ -183,19 +183,20 @@ class TestNetSwing implements Runnable {
int sep_index = net.lastIndexOf( ":" );
if ( sep_index != -1 ) { net = net.substring(0,sep_index); }
try {
- RE numbersPoint = new RE("([0-9]|\\.)+");
- if (!numbersPoint.match(net)) {
+ Pattern numbersPoint = Pattern.compile("([0-9]|\\.)+");
+ if (!numbersPoint.matcher(net).matches()) {
// traceDebug("should only have numbers and point ? I won't add anything... " + net);
return net;
}
net += ".255.255.255";
- RE exp = new RE( "^(\\d+\\.\\d+\\.\\d+\\.\\d+).*");
- if (!exp.match(net)) {
+ Pattern exp = Pattern.compile( "^(\\d+\\.\\d+\\.\\d+\\.\\d+).*");
+ Matcher m = exp.matcher(net);
+ if (!m.matches()) {
System.out.println("Bad broascat addr " + net);
throw new IvyException("bad broadcast addr");
}
- net=exp.getParen(1);
- } catch ( RESyntaxException e ){
+ net=m.group(1);
+ } catch ( PatternSyntaxException e ){
System.out.println(e);
System.exit(0);
}