Changeset 88 for trunk

Timestamp:

04/13/06 20:55:18 (6 years ago)

Author:

jlee

Message:

Use java.util.regex.* instead of local version

Location:

trunk/src

Files:

• gnu (deleted)
• org/thestaticvoid/iriverter/DVD.java (modified) (1 diff)
• org/thestaticvoid/iriverter/MPlayerInfo.java (modified) (1 diff)
• org/thestaticvoid/iriverter/MencoderStreamParser.java (modified) (1 diff)
• org/thestaticvoid/iriverter/Profile.java (modified) (1 diff)
• org/thestaticvoid/iriverter/regex (deleted)
• org/thestaticvoid/iriverter/regexp (deleted)

trunk/src/org/thestaticvoid/iriverter/DVD.java

@@ -262 +262 @@
                                 while ((line = input.readLine()) != null)
                                         if (line.substring(0, 4).equals("/dev")) {
-                                                // originally used String.split() not available in GCJ
-                                                StringTokenizer tokens = new StringTokenizer(line);
-                                                tokens.nextToken();
-                                                tokens.nextToken();
-                                                String mountPoint = tokens.nextToken();
+                                                String mountPoint = line.split(" ")[2];
                                                 
                                                 if (new File(mountPoint + File.separator + "VIDEO_TS").exists())

trunk/src/org/thestaticvoid/iriverter/MPlayerInfo.java

@@ -3 +3 @@
 import java.io.*;
 import java.util.*;
-
-import org.thestaticvoid.iriverter.regex.*;
+import java.util.regex.*;
 
 public class MPlayerInfo {

trunk/src/org/thestaticvoid/iriverter/MencoderStreamParser.java

@@ -1 +1 @@
 package org.thestaticvoid.iriverter;
 
-import org.thestaticvoid.iriverter.regex.*;
-
 import java.io.*;
+import java.util.regex.*;
 
 public class MencoderStreamParser extends Thread {

trunk/src/org/thestaticvoid/iriverter/Profile.java

@@ -62 +62 @@
         
         public Dimensions[] getDimensions() {
-                StringTokenizer dimensionsTokens = new StringTokenizer(readOption("dimensions"));
-                Dimensions[] dimensions = new Dimensions[dimensionsTokens.countTokens()];
+                String[] dimensionsTokens = readOption("dimensions").split(" ");
+                Dimensions[] dimensions = new Dimensions[dimensionsTokens.length];
 
-                for (int i = 0; i < dimensions.length; i++)
-                        dimensions[i] = new Dimensions(dimensionsTokens.nextToken());
+                for (int i = 0; i < dimensionsTokens.length; i++)
+                        dimensions[i] = new Dimensions(dimensionsTokens[i]);
 
                 return dimensions;