Skip to content

Remove stale theme entries in CSSTheme #4291

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
shai-almog merged 1 commit into from
Dec 17, 2025
Merged

Remove stale theme entries in CSSTheme #4291

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 35 additions & 2 deletions CodenameOneDesigner/src/com/codename1/designer/css/CSSTheme.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1667,9 +1667,42 @@ public Map<String, CacheStatus> calculateSelectorCacheStatus(File cachedFile) th

}

private boolean isOwnedBy(String key, String id) {
if (key.length() <= id.length() + 1) {
return false;
}
if (!key.startsWith(id)) {
return false;
}
char sep = key.charAt(id.length());
if (sep != '.' && sep != '#') {
return false;
}
// Check for dots in the suffix
return key.indexOf('.', id.length() + 1) == -1;
}

public void updateResources() {
// TODO: We need to remove stale theme entries
// https://github.com/codenameone/CodenameOne/issues/2698
if (res != null) {
Map<String, Object> themeData = res.getTheme(themeName);
if (themeData != null) {
Set<String> keys = new HashSet<String>(themeData.keySet());
Set<String> modifiedIds = new HashSet<String>();
for (String id : elements.keySet()) {
if (isModified(id)) {
modifiedIds.add(id);
}
}

for (String id : modifiedIds) {
for (String key : keys) {
if (isOwnedBy(key, id)) {
res.setThemeProperty(themeName, key, null);
}
}
}
}
}

for (String id : elements.keySet()) {
if (!isModified(id)) {
Expand Down