You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/02/25 18:24:15 UTC
[6/8] git commit: Replace jakarta-regexp with java.util.regexp for
maven-scm-provider-jazz
Replace jakarta-regexp with java.util.regexp for maven-scm-provider-jazz
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/c0efaf5e
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/c0efaf5e
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/c0efaf5e
Branch: refs/heads/master
Commit: c0efaf5ef0569ce0bc1c8cc536d449b80139919a
Parents: 0a069f8
Author: Emmanuel Bourg <eb...@apache.org>
Authored: Mon Feb 24 18:25:05 2014 +0100
Committer: Emmanuel Bourg <eb...@apache.org>
Committed: Mon Feb 24 18:25:05 2014 +0100
----------------------------------------------------------------------
.../maven-scm-provider-jazz/pom.xml | 5 --
.../jazz/command/blame/JazzBlameConsumer.java | 33 +++-----
.../command/changelog/JazzHistoryConsumer.java | 27 ++-----
.../changelog/JazzListChangesetConsumer.java | 50 ++++--------
.../command/checkout/JazzCheckOutConsumer.java | 27 ++-----
.../jazz/command/status/JazzStatusConsumer.java | 80 ++++++--------------
6 files changed, 61 insertions(+), 161 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/c0efaf5e/maven-scm-providers/maven-scm-provider-jazz/pom.xml
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-jazz/pom.xml b/maven-scm-providers/maven-scm-provider-jazz/pom.xml
index 4be5f1d..a925616 100644
--- a/maven-scm-providers/maven-scm-provider-jazz/pom.xml
+++ b/maven-scm-providers/maven-scm-provider-jazz/pom.xml
@@ -48,11 +48,6 @@
</developers>
<dependencies>
- <!-- For the RE's used to parse command line output -->
- <dependency>
- <groupId>regexp</groupId>
- <artifactId>regexp</artifactId>
- </dependency>
<!-- For the tck tests -->
<dependency>
<groupId>org.mockito</groupId>
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/c0efaf5e/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/blame/JazzBlameConsumer.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/blame/JazzBlameConsumer.java b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/blame/JazzBlameConsumer.java
index 1e87772..6ec0d87 100644
--- a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/blame/JazzBlameConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/blame/JazzBlameConsumer.java
@@ -23,14 +23,14 @@ import org.apache.maven.scm.command.blame.BlameLine;
import org.apache.maven.scm.log.ScmLogger;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.jazz.command.consumer.AbstractRepositoryConsumer;
-import org.apache.regexp.RE;
-import org.apache.regexp.RESyntaxException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
//STATUS: NOT DONE
@@ -47,12 +47,7 @@ public class JazzBlameConsumer
// 1 Deb (1008) 2011-12-14 Test.txt
// 2 Deb (1005) 2011-12-14 59 My commit comment.
- private static final String LINE_PATTERN = "(\\d+) (.*) \\((\\d+)\\) (\\d+-\\d+-\\d+) (.*)";
-
- /**
- * @see #LINE_PATTERN
- */
- private RE lineRegexp;
+ private static final Pattern LINE_PATTERN = Pattern.compile( "(\\d+) (.*) \\((\\d+)\\) (\\d+-\\d+-\\d+) (.*)" );
private List<BlameLine> fLines = new ArrayList<BlameLine>();
@@ -70,17 +65,6 @@ public class JazzBlameConsumer
dateFormat = new SimpleDateFormat( JAZZ_TIMESTAMP_PATTERN );
dateFormat.setTimeZone( TimeZone.getTimeZone( "UTC" ) );
-
- try
- {
- lineRegexp = new RE( LINE_PATTERN );
- }
- catch ( RESyntaxException ex )
- {
- throw new RuntimeException(
- "INTERNAL ERROR: Could not create regexp to parse jazz scm blame output. This shouldn't happen. Something is probably wrong with the oro installation.",
- ex );
- }
}
/**
@@ -93,12 +77,13 @@ public class JazzBlameConsumer
{
super.consumeLine( line );
- if ( lineRegexp.match( line ) )
+ Matcher matcher = LINE_PATTERN.matcher( line );
+ if ( matcher.matches() )
{
- String lineNumberStr = lineRegexp.getParen( 1 );
- String owner = lineRegexp.getParen( 2 );
- String changeSetNumberStr = lineRegexp.getParen( 3 );
- String dateStr = lineRegexp.getParen( 4 );
+ String lineNumberStr = matcher.group( 1 );
+ String owner = matcher.group( 2 );
+ String changeSetNumberStr = matcher.group( 3 );
+ String dateStr = matcher.group( 4 );
Date date = parseDate( dateStr, JAZZ_TIMESTAMP_PATTERN, null );
fLines.add( new BlameLine( date, changeSetNumberStr, owner ) );
}
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/c0efaf5e/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzHistoryConsumer.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzHistoryConsumer.java b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzHistoryConsumer.java
index 931ba21..04e0c67 100644
--- a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzHistoryConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzHistoryConsumer.java
@@ -23,10 +23,10 @@ import org.apache.maven.scm.ChangeSet;
import org.apache.maven.scm.log.ScmLogger;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.jazz.command.consumer.AbstractRepositoryConsumer;
-import org.apache.regexp.RE;
-import org.apache.regexp.RESyntaxException;
import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
* Consume the output of the scm command for the "history" operation.
@@ -48,12 +48,7 @@ public class JazzHistoryConsumer
// (1584) ---$ Deb "This is my first changeset (2)"
// (1583) ---$ Deb "This is my first changeset (1)"
- private static final String CHANGESET_PATTERN = "\\((\\d+)\\) (.*)";
-
- /**
- * @see #CHANGESET_PATTERN
- */
- private RE changeSetRegExp;
+ private static final Pattern CHANGESET_PATTERN = Pattern.compile( "\\((\\d+)\\) (.*)" );
private List<ChangeSet> entries;
@@ -68,17 +63,6 @@ public class JazzHistoryConsumer
{
super( repo, logger );
this.entries = entries;
-
- try
- {
- changeSetRegExp = new RE( CHANGESET_PATTERN );
- }
- catch ( RESyntaxException ex )
- {
- throw new RuntimeException(
- "INTERNAL ERROR: Could not create regexp to parse jazz scm history output. This shouldn't happen. Something is probably wrong with the oro installation.",
- ex );
- }
}
/**
@@ -90,9 +74,10 @@ public class JazzHistoryConsumer
public void consumeLine( String line )
{
super.consumeLine( line );
- if ( changeSetRegExp.match( line ) )
+ Matcher matcher = CHANGESET_PATTERN.matcher( line );
+ if ( matcher.find() )
{
- String changesetAlias = changeSetRegExp.getParen( 1 );
+ String changesetAlias = matcher.group( 1 );
ChangeSet changeSet = new ChangeSet();
changeSet.setRevision( changesetAlias );
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/c0efaf5e/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzListChangesetConsumer.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzListChangesetConsumer.java b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzListChangesetConsumer.java
index dd099fc..0e92f24 100644
--- a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzListChangesetConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzListChangesetConsumer.java
@@ -25,14 +25,14 @@ import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.log.ScmLogger;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.jazz.command.consumer.AbstractRepositoryConsumer;
-import org.apache.regexp.RE;
-import org.apache.regexp.RESyntaxException;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
* Consume the output of the scm command for the "list changesets" operation.
@@ -146,23 +146,13 @@ public class JazzListChangesetConsumer
// (1589) ---$ Deb "[maven-release-plugin] prepare for next development iteration"
// (1585) ---$ Deb "[maven-release-plugin] prepare release GPDB-1.0.21"
- private static final String CHANGESET_PATTERN = "\\((\\d+)\\) (....) (\\w+) (.*)";
-
- /**
- * @see #CHANGESET_PATTERN
- */
- private RE changeSetRegExp;
+ private static final Pattern CHANGESET_PATTERN = Pattern.compile( "\\((\\d+)\\) (....) (\\w+) (.*)" );
// ---c- (1170) \GPDB\GPDBEAR\pom.xml
// ---c- (1171) \GPDB\GPDBResources\pom.xml
// ---c- (1167) \GPDB\GPDBWeb\pom.xml
// ---c- (1165) \GPDB\pom.xml
- private static final String CHANGES_PATTERN = "(.....) \\((\\d+)\\) (.*)";
-
- /**
- * @see #CHANGES_PATTERN
- */
- private RE changesRegExp;
+ private static final Pattern CHANGES_PATTERN = Pattern.compile( "(.....) \\((\\d+)\\) (.*)" );
private List<ChangeSet> entries;
@@ -187,18 +177,6 @@ public class JazzListChangesetConsumer
super( repo, logger );
this.entries = entries;
this.userDateFormat = userDateFormat;
-
- try
- {
- changeSetRegExp = new RE( CHANGESET_PATTERN );
- changesRegExp = new RE( CHANGES_PATTERN );
- }
- catch ( RESyntaxException ex )
- {
- throw new RuntimeException(
- "INTERNAL ERROR: Could not create regexp to parse jazz scm history output. This shouldn't happen. Something is probably wrong with the oro installation.",
- ex );
- }
}
/**
@@ -282,7 +260,8 @@ public class JazzListChangesetConsumer
// Process the headerless change set line - starts with a '(', eg:
// (1589) ---$ Deb "[maven-release-plugin] prepare for next development iteration"
// (1585) ---$ Deb "[maven-release-plugin] prepare release GPDB-1.0.21"
- if ( changeSetRegExp.match( line ) )
+ Matcher matcher = CHANGESET_PATTERN.matcher( line );
+ if ( matcher.find() )
{
// This is the only place this gets incremented.
// It starts at -1, and on first execution is incremented to 0 - which is correct.
@@ -293,10 +272,10 @@ public class JazzListChangesetConsumer
List<ChangeFile> files = new ArrayList<ChangeFile>();
currentChangeSet.setFiles( files );
- String changesetAlias = changeSetRegExp.getParen( 1 );
- String changeFlags = changeSetRegExp.getParen( 2 ); // Not used.
- String author = changeSetRegExp.getParen( 3 );
- String comment = changeSetRegExp.getParen( 4 );
+ String changesetAlias = matcher.group( 1 );
+ String changeFlags = matcher.group( 2 ); // Not used.
+ String author = matcher.group( 3 );
+ String comment = matcher.group( 4 );
if ( getLogger().isDebugEnabled() )
{
@@ -397,13 +376,14 @@ public class JazzListChangesetConsumer
// ---c- (1171) \GPDB\GPDBResources\pom.xml
// ---c- (1167) \GPDB\GPDBWeb\pom.xml
// ---c- (1165) \GPDB\pom.xml
- if ( changesRegExp.match( line ) )
+ Matcher matcher = CHANGES_PATTERN.matcher( line );
+ if ( matcher.find() )
{
ChangeSet currentChangeSet = entries.get( currentChangeSetIndex );
- String changeFlags = changesRegExp.getParen( 1 ); // Not used.
- String fileAlias = changesRegExp.getParen( 2 );
- String file = changesRegExp.getParen( 3 );
+ String changeFlags = matcher.group( 1 ); // Not used.
+ String fileAlias = matcher.group( 2 );
+ String file = matcher.group( 3 );
if ( getLogger().isDebugEnabled() )
{
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/c0efaf5e/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/checkout/JazzCheckOutConsumer.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/checkout/JazzCheckOutConsumer.java b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/checkout/JazzCheckOutConsumer.java
index 33f8ed3..e3b2a7f 100644
--- a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/checkout/JazzCheckOutConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/checkout/JazzCheckOutConsumer.java
@@ -24,11 +24,11 @@ import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.log.ScmLogger;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.jazz.command.consumer.AbstractRepositoryConsumer;
-import org.apache.regexp.RE;
-import org.apache.regexp.RESyntaxException;
import java.util.ArrayList;
import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
* Consume the output of the scm command for the "load" operation.
@@ -38,12 +38,7 @@ import java.util.List;
public class JazzCheckOutConsumer
extends AbstractRepositoryConsumer
{
- private static final String DOWNLOAD_PATTERN = "^Downloading\\s(.*)\\s\\s\\(\\d.*B\\)$";
-
- /**
- * @see #DOWNLOAD_PATTERN
- */
- private RE downloadRegexp;
+ private static final Pattern DOWNLOAD_PATTERN = Pattern.compile( "^Downloading\\s(.*)\\s\\s\\(\\d.*B\\)$" );
protected String fCurrentDir = "";
@@ -58,17 +53,6 @@ public class JazzCheckOutConsumer
public JazzCheckOutConsumer( ScmProviderRepository repository, ScmLogger logger )
{
super( repository, logger );
-
- try
- {
- downloadRegexp = new RE( DOWNLOAD_PATTERN );
- }
- catch ( RESyntaxException ex )
- {
- throw new RuntimeException(
- "INTERNAL ERROR: Could not create regexp to parse jazz scm checkout output. This shouldn't happen. Something is probably wrong with the oro installation.",
- ex );
- }
}
/**
@@ -82,9 +66,10 @@ public class JazzCheckOutConsumer
// Examples:
// Downloading /checkout-test/src/emptyFile.txt (0 B)
// Downloading /checkout-test/src/folder with spaces/file with spaces.java (24.0 KB)
- if ( downloadRegexp.match( line ) )
+ Matcher matcher = DOWNLOAD_PATTERN.matcher( line );
+ if ( matcher.matches() )
{
- fCheckedOutFiles.add( new ScmFile( downloadRegexp.getParen( 1 ), ScmFileStatus.CHECKED_OUT ) );
+ fCheckedOutFiles.add( new ScmFile( matcher.group( 1 ), ScmFileStatus.CHECKED_OUT ) );
}
}
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/c0efaf5e/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusConsumer.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusConsumer.java b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusConsumer.java
index 89a4e27..b0ed02f 100644
--- a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusConsumer.java
@@ -25,11 +25,11 @@ import org.apache.maven.scm.log.ScmLogger;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.jazz.command.consumer.AbstractRepositoryConsumer;
import org.apache.maven.scm.provider.jazz.repository.JazzScmProviderRepository;
-import org.apache.regexp.RE;
-import org.apache.regexp.RESyntaxException;
import java.util.ArrayList;
import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
* Consume the output of the scm command for the "status" operation.
@@ -68,37 +68,17 @@ public class JazzStatusConsumer
// Workspace: (1000) "BogusRepositoryWorkspace" <-> (1000) "BogusRepositoryWorkspace"
// Workspace: (1156) "GPDBWorkspace" <-> (1157) "GPDBStream"
- private static final String WORKSPACE_PATTERN = "\\((\\d+)\\) \"(.*)\" <-> \\((\\d+)\\) \"(.*)\"";
-
- /**
- * @see #WORKSPACE_PATTERN
- */
- private RE workspaceRegExp;
+ private static final Pattern WORKSPACE_PATTERN = Pattern.compile( "\\((\\d+)\\) \"(.*)\" <-> \\((\\d+)\\) \"(.*)\"" );
// Component: (1001) "BogusComponent"
- private static final String COMPONENT_PATTERN1 = "\\((\\d+)\\) \"(.*)\"";
-
- /**
- * @see #COMPONENT_PATTERN1
- */
- private RE componentRegExp1;
+ private static final Pattern COMPONENT_PATTERN1 = Pattern.compile( "\\((\\d+)\\) \"(.*)\"" );
// Component: (1158) "GPDB" <-> (1157) "GPDBStream"
// Component: (1002) "FireDragon" <-> (1005) "MavenR3Stream Workspace" (outgoing addition)
- private static final String COMPONENT_PATTERN2 = "\\((\\d+)\\) \"(.*)\" <.*>";
-
- /**
- * @see #COMPONENT_PATTERN2
- */
- private RE componentRegExp2;
+ private static final Pattern COMPONENT_PATTERN2 = Pattern.compile( "\\((\\d+)\\) \"(.*)\" <.*>" );
// Baseline: (1128) 27 "BogusTestJazz-3.0.0.40"
- private static final String BASELINE_PATTERN = "\\((\\d+)\\) (\\d+) \"(.*)\"";
-
- /**
- * @see #BASELINE_PATTERN
- */
- private RE baselineRegExp;
+ private static final Pattern BASELINE_PATTERN = Pattern.compile( "\\((\\d+)\\) (\\d+) \"(.*)\"" );
// Additional data we collect. (eye catchers)
@@ -154,20 +134,6 @@ public class JazzStatusConsumer
public JazzStatusConsumer( ScmProviderRepository repo, ScmLogger logger )
{
super( repo, logger );
-
- try
- {
- workspaceRegExp = new RE( WORKSPACE_PATTERN );
- componentRegExp1 = new RE( COMPONENT_PATTERN1 );
- componentRegExp2 = new RE( COMPONENT_PATTERN2 );
- baselineRegExp = new RE( BASELINE_PATTERN );
- }
- catch ( RESyntaxException ex )
- {
- throw new RuntimeException(
- "INTERNAL ERROR: Could not create regexp to parse jazz scm status output. This shouldn't happen. Something is probably wrong with the oro installation.",
- ex );
- }
}
/**
@@ -209,14 +175,15 @@ public class JazzStatusConsumer
// With a stream:
// Workspace: (1156) "GPDBWorkspace" <-> (1157) "GPDBStream"
- if ( workspaceRegExp.match( line ) )
+ Matcher matcher = WORKSPACE_PATTERN.matcher( line );
+ if ( matcher.find() )
{
JazzScmProviderRepository jazzRepository = (JazzScmProviderRepository) getRepository();
- int workspaceAlias = Integer.parseInt( workspaceRegExp.getParen( 1 ) );
- String workspace = workspaceRegExp.getParen( 2 );
- int streamAlias = Integer.parseInt( workspaceRegExp.getParen( 3 ) );
- String stream = workspaceRegExp.getParen( 4 );
+ int workspaceAlias = Integer.parseInt( matcher.group( 1 ) );
+ String workspace = matcher.group( 2 );
+ int streamAlias = Integer.parseInt( matcher.group( 3 ) );
+ String stream = matcher.group( 4 );
if ( getLogger().isDebugEnabled() )
{
getLogger().debug( "Successfully parsed \"Workspace:\" line:" );
@@ -246,12 +213,13 @@ public class JazzStatusConsumer
// With some additional information:
// Component: (1002) "FireDragon" <-> (1005) "MavenR3Stream Workspace" (outgoing addition)
- if ( componentRegExp1.match( line ) )
+ Matcher matcher = COMPONENT_PATTERN1.matcher( line );
+ if ( matcher.find() )
{
// Component: (1001) "BogusComponent"
JazzScmProviderRepository jazzRepository = (JazzScmProviderRepository) getRepository();
- int componentAlias = Integer.parseInt( componentRegExp1.getParen( 1 ) );
- String component = componentRegExp1.getParen( 2 );
+ int componentAlias = Integer.parseInt( matcher.group( 1 ) );
+ String component = matcher.group( 2 );
if ( getLogger().isDebugEnabled() )
{
getLogger().debug( "Successfully parsed \"Component:\" line:" );
@@ -261,12 +229,13 @@ public class JazzStatusConsumer
jazzRepository.setComponent( component );
}
- if ( componentRegExp2.match( line ) )
+ matcher = COMPONENT_PATTERN2.matcher( line );
+ if ( matcher.find() )
{
// Component: (1158) "GPDB" <-> (1157) "GPDBStream"
JazzScmProviderRepository jazzRepository = (JazzScmProviderRepository) getRepository();
- int componentAlias = Integer.parseInt( componentRegExp2.getParen( 1 ) );
- String component = componentRegExp2.getParen( 2 );
+ int componentAlias = Integer.parseInt( matcher.group( 1 ) );
+ String component = matcher.group( 2 );
if ( getLogger().isDebugEnabled() )
{
getLogger().debug( "Successfully parsed \"Component:\" line:" );
@@ -286,13 +255,14 @@ public class JazzStatusConsumer
{
// Baseline: (1128) 27 "BogusTestJazz-3.0.0.40"
- if ( baselineRegExp.match( line ) )
+ Matcher matcher = BASELINE_PATTERN.matcher( line );
+ if ( matcher.find() )
{
JazzScmProviderRepository jazzRepository = (JazzScmProviderRepository) getRepository();
- int baselineAlias = Integer.parseInt( baselineRegExp.getParen( 1 ) );
- int baselineId = Integer.parseInt( baselineRegExp.getParen( 2 ) );
- String baseline = baselineRegExp.getParen( 3 );
+ int baselineAlias = Integer.parseInt( matcher.group( 1 ) );
+ int baselineId = Integer.parseInt( matcher.group( 2 ) );
+ String baseline = matcher.group( 3 );
if ( getLogger().isDebugEnabled() )
{
getLogger().debug( "Successfully parsed \"Baseline:\" line:" );