Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve regex expressions #5282

Merged
merged 3 commits into from Jun 14, 2022
Merged

Improve regex expressions #5282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e2f7d8
Improve regex expression
bjhargrave Jun 14, 2022
5806a12
Improve regex expression
bjhargrave Jun 14, 2022
3487b9b
Mark class Deprecated
bjhargrave Jun 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions biz.aQute.repository/src/aQute/bnd/deployer/http/HttpsUtil.java
View file
Open in desktop
Expand Up @@ -13,10 +13,13 @@
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;

@Deprecated
public class HttpsUtil {

@Deprecated
public static final String PROP_DISABLE_SERVER_CERT_VERIFY = "disableServerVerify";

@Deprecated
static void disableServerVerification(URLConnection connection) throws GeneralSecurityException {
if (!(connection instanceof HttpsURLConnection))
return;
Expand Down
4 changes: 2 additions & 2 deletions bndtools.core/src/bndtools/editor/completion/BndCompletionProcessor.java
View file
Open in desktop
Expand Up @@ -18,15 +18,15 @@

public class BndCompletionProcessor implements IContentAssistProcessor {

private static final Pattern PREFIX_PATTERN = Pattern.compile("^(?:.*\\s)*(.*)$");
private static final Pattern PREFIX_PATTERN = Pattern.compile("(\\S+)$");

@Override
public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) {
try {
String pre = viewer.getDocument()
.get(0, offset);
Matcher matcher = PREFIX_PATTERN.matcher(pre);
if (matcher.matches()) {
if (matcher.find()) {
String prefix = matcher.group(1);
ICompletionProposal[] found = proposals(prefix, offset);
if (found.length == 1) {
Expand Down
2 changes: 1 addition & 1 deletion bndtools.jareditor/src/bndtools/jareditor/internal/JarFileSystem.java
View file
Open in desktop
Expand Up @@ -59,7 +59,7 @@ public class JarFileSystem extends FileSystem {
private final ConcurrentMap<IFileStore, Reference<JarRootNode>> roots = new ConcurrentHashMap<>();

private static final Pattern JARF_P = Pattern
.compile("jarf:///(?<fileuri>.*)!(?<path>(/[^!]*)+)");
.compile("jarf:///(?<fileuri>.*)!(?<path>/[^!]*)");

static abstract class JarNode extends FileStore {
private final JarFolderNode parent;
Expand Down