Ver código fonte

Merge branch 'master' of https://repo1.mydevil.net/git/priv/ranides/assira

# Conflicts:
#	assira/src/main/java/net/ranides/assira/trace/ExceptionInspector.java
#	assira1/src/main/java/net/ranides/assira/text/StringUtils.java
Ranides Atterwim 10 anos atrás
pai
commit
edd135c348

+ 2 - 2
assira1/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>net.ranides</groupId>
     <artifactId>assira</artifactId>
-    <version>0.80.1</version>
+    <version>0.81.0</version>
     <packaging>jar</packaging>
 
     <name>assira1</name>
@@ -193,7 +193,7 @@
         <dependency>
             <groupId>net.ranides</groupId>
             <artifactId>assira.asm</artifactId>
-            <version>4.2</version>
+            <version>5.0.4</version>
         </dependency>
         <dependency>
             <groupId>eu.vitaliy</groupId>

+ 4 - 4
assira1/src/main/java/net/ranides/assira/text/StringUtils.java

@@ -489,9 +489,9 @@ public final class StringUtils {
     public static String escapeRegex(String text) {
         return REGEX_SPECIAL.matcher(text).replaceAll("\\\\$1");
     }
-	
-	public static Pattern compileWildcard(String wildcard) {
-		return Pattern.compile(StringUtils.escapeRegex(wildcard).replace("\\*", ".*"));
-	}
     
+    public static Pattern compileWildcard(String wildcard) {
+        return Pattern.compile(StringUtils.escapeRegex(wildcard).replace("\\*", ".*"));
+    }
+
 }