Author: sdzmitrovich
Date: 2009-03-23 15:09:50 -0400 (Mon, 23 Mar 2009)
New Revision: 14296
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/CSSModel.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3920,https://jira.jboss.org/jira...
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 2009-03-23
18:56:46 UTC (rev 14295)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/CSSModel.java 2009-03-23
19:09:50 UTC (rev 14296)
@@ -33,7 +33,6 @@
import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSRuleContainer;
import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
import org.eclipse.wst.css.core.internal.text.StructuredTextPartitionerForCSS;
import org.eclipse.wst.sse.core.StructuredModelManager;
@@ -44,6 +43,7 @@
import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitioning;
import org.jboss.tools.jst.jsp.JspEditorPlugin;
import org.jboss.tools.jst.jsp.outline.cssdialog.events.StyleAttributes;
+import org.w3c.dom.css.CSSRule;
import org.w3c.dom.css.CSSRuleList;
import org.w3c.dom.css.CSSStyleDeclaration;
import org.w3c.dom.css.CSSStyleRule;
@@ -118,12 +118,13 @@
ICSSDocument document = cssModel.getDocument();
if (document instanceof CSSStyleSheet) {
styleSheet = (CSSStyleSheet) document;
+ prepareModel(styleSheet);
}
if (document instanceof ICSSStyleSheet) {
eclipseStyleSheet = (ICSSStyleSheet) document;
}
-
+
}
} catch (IOException e) {
JspEditorPlugin.getPluginLog().logError(e.getMessage());
@@ -418,7 +419,6 @@
node = node.getParentNode();
}
- Object rules= getRulesMapping();
if (node != null)
for (Entry<String, CSSStyleRule> rule : getRulesMapping()
.entrySet()) {
@@ -427,4 +427,16 @@
}
return null;
}
+
+ private void prepareModel(CSSStyleSheet styleSheet) {
+
+ CSSRuleList rules = styleSheet.getCssRules();
+ if ((rules != null) && (rules.getLength() > 0)) {
+ CSSRule rule = rules.item(rules.getLength() - 1);
+ String text = rule.getCssText();
+ if ((text != null) && (!text.endsWith(endBraces))) {
+ rule.setCssText(text + "\n"+ endBraces); //$NON-NLS-1$
+ }
+ }
+ }
}