Author: dsakovich Date: 2008-10-01 10:10:39 -0400 (Wed, 01 Oct 2008) New Revision: 10591 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/CSSStyleDialog.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/common/Constants.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/messages.properties Log: https://jira.jboss.org/jira/browse/JBIDE-2530 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-10-01 13:58:58 UTC (rev 10590) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java 2008-10-01 14:10:39 UTC (rev 10591) @@ -135,6 +135,7 @@ .getImageDescriptor(Constants.IMAGE_FOLDERLARGE_FILE_LOCATION); Image image = imageDesc.createImage(); button.setImage(image); + button.setToolTipText(MessageUtil.getString("CSS_BROWSE_BUTTON_TOOLTIP")); button.addDisposeListener(new DisposeListener() { public void widgetDisposed(DisposeEvent e) { Button button = (Button) e.getSource(); @@ -154,12 +155,12 @@ classCombo.addSelectionListener(new SelectionListener() { public void widgetDefaultSelected(SelectionEvent e) { - // TODO Auto-generated method stub } public void widgetSelected(SelectionEvent e) { - String style = cssModel.getStyle(classCombo.getText()); + String style = cssModel.getStyle(classCombo.getText()); + classCombo.setToolTipText(cssModel.getCSSText(classCombo.getText())); styleComposite.recreateStyleComposite(style); } @@ -202,8 +203,8 @@ + styleAttributes.getAttribute(key) + Constants.SEMICOLON_STRING; - html = Constants.OPEN_SPAN_TAG + styleForSpan - + Constants.TEXT_FOR_PREVIEW + Constants.CLOSE_SPAN_TAG; + html = Constants.OPEN_DIV_TAG + styleForSpan + + Constants.TEXT_FOR_PREVIEW + Constants.CLOSE_DIV_TAG; browser.setText(html); } }); Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSStyleDialog.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSStyleDialog.java 2008-10-01 13:58:58 UTC (rev 10590) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSStyleDialog.java 2008-10-01 14:10:39 UTC (rev 10591) @@ -88,8 +88,8 @@ styleForSpan += key + Constants.COLON_STRING + styleAttributes.getAttribute(key) + Constants.SEMICOLON_STRING; - html = Constants.OPEN_SPAN_TAG + styleForSpan - + Constants.TEXT_FOR_PREVIEW + Constants.CLOSE_SPAN_TAG; + html = Constants.OPEN_DIV_TAG + styleForSpan + + Constants.TEXT_FOR_PREVIEW + Constants.CLOSE_DIV_TAG; browser.setText(html); } }); 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-10-01 13:58:58 UTC (rev 10590) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/CSSModel.java 2008-10-01 14:10:39 UTC (rev 10591) @@ -81,6 +81,21 @@ return selectors; } + + public String getCSSText(String selector) { + if (styleSheet != null) { + CSSRuleList list = styleSheet.getCssRules(); + if (list != null) { + for (int i = 0; i < list.getLength(); i++) { + if (list.item(i) instanceof CSSStyleRule && ((CSSStyleRule)list.item(i)).getSelectorText().equals(selector)) { + return ((CSSStyleRule)list.item(i)).getCssText(); + } + } + } + } + return null; + } + /** * Get style by selectorName * Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/Constants.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/Constants.java 2008-10-01 13:58:58 UTC (rev 10590) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/Constants.java 2008-10-01 14:10:39 UTC (rev 10591) @@ -63,6 +63,9 @@ public static String OPEN_SPAN_TAG = "<span style=\"width: 100%;"; public static String CLOSE_SPAN_TAG = "</span>"; + public static String OPEN_DIV_TAG = "<div style=\"width: 100%;"; + public static String CLOSE_DIV_TAG = "</div>"; + public static String TEXT_FOR_PREVIEW = "\">Text for preview"; public static String COLON_STRING = ":"; Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/messages.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/messages.properties 2008-10-01 13:58:58 UTC (rev 10590) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/messages.properties 2008-10-01 14:10:39 UTC (rev 10591) @@ -1,5 +1,6 @@ CSS_STYLE_DIALOG_TITLE=CSS Style Dialog CSS_STYLE_CLASS_DIALOG_TITLE=CSS Style Class Dialog +CSS_BROWSE_BUTTON_TOOLTIP=Browse TEXT_FONT_TAB_NAME=Text/Font BOXES_TAB_NAME=Boxes BACKGROUND_TAB_NAME=Background