diff --git a/wolips.targetplatform/wolips.targetplatform.target b/wolips.targetplatform/wolips.targetplatform.target index 3d21d3fb0b..17f80285d5 100644 --- a/wolips.targetplatform/wolips.targetplatform.target +++ b/wolips.targetplatform/wolips.targetplatform.target @@ -50,15 +50,5 @@ - - - - com.helger - ph-css - 7.0.3 - jar - - - \ No newline at end of file diff --git a/wolips/plugins/org.objectstyle.wolips.tkhtmleditor/META-INF/MANIFEST.MF b/wolips/plugins/org.objectstyle.wolips.tkhtmleditor/META-INF/MANIFEST.MF index 3fce31e85b..ea34610ec7 100644 --- a/wolips/plugins/org.objectstyle.wolips.tkhtmleditor/META-INF/MANIFEST.MF +++ b/wolips/plugins/org.objectstyle.wolips.tkhtmleditor/META-INF/MANIFEST.MF @@ -159,9 +159,7 @@ Require-Bundle: org.eclipse.ui.editors, org.objectstyle.wolips.preferences, org.objectstyle.wolips.bindings, org.objectstyle.wolips.variables;bundle-version="1.0.6", - org.eclipse.e4.core.contexts;bundle-version="1.3.0", - com.helger.ph-css;bundle-version="7.0.3", - com.helger.commons.ph-commons;bundle-version="11.1.8" + org.eclipse.e4.core.contexts;bundle-version="1.3.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ClassPath: lib/xercesImpl.jar, diff --git a/wolips/plugins/org.objectstyle.wolips.tkhtmleditor/java/tk/eclipse/plugin/htmleditor/assist/CSSAssistProcessor.java b/wolips/plugins/org.objectstyle.wolips.tkhtmleditor/java/tk/eclipse/plugin/htmleditor/assist/CSSAssistProcessor.java index c4281d48be..84e0dabe0d 100644 --- a/wolips/plugins/org.objectstyle.wolips.tkhtmleditor/java/tk/eclipse/plugin/htmleditor/assist/CSSAssistProcessor.java +++ b/wolips/plugins/org.objectstyle.wolips.tkhtmleditor/java/tk/eclipse/plugin/htmleditor/assist/CSSAssistProcessor.java @@ -9,7 +9,6 @@ import com.helger.css.ECSSVersion; import com.helger.css.decl.CSSSelectorSimpleMember; import com.helger.css.decl.CascadingStyleSheet; -import com.helger.css.decl.ICSSSelectorMember; import com.helger.css.reader.CSSReader; import jp.aonir.fuzzyxml.FuzzyXMLAttribute; @@ -146,19 +145,13 @@ private void processStylesheet(String css) { CascadingStyleSheet styles = CSSReader.readFromString(css, ECSSVersion.LATEST); styles.getAllStyleRules().stream().forEach(stylerule ->{ stylerule.getAllSelectors().forEach(sel ->{ - //add to _rules here - String currentTag = "*"; - ArrayList currentClasses = _rules.computeIfAbsent(currentTag, k -> new ArrayList<>()); - for(ICSSSelectorMember mem: sel.getAllMembers()) { + //FIXME add to _rules here + sel.getAllMembers().stream().forEach(mem ->{ if(mem instanceof CSSSelectorSimpleMember m) { if(m.isElementName()) { - currentTag = m.getValue(); - currentClasses = _rules.computeIfAbsent(currentTag, k -> new ArrayList<>()); - } else if(m.isClass()) { - currentClasses.add(m.getValue().substring(1)); } } - } + }); }); }); } diff --git a/wolips/plugins/org.objectstyle.wolips.tkhtmleditor/pom.xml b/wolips/plugins/org.objectstyle.wolips.tkhtmleditor/pom.xml index 459e80b7bf..3b080f4bbc 100644 --- a/wolips/plugins/org.objectstyle.wolips.tkhtmleditor/pom.xml +++ b/wolips/plugins/org.objectstyle.wolips.tkhtmleditor/pom.xml @@ -10,6 +10,12 @@ eclipse-plugin org.objectstyle.wolips.tkhtmleditor + + + com.helger + ph-css + + java