Skip to content

Use static final Patterns in XMLElement #1875

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

Merged
merks merged 2 commits into from
Jul 15, 2025
Merged

Use static final Patterns in XMLElement #1875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ed4e3b
Use static final Patterns in XMLElement
merks Jul 15, 2025
5fce056
Version bump(s) for 4.37 stream
eclipse-pde-bot Jul 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui/org.eclipse.pde.genericeditor.extension/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.pde.genericeditor.extension;singleton:=true
Bundle-Version: 1.3.100.qualifier
Bundle-Version: 1.3.200.qualifier
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.jface.text,
Expand Down
21 changes: 12 additions & 9 deletions ...ion/src/org/eclipse/pde/internal/genericeditor/target/extension/model/xml/XMLElement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,34 +19,37 @@
import java.util.regex.Pattern;

public class XMLElement {
private static final Pattern START_ELEMENT_NAME_PATTERN = Pattern.compile("<\\s*(?<name>\\w*).*", Pattern.DOTALL); //$NON-NLS-1$
private static final Pattern END_ELEMENT_NAME_PATTERN = Pattern.compile("</\\s*(?<name>\\w*).*", Pattern.DOTALL); //$NON-NLS-1$
private static final Pattern ATTRIBUTE_PATTERN = Pattern.compile("((?<key>\\w*)\\s*=\\s*\"(?<value>.*?)\")", //$NON-NLS-1$
Pattern.DOTALL);
private static final Pattern START_ELEMENT_PATTERN = Pattern.compile("<[^/].*", Pattern.DOTALL); //$NON-NLS-1$
private static final Pattern END_ELEMENT_PATTERN = Pattern.compile("</.*|.*/>.*", Pattern.DOTALL); //$NON-NLS-1$

private final String element;
private final int offset;
private final String name;
private final Map<String, String> attributes = new HashMap<>();
private final boolean isEndElement;
private final boolean isStartElement;

private final Pattern startElementNamePattern = Pattern.compile("<\\s*(?<name>\\w*).*", Pattern.DOTALL); //$NON-NLS-1$
private final Pattern endElementNamePattern = Pattern.compile("</\\s*(?<name>\\w*).*", Pattern.DOTALL); //$NON-NLS-1$
private final Pattern attributePattern = Pattern.compile("((?<key>\\w*)\\s*=\\s*\"(?<value>.*?)\")", Pattern.DOTALL);//$NON-NLS-1$

public XMLElement(String element, int offset) {
this.element = element;
this.offset = offset;
this.isEndElement = element.matches("</(.|\n)*|(.|\n)*/>(.|\n)*"); //$NON-NLS-1$
this.isStartElement = element.matches("<[^/](.|\n)*"); //$NON-NLS-1$
this.isEndElement = END_ELEMENT_PATTERN.matcher(element).matches();
this.isStartElement = START_ELEMENT_PATTERN.matcher(element).matches();

Pattern namePattern;
if (isStartElement()) {
namePattern = startElementNamePattern;
namePattern = START_ELEMENT_NAME_PATTERN;
} else {
namePattern = endElementNamePattern;
namePattern = END_ELEMENT_NAME_PATTERN;
}
Matcher nameMatcher = namePattern.matcher(element);
nameMatcher.matches();
name = nameMatcher.group("name"); //$NON-NLS-1$

Matcher attrMatcher = attributePattern.matcher(element);
Matcher attrMatcher = ATTRIBUTE_PATTERN.matcher(element);
while (attrMatcher.find()) {
String key = attrMatcher.group("key"); //$NON-NLS-1$
String value = attrMatcher.group("value"); //$NON-NLS-1$
Expand Down
Loading