git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-629 labelled breaks are frowned upon by everyone
[jalview.git]
/
src
/
com
/
stevesoft
/
pat
/
Skip.java
diff --git
a/src/com/stevesoft/pat/Skip.java
b/src/com/stevesoft/pat/Skip.java
index
d3f3822
..
2db602a
100755
(executable)
--- a/
src/com/stevesoft/pat/Skip.java
+++ b/
src/com/stevesoft/pat/Skip.java
@@
-20,8
+20,8
@@
public class Skip
static int mkmask(int c)
{
char x = (char) c;
static int mkmask(int c)
{
char x = (char) c;
- return ~(CaseMgr.toUpperCase(x) | CaseMgr.toLowerCase(x) | CaseMgr
- .toTitleCase(x));
+ return ~(CaseMgr.toUpperCase(x) | CaseMgr.toLowerCase(x)
+ | CaseMgr.toTitleCase(x));
}
String src;
}
String src;
@@
-172,11
+172,10
@@
public class Skip
}
return sk;
}
}
return sk;
}
- else if (p instanceof Or
- && ((Or) p).v.size() == 1
+ else if (p instanceof Or && ((Or) p).v.size() == 1
&& !((Or) p).leftForm().equals("(?!")
&& !((Or) p).leftForm().equals("(?!")
- && null != (subsk = findSkip((Pattern) ((Or) p).v
- .elementAt(0), ignoreCase, trnc)))
+ && null != (subsk = findSkip(
+ (Pattern) ((Or) p).v.elementAt(0), ignoreCase, trnc)))
{
subsk.offset += offset;
return subsk;
{
subsk.offset += offset;
return subsk;
@@
-187,8
+186,8
@@
public class Skip
}
else
{
}
else
{
- return skipc < 0 ? null : new Skip("" + (char) skipc, ignoreCase,
- skipoff);
+ return skipc < 0 ? null
+ : new Skip("" + (char) skipc, ignoreCase, skipoff);
}
}
return null;
}
}
return null;