From 7634b9fa412e04a28da64b60f8ca9d3756b78b7f Mon Sep 17 00:00:00 2001 From: mdb Date: Tue, 20 Feb 2007 19:12:30 +0000 Subject: [PATCH] Do that more nicely. git-svn-id: https://samskivert.googlecode.com/svn/trunk@2061 6335cc39-0255-0410-8fd6-9bcaacd3b74c --- src/java/com/samskivert/jdbc/depot/tools/GenRecordTask.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java/com/samskivert/jdbc/depot/tools/GenRecordTask.java b/src/java/com/samskivert/jdbc/depot/tools/GenRecordTask.java index 8626a3c9..c876771e 100644 --- a/src/java/com/samskivert/jdbc/depot/tools/GenRecordTask.java +++ b/src/java/com/samskivert/jdbc/depot/tools/GenRecordTask.java @@ -359,9 +359,9 @@ public class GenRecordTask extends Task protected static final String FIELDS_END = MARKER + "FIELDS END"; /** A regular expression for matching the package declaration. */ - protected static final Pattern PACKAGE_PATTERN = Pattern.compile("^\\s*package\\s+(\\S+)\\W"); + protected static final Pattern PACKAGE_PATTERN = Pattern.compile("^\\s*package\\s+(\\w+)\\W"); /** A regular expression for matching the class or interface declaration. */ protected static final Pattern NAME_PATTERN = Pattern.compile( - "^\\s*public\\s+(?:abstract\\s+)?(interface|class)\\s+(\\S+)(\\W|$)(<)?"); + "^\\s*public\\s+(?:abstract\\s+)?(interface|class)\\s+(\\w+)(\\W|$)"); }