Author: izhukov Date: 2008-12-03 10:01:57 -0500 (Wed, 03 Dec 2008) New Revision: 12251 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/StyleComposite.java 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/tabs/TabPreviewControl.java Log: JBIDE-3328 fixed Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java 2008-12-03 14:48:09 UTC (rev 12250) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java 2008-12-03 15:01:57 UTC (rev 12251) @@ -555,10 +555,7 @@ styleComposite.revertPreview(); updateStyleComposite(); styleAttributes.setCssSelector(currentClassStyle); - if (currentClassStyle != null && !currentClassStyle.equals(Constants.EMPTY)) { -// cssModel.setCSS(currentClassStyle, styleAttributes); - styleComposite.updatePreview(); - } + styleComposite.updatePreview(currentClassStyle); updateOKButtonState(); } else { currentClassStyle = classCombo.getText().trim(); Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/StyleComposite.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/StyleComposite.java 2008-12-03 14:48:09 UTC (rev 12250) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/StyleComposite.java 2008-12-03 15:01:57 UTC (rev 12251) @@ -25,6 +25,7 @@ import org.eclipse.swt.widgets.TabItem; import org.jboss.tools.jst.jsp.messages.JstUIMessages; import org.jboss.tools.jst.jsp.outline.cssdialog.common.CSSModel; +import org.jboss.tools.jst.jsp.outline.cssdialog.common.Constants; import org.jboss.tools.jst.jsp.outline.cssdialog.events.ManualChangeStyleListener; import org.jboss.tools.jst.jsp.outline.cssdialog.events.StyleAttributes; import org.jboss.tools.jst.jsp.outline.cssdialog.parsers.BaseListener; @@ -444,11 +445,13 @@ /** * Method is used to update preview selection area. + * + * @param selector CSS selector */ - public void updatePreview() { + public void updatePreview(String selector) { if (tabPreviewControl != null && lastSelectedTab == tabPreview) { - cssModel.setCSS(styleAttributes.getCssSelector(), styleAttributes); - tabPreviewControl.selectEditorArea(styleAttributes.getCssSelector(), 0); + cssModel.setCSS(selector, styleAttributes); + tabPreviewControl.selectEditorArea(selector, 0); } } 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 2008-12-03 14:48:09 UTC (rev 12250) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/CSSModel.java 2008-12-03 15:01:57 UTC (rev 12251) @@ -184,7 +184,7 @@ * @param styleAttribute the style to be set */ public void setCSS(String selector, StyleAttributes styleAttributes) { - if (styleSheet != null) { + if (styleSheet != null && selector != null && !selector.equals(Constants.EMPTY)) { CSSRuleList list = styleSheet.getCssRules(); if (list != null) { Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabPreviewControl.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabPreviewControl.java 2008-12-03 14:48:09 UTC (rev 12250) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabPreviewControl.java 2008-12-03 15:01:57 UTC (rev 12251) @@ -105,8 +105,12 @@ public void selectEditorArea(String selector, int index) { if (cssModel != null) { IndexedRegion indexedRegion = cssModel.getSelectorRegion(selector, index); - if (editor != null && indexedRegion != null) { - editor.selectAndReveal(indexedRegion.getStartOffset(), indexedRegion.getLength()); + if (editor != null) { + if (indexedRegion != null) { + editor.selectAndReveal(indexedRegion.getStartOffset(), indexedRegion.getLength()); + } else { + editor.selectAndReveal(0, 0); + } } } }