Author: dvinnichek Date: 2010-07-20 16:48:20 -0400 (Tue, 20 Jul 2010) New Revision: 23607 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/CSSModel.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/cssselector/model/CSSJSPRecognizer.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/cssselector/model/CSSSelectorTreeModel.java Log: fix https://jira.jboss.org/browse/JBIDE-6606 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/CSSModel.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/CSSModel.java 2010-07-20 18:25:46 UTC (rev 23606) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/CSSModel.java 2010-07-20 20:48:20 UTC (rev 23607) @@ -57,7 +57,6 @@ private CSSStyleSheet styleSheet = null; private static final String COPY_SUFFIX = "_copy"; //$NON-NLS-1$ - private static final String CHARSET = "@CHARSET"; //$NON-NLS-1$ private boolean copy = false; // workaround for JBIDE-4407 @@ -325,10 +324,11 @@ final CSSRuleList rules = styleSheet.getCssRules(); if ((rules != null) && (rules.getLength() > 0)) { final CSSRule rule = rules.item(rules.getLength() - 1); - final String text = rule.getCssText(); - if (text != null && !text.toUpperCase().startsWith(CHARSET) && - !text.endsWith(Constants.RIGHT_BRACE)) { - rule.setCssText(text + "\n" + Constants.RIGHT_BRACE); //$NON-NLS-1$ + if (rule.getType() == CSSRule.STYLE_RULE) { + final String text = rule.getCssText(); + if (text != null && !text.endsWith(Constants.RIGHT_BRACE)) { + rule.setCssText(text + "\n" + Constants.RIGHT_BRACE); //$NON-NLS-1$ + } } } } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/cssselector/model/CSSJSPRecognizer.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/cssselector/model/CSSJSPRecognizer.java 2010-07-20 18:25:46 UTC (rev 23606) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/cssselector/model/CSSJSPRecognizer.java 2010-07-20 20:48:20 UTC (rev 23607) @@ -117,7 +117,11 @@ Map<String, Map<String, String>> styleMap = new LinkedHashMap<String, Map<String, String>>( 0); for (int i = 0; i < cssRules.length; i++) { - ICSSStyleRule styleRule = (ICSSStyleRule) cssRules[i]; + CSSRule cssRule = cssRules[i]; + if (cssRule.getType() != CSSRule.STYLE_RULE) { + continue; + } + ICSSStyleRule styleRule = (ICSSStyleRule) cssRule; String styleClassSelector = styleRule.getSelectorText(); String[] selectors = CSSSelectorUtils .parseSelectorName(styleClassSelector); Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/cssselector/model/CSSSelectorTreeModel.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/cssselector/model/CSSSelectorTreeModel.java 2010-07-20 18:25:46 UTC (rev 23606) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/cssselector/model/CSSSelectorTreeModel.java 2010-07-20 20:48:20 UTC (rev 23607) @@ -48,15 +48,17 @@ CSSRuleList cssRuleList = styleSheet.getCssRules(); for (int j = 0; j < cssRuleList.getLength(); j++) { CSSRule cssRule = cssRuleList.item(j); - String[] selectors = CSSSelectorUtils + if (cssRule.getType() == CSSRule.STYLE_RULE) { + String[] selectors = CSSSelectorUtils .parseSelectorName(((ICSSStyleRule) cssRule) .getSelectorText()); - for (int k = 0; k < selectors.length; k++) { - CSSTreeNode ruleNode = new CSSTreeNode(selectors[k]); - ruleNode.setCSSContainer(new CSSRuleContainer(selectors[k], + for (int k = 0; k < selectors.length; k++) { + CSSTreeNode ruleNode = new CSSTreeNode(selectors[k]); + ruleNode.setCSSContainer(new CSSRuleContainer(selectors[k], cssRule, cssStyleSheets[i].source)); - ruleNode.setStyleSheetSource(cssStyleSheets[i].source); - parentSheet.addChild(ruleNode); + ruleNode.setStyleSheetSource(cssStyleSheets[i].source); + parentSheet.addChild(ruleNode); + } } } }