Author: izhukov Date: 2008-12-02 10:33:52 -0500 (Tue, 02 Dec 2008) New Revision: 12215 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/common/CSSModel.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/Util.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/events/StyleAttributes.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabBackgroundControl.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabBoxesControl.java 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/TabQuickEditControl.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabTextControl.java Log: 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-02 15:12:10 UTC (rev 12214) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java 2008-12-02 15:33:52 UTC (rev 12215) @@ -15,6 +15,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; + import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspaceRoot; @@ -47,8 +48,6 @@ import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; @@ -194,19 +193,13 @@ @Override protected Control createDialogArea(final Composite parent) { final Composite composite = (Composite) super.createDialogArea(parent); - final Control control =createDialogComposite(composite); + final Control control = createDialogComposite(composite); return control; } - private void setCentered(Shell dialogShell) { - Display display = dialogShell.getDisplay(); - int width = display.getClientArea().width; - int height = display.getClientArea().height; - dialogShell.setLocation(((width - dialogShell.getSize().x) / 2), ((height - dialogShell.getSize().y) / 2)); - } /** * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(Composite) -// */ + */ @Override protected void createButtonsForButtonBar(Composite parent) { super.createButtonsForButtonBar(parent); @@ -216,6 +209,13 @@ getShell().layout(true); } + private void setCentered(Shell dialogShell) { + Display display = dialogShell.getDisplay(); + int width = display.getClientArea().width; + int height = display.getClientArea().height; + dialogShell.setLocation(((width - dialogShell.getSize().x) / 2), ((height - dialogShell.getSize().y) / 2)); + } + private Split split; /** * Create the dialog itself. @@ -266,7 +266,7 @@ styleChanged = true; if (currentClassStyle != null && !currentClassStyle.equals(Constants.EMPTY) && currentFile != null && !currentFile.equals(Constants.EMPTY)) { - styleComposite.updateStyle(); +// styleComposite.updateStyle(); cssModel.setCSS(currentClassStyle, styleAttributes); applyButton.setEnabled(true); } @@ -301,7 +301,7 @@ contentAssistAdapter.setProposalAcceptanceStyle(ContentProposalAdapter.PROPOSAL_REPLACE); contentAssistAdapter.addContentProposalListener(new IContentProposalListener() { public void proposalAccepted(IContentProposal proposal) { - cssStyleClassChanged(); + cssStyleClassChanged(true); applyButton.setEnabled(false); keyInputSelector = false; } @@ -438,7 +438,7 @@ return; } } - cssStyleClassChanged(); + cssStyleClassChanged(true); applyButton.setEnabled(false); keyInputSelector = false; } @@ -449,11 +449,10 @@ if (currentClassStyle != null && currentClassStyle.equals(classCombo.getText().trim())) { return; } - cssStyleClassChanged(); + cssStyleClassChanged(true); applyButton.setEnabled(true); keyInputSelector = true; } - }); // this listener is responsible for processing dialog header message events classCombo.addModifyListener(new ModifyListener() { @@ -504,8 +503,12 @@ clearButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { styleComposite.clearStyleComposite(currentClassStyle); + styleComposite.revertPreview(); styleComposite.updateStyle(); - cssModel.setCSS(currentClassStyle, styleAttributes); + if (currentClassStyle != null && !currentClassStyle.equals(Constants.EMPTY)) { + cssModel.setCSS(currentClassStyle, styleAttributes); + } + applyButton.setEnabled(true); styleChanged = true; } }); @@ -529,7 +532,7 @@ /** * Method is used to correctly process style class change operation. */ - private void cssStyleClassChanged() { + private void cssStyleClassChanged(boolean updateStyleComposite) { if (currentFile != null && !currentFile.equals(Constants.EMPTY)) { if (styleChanged && currentClassStyle != null && !currentClassStyle.equals(Constants.EMPTY)) { MessageBox messageBox = new MessageBox(getParentShell(), SWT.YES | SWT.NO | SWT.ICON_QUESTION); @@ -541,7 +544,7 @@ if (classCombo.indexOf(currentClassStyle) == -1) { classCombo.add(currentClassStyle); } - saveChanges(false); + saveChanges(!updateStyleComposite); // update content assist proposals SimpleContentProposalProvider proposalProvider = (SimpleContentProposalProvider)contentAssistAdapter.getContentProposalProvider(); @@ -553,16 +556,20 @@ // update current class style value currentClassStyle = classCombo.getText().trim(); styleComposite.revertPreview(); + if (updateStyleComposite) { updateStyleComposite(); - cssModel.setCSS(currentClassStyle, styleAttributes); - styleComposite.updatePreview(); - + styleAttributes.setCssSelector(currentClassStyle); + if (currentClassStyle != null && !currentClassStyle.equals(Constants.EMPTY)) { + cssModel.setCSS(currentClassStyle, styleAttributes); + styleComposite.updatePreview(); + } updateOKButtonState(); + } } else { currentClassStyle = classCombo.getText().trim(); + styleAttributes.setCssSelector(currentClassStyle); } styleChanged = false; - styleAttributes.setCssSelector(currentClassStyle); } /** @@ -638,12 +645,18 @@ browser.dispose(); // create Text area component instead of HTML Browser GridData gridData = new GridData(GridData.FILL, GridData.FILL, true, true); - textBrowser = new Text(browserContainer, SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL); +// textBrowser = new Text(browserContainer, SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL); + textBrowser = new Text(browserContainer, SWT.NONE | SWT.H_SCROLL); textBrowser.setText(previewBrowserValue); textBrowser.addFocusListener(new FocusAdapter() { public void focusLost(FocusEvent e) { if (e.widget == textBrowser) { - previewBrowserValue = textBrowser.getText(); + String text = textBrowser.getText(); + if (text == null || text.equals(Constants.EMPTY)) { + previewBrowserValue = JstUIMessages.DEFAULT_TEXT_FOR_BROWSER_PREVIEW; + } else { + previewBrowserValue = text; + } textBrowser.dispose(); // create Browse component instead of text area createBrowserComponent(); @@ -751,7 +764,8 @@ int code = getReturnCode(); switch (code) { case OK: - saveChanges(true); + cssStyleClassChanged(false); + styleComposite.closePreview(true); break; case CANCEL: default: 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-02 15:12:10 UTC (rev 12214) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/CSSModel.java 2008-12-02 15:33:52 UTC (rev 12215) @@ -202,12 +202,12 @@ // set properties Set<Entry<String, String>> set = styleAttributes.entrySet(); for (Map.Entry<String, String> me : set) { - try { +// try { declaration.setProperty(me.getKey(), me.getValue(), Constants.EMPTY); - } catch (Exception e) { +// } catch (Exception e) { // declaration.removeProperty(me.getKey()); // e.printStackTrace(); - } +// } } formatProcessorCSS.formatModel(model); Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/Util.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/Util.java 2008-12-02 15:12:10 UTC (rev 12214) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/common/Util.java 2008-12-02 15:33:52 UTC (rev 12215) @@ -402,6 +402,7 @@ } sb.append(value); if (i != (styleClasses.length - 1)) { + sb.append(Constants.COMMA); sb.append(Constants.WHITE_SPACE); } } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/events/StyleAttributes.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/events/StyleAttributes.java 2008-12-02 15:12:10 UTC (rev 12214) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/events/StyleAttributes.java 2008-12-02 15:33:52 UTC (rev 12215) @@ -13,8 +13,8 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import java.util.Set; import java.util.Map.Entry; -import java.util.Set; import org.jboss.tools.jst.jsp.outline.cssdialog.common.Constants; @@ -115,7 +115,8 @@ * @return attribute value */ public String getAttribute(String name) { - return attributeMap.get(name); + String value = attributeMap.get(name); + return value != null ? value : Constants.EMPTY; } /** Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabBackgroundControl.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabBackgroundControl.java 2008-12-02 15:12:10 UTC (rev 12214) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabBackgroundControl.java 2008-12-02 15:33:52 UTC (rev 12215) @@ -93,7 +93,7 @@ public void modifyText(ModifyEvent event) { String tmp = colorCombo.getText(); if (tmp != null && tmp.trim().length() > 0) { - styleAttributes.addAttribute(CSSConstants.BACKGROUND_COLOR, tmp); + styleAttributes.addAttribute(CSSConstants.BACKGROUND_COLOR, tmp.trim()); } else { styleAttributes.removeAttribute(CSSConstants.BACKGROUND_COLOR); } @@ -153,7 +153,7 @@ String tmp = backgroundImageCombo.getText(); if (tmp != null && tmp.trim().length() > 0) { tmp = adjustBackgroundURL(tmp); - styleAttributes.addAttribute(CSSConstants.BACKGROUND_IMAGE, tmp); + styleAttributes.addAttribute(CSSConstants.BACKGROUND_IMAGE, tmp.trim()); } else { styleAttributes.removeAttribute(CSSConstants.BACKGROUND_IMAGE); } @@ -212,7 +212,7 @@ public void modifyText(ModifyEvent event) { String tmp = backgroundRepeatCombo.getText(); if (tmp != null && tmp.trim().length() > 0) { - styleAttributes.addAttribute(CSSConstants.BACKGROUND_REPEAT, tmp); + styleAttributes.addAttribute(CSSConstants.BACKGROUND_REPEAT, tmp.trim()); } else { styleAttributes.removeAttribute(CSSConstants.BACKGROUND_REPEAT); } @@ -237,36 +237,26 @@ updateDataFromStyleAttributes = true; // set BACKGROUND_COLOR attribute String tmp = styleAttributes.getAttribute(CSSConstants.BACKGROUND_COLOR); - if (tmp == null) { - tmp = Constants.EMPTY; - } if (!tmp.equals(colorCombo.getText())) { colorCombo.setText(tmp); } // set BACKGROUND_IMAGE attribute tmp = styleAttributes.getAttribute(CSSConstants.BACKGROUND_IMAGE); - if (tmp == null) { - tmp = Constants.EMPTY; - } if (!tmp.equals(backgroundImageCombo.getText())) { backgroundImageCombo.setText(tmp); } // set BACKGROUND_REPEAT attribute tmp = styleAttributes.getAttribute(CSSConstants.BACKGROUND_REPEAT); - if (tmp == null) { - tmp = Constants.EMPTY; - } if (!tmp.equals(backgroundRepeatCombo.getText())) { backgroundRepeatCombo.setText(tmp); } updateDataFromStyleAttributes = false; } - //Fix for JBIDE-3084 - //in css background image should always be wraped into url(*); + // Fix for JBIDE-3084 + // in css background image should always be wrapped into url(*); private static String adjustBackgroundURL(String backgroundURL) { if ((backgroundURL != null) && (backgroundURL.matches("(url)\\(.*\\)") == false)) { //$NON-NLS-1$ - return "url(" + backgroundURL + ")"; //$NON-NLS-1$//$NON-NLS-2$ } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabBoxesControl.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabBoxesControl.java 2008-12-02 15:12:10 UTC (rev 12214) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabBoxesControl.java 2008-12-02 15:33:52 UTC (rev 12215) @@ -83,8 +83,6 @@ super(composite, SWT.NONE); this.styleAttributes = styleAttributes; - // TODO Dzmitry Sakovich - // this.cssDialog = dialog; final GridLayout gridLayout = new GridLayout(); gridLayout.numColumns = numColumns; setLayout(gridLayout); @@ -107,14 +105,14 @@ public void modifyText(ModifyEvent event) { String tmp = widthText.getText(); if (tmp != null && tmp.trim().length() > 0) { - String extWidth = extWidthCombo.getText().trim(); + String extWidth = extWidthCombo.getText(); if (extWidth != null) { - styleAttributes.addAttribute(CSSConstants.WIDTH, tmp + extWidth); - } else { - styleAttributes.addAttribute(CSSConstants.WIDTH, tmp); + tmp += extWidth; } + styleAttributes.addAttribute(CSSConstants.WIDTH, tmp); } else { styleAttributes.removeAttribute(CSSConstants.WIDTH); + extWidthCombo.select(0); } if (!updateDataFromStyleAttributes) { notifyListeners(); @@ -125,12 +123,15 @@ extWidthCombo.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false)); extWidthCombo.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent event) { - String width = widthText.getText().trim(); - if (width != null && !width.equals(Constants.EMPTY)) { + String width = widthText.getText(); + if (width != null && !width.trim().equals(Constants.EMPTY)) { String tmp = extWidthCombo.getText(); if (tmp != null) { styleAttributes.addAttribute(CSSConstants.WIDTH, width + tmp); } + } else { + extWidthCombo.select(0); + return; } if (!updateDataFromStyleAttributes) { notifyListeners(); @@ -154,14 +155,14 @@ public void modifyText(ModifyEvent event) { String tmp = heightText.getText(); if (tmp != null && tmp.trim().length() > 0) { - String extHeight = extHeightCombo.getText().trim(); - if (extHeight != null) { - styleAttributes.addAttribute(CSSConstants.HEIGHT, tmp + extHeight); - } else { - styleAttributes.addAttribute(CSSConstants.HEIGHT, tmp); - } + String extHeight = extHeightCombo.getText(); + if (extHeight != null) { + tmp += extHeight; + } + styleAttributes.addAttribute(CSSConstants.HEIGHT, tmp); } else { styleAttributes.removeAttribute(CSSConstants.HEIGHT); + extHeightCombo.select(0); } if (!updateDataFromStyleAttributes) { notifyListeners(); @@ -172,12 +173,15 @@ extHeightCombo.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false)); extHeightCombo.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent event) { - String height = heightText.getText().trim(); - if (height != null && !height.equals(Constants.EMPTY)) { + String height = heightText.getText(); + if (height != null && !height.trim().equals(Constants.EMPTY)) { String tmp = extHeightCombo.getText(); if (tmp != null) { styleAttributes.addAttribute(CSSConstants.HEIGHT, height + tmp); } + } else { + extHeightCombo.select(0); + return; } if (!updateDataFromStyleAttributes) { notifyListeners(); @@ -206,9 +210,9 @@ borderStyleCombo.setLayoutData(gridData); borderStyleCombo.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent event) { - String tmp = borderStyleCombo.getText().trim(); - if (tmp != null && !tmp.equals(Constants.EMPTY)) { - styleAttributes.addAttribute(CSSConstants.BORDER_STYLE, tmp); + String tmp = borderStyleCombo.getText(); + if (tmp != null && !tmp.trim().equals(Constants.EMPTY)) { + styleAttributes.addAttribute(CSSConstants.BORDER_STYLE, tmp.trim()); } else { styleAttributes.removeAttribute(CSSConstants.BORDER_STYLE); } @@ -235,8 +239,8 @@ borderColorCombo.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent event) { String tmp = borderColorCombo.getText().trim(); - if (tmp != null && !tmp.equals(Constants.EMPTY)) { - styleAttributes.addAttribute(CSSConstants.BORDER_COLOR, tmp); + if (tmp != null && !tmp.trim().equals(Constants.EMPTY)) { + styleAttributes.addAttribute(CSSConstants.BORDER_COLOR, tmp.trim()); } else { styleAttributes.removeAttribute(CSSConstants.BORDER_COLOR); } @@ -306,13 +310,13 @@ String tmp = borderWidthCombo.getText(); if (tmp != null && tmp.trim().length() > 0) { String extBorderWidth = extBorderWidthCombo.getText(); - if (extBorderWidth != null) { - styleAttributes.addAttribute(CSSConstants.BORDER_WIDTH, tmp + extBorderWidth); - } else { - styleAttributes.addAttribute(CSSConstants.BORDER_WIDTH, tmp); - } + if (extBorderWidth != null) { + tmp += extBorderWidth; + } + styleAttributes.addAttribute(CSSConstants.BORDER_WIDTH, tmp); } else { styleAttributes.removeAttribute(CSSConstants.BORDER_WIDTH); + extBorderWidthCombo.select(0); } if (!updateDataFromStyleAttributes) { notifyListeners(); @@ -327,12 +331,15 @@ extBorderWidthCombo.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false)); extBorderWidthCombo.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent event) { - String borderWidth = borderWidthCombo.getText().trim(); - if (borderWidth != null && !borderWidth.equals(Constants.EMPTY)) { + String borderWidth = borderWidthCombo.getText(); + if (borderWidth != null && !borderWidth.trim().equals(Constants.EMPTY)) { String tmp = extBorderWidthCombo.getText(); if (tmp != null) { styleAttributes.addAttribute(CSSConstants.BORDER_WIDTH, borderWidth + tmp); } + } else { + extBorderWidthCombo.select(0); + return; } if (!updateDataFromStyleAttributes) { notifyListeners(); @@ -361,14 +368,14 @@ public void modifyText(ModifyEvent event) { String tmp = marginText.getText(); if (tmp != null && tmp.trim().length() > 0) { - String extMargin = extMarginCombo.getText().trim(); + String extMargin = extMarginCombo.getText(); if (extMargin != null) { - styleAttributes.addAttribute(CSSConstants.MARGIN, tmp + extMargin); - } else { - styleAttributes.addAttribute(CSSConstants.MARGIN, tmp); + tmp += extMargin; } + styleAttributes.addAttribute(CSSConstants.MARGIN, tmp); } else { styleAttributes.removeAttribute(CSSConstants.MARGIN); + extMarginCombo.select(0); } if (!updateDataFromStyleAttributes) { notifyListeners(); @@ -379,12 +386,15 @@ extMarginCombo.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false)); extMarginCombo.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent event) { - String margin = marginText.getText().trim(); - if (margin != null && !margin.equals(Constants.EMPTY)) { + String margin = marginText.getText(); + if (margin != null && !margin.trim().equals(Constants.EMPTY)) { String tmp = extMarginCombo.getText(); if (tmp != null) { styleAttributes.addAttribute(CSSConstants.MARGIN, margin + tmp); } + } else { + extMarginCombo.select(0); + return; } if (!updateDataFromStyleAttributes) { notifyListeners(); @@ -408,14 +418,14 @@ public void modifyText(ModifyEvent event) { String tmp = paddingText.getText(); if (tmp != null && tmp.trim().length() > 0) { - String extPadding = extPaddingCombo.getText().trim(); + String extPadding = extPaddingCombo.getText(); if (extPadding != null) { - styleAttributes.addAttribute(CSSConstants.PADDING, tmp + extPadding); - } else { - styleAttributes.addAttribute(CSSConstants.PADDING, tmp); + tmp += extPadding; } + styleAttributes.addAttribute(CSSConstants.PADDING, tmp); } else { styleAttributes.removeAttribute(CSSConstants.PADDING); + extPaddingCombo.select(0); } if (!updateDataFromStyleAttributes) { notifyListeners(); @@ -426,12 +436,15 @@ extPaddingCombo.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false)); extPaddingCombo.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent event) { - String padding = paddingText.getText().trim(); - if (padding != null && !padding.equals(Constants.EMPTY)) { + String padding = paddingText.getText(); + if (padding != null && !padding.trim().equals(Constants.EMPTY)) { String tmp = extPaddingCombo.getText(); if (tmp != null) { styleAttributes.addAttribute(CSSConstants.PADDING, padding + tmp); } + } else { + extPaddingCombo.select(0); + return; } if (!updateDataFromStyleAttributes) { notifyListeners(); @@ -468,98 +481,62 @@ updateDataFromStyleAttributes = true; // set WIDTH and EXTENSION_WIDTH attributes String tmp = styleAttributes.getAttribute(CSSConstants.WIDTH); - if (tmp == null) { - tmp = Constants.EMPTY; - extWidthCombo.select(0); - } String[] str = Util.convertExtString(tmp); if (!str[0].equals(widthText.getText())) { widthText.setText(str[0]); if (extWidthCombo.indexOf(str[1]) != -1) { extWidthCombo.setText(str[1]); extWidthCombo.select(extWidthCombo.indexOf(str[1])); - } else { - extWidthCombo.select(0); } } // set HEIGHT and EXTENSION_HEIGHT attributes tmp = styleAttributes.getAttribute(CSSConstants.HEIGHT); - if (tmp == null) { - tmp = Constants.EMPTY; - extHeightCombo.select(0); - } str = Util.convertExtString(tmp); if (!str[0].equals(heightText.getText())) { heightText.setText(str[0]); if (extHeightCombo.indexOf(str[1]) != -1) { extHeightCombo.setText(str[1]); extHeightCombo.select(extHeightCombo.indexOf(str[1])); - } else { - extHeightCombo.select(0); } } // set BORDER_STYLE attribute tmp = styleAttributes.getAttribute(CSSConstants.BORDER_STYLE); - if (tmp == null) { - tmp = Constants.EMPTY; - } if (!tmp.equals(borderStyleCombo.getText())) { borderStyleCombo.setText(tmp); } // set BORDER_COLOR attribute tmp = styleAttributes.getAttribute(CSSConstants.BORDER_COLOR); - if (tmp == null) { - tmp = Constants.EMPTY; - } if (!tmp.equals(borderColorCombo.getText())) { borderColorCombo.setText(tmp); } // set BORDER_WIDTH and EXTENSION_BORDER_WIDTH attributes tmp = styleAttributes.getAttribute(CSSConstants.BORDER_WIDTH); - if (tmp == null) { - tmp = Constants.EMPTY; - extBorderWidthCombo.select(0); - } str = Util.convertExtString(tmp); if (!str[0].equals(borderWidthCombo.getText())) { borderWidthCombo.setText(str[0]); if (extBorderWidthCombo.indexOf(str[1]) != -1) { extBorderWidthCombo.setText(str[1]); extBorderWidthCombo.select(extBorderWidthCombo.indexOf(str[1])); - } else { - extBorderWidthCombo.select(0); } } // set MARGIN and EXTENSION_MARGIN attributes tmp = styleAttributes.getAttribute(CSSConstants.MARGIN); - if (tmp == null) { - tmp = Constants.EMPTY; - extMarginCombo.select(0); - } str = Util.convertExtString(tmp); if (!str[0].equals(marginText.getText())) { marginText.setText(str[0]); if (extMarginCombo.indexOf(str[1]) != -1) { extMarginCombo.setText(str[1]); extMarginCombo.select(extMarginCombo.indexOf(str[1])); - } else { - extMarginCombo.select(0); } } // set PADDING and EXTENSION_PADDING attributes tmp = styleAttributes.getAttribute(CSSConstants.PADDING); - if (tmp == null) { - tmp = Constants.EMPTY; - extPaddingCombo.select(0); - } str = Util.convertExtString(tmp); if (!str[0].equals(paddingText.getText())) { paddingText.setText(str[0]); if (extPaddingCombo.indexOf(str[1]) != -1) { extPaddingCombo.setText(str[1]); extPaddingCombo.select(extPaddingCombo.indexOf(str[1])); - } else { - extPaddingCombo.select(0); } } updateDataFromStyleAttributes = false; 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-02 15:12:10 UTC (rev 12214) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabPreviewControl.java 2008-12-02 15:33:52 UTC (rev 12215) @@ -62,14 +62,12 @@ this.cssModel = cssModel; if (cssModel != null) { IEditorInput input = new FileEditorInput(cssModel.getStyleFile()); - try { WorkbenchWindow workbenchWindow = (WorkbenchWindow)PlatformUI.getWorkbench().getActiveWorkbenchWindow(); EditorAreaHelper editorPresentation = new EditorAreaHelper((WorkbenchPage) workbenchWindow.getActivePage()); EditorManager editorManager = new EditorManager(workbenchWindow, (WorkbenchPage) workbenchWindow.getActivePage(), editorPresentation); IEditorReference ref = editorManager.openEditor(EDITOR_ID, input, true, null); - if (ref != null) { // all preview tab editors should be disposed before adding new editor compoment for (Control control : getChildren()) { Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabQuickEditControl.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabQuickEditControl.java 2008-12-02 15:12:10 UTC (rev 12214) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabQuickEditControl.java 2008-12-02 15:33:52 UTC (rev 12215) @@ -296,12 +296,15 @@ String key = name; public void modifyText(ModifyEvent event) { - String tmpCombo = combo.getText().trim(); - if (tmpCombo != null && !tmpCombo.equals(Constants.EMPTY)) { + String tmpCombo = combo.getText(); + if (tmpCombo != null && !tmpCombo.trim().equals(Constants.EMPTY)) { String tmpExt = extCombo.getText(); if (tmpExt != null) { styleAttributes.addAttribute(key, tmpCombo + tmpExt); } + } else { + extCombo.select(0); + return; } if (!updateDataFromStyleAttributes) { notifyListeners(); @@ -328,14 +331,13 @@ } extCombo.setEnabled(true); - String tmp = combo.getText().trim(); - if (tmp != null && !tmp.equals(Constants.EMPTY)) { - String extTmp = extCombo.getText().trim(); + String tmp = combo.getText(); + if (tmp != null && !tmp.trim().equals(Constants.EMPTY)) { + String extTmp = extCombo.getText(); if (extTmp != null) { - styleAttributes.addAttribute(key, tmp + extTmp); - } else { - styleAttributes.addAttribute(key, tmp); + tmp += extTmp; } + styleAttributes.addAttribute(key, tmp); } else { styleAttributes.removeAttribute(key); } @@ -449,6 +451,9 @@ if (tmpExt != null) { styleAttributes.addAttribute(key, tmpCombo + tmpExt); } + } else { + extCombo.select(0); + return; } if (!updateDataFromStyleAttributes) { notifyListeners(); @@ -459,14 +464,13 @@ String key = name; public void modifyText(ModifyEvent e) { - String tmp = text.getText().trim(); - if (tmp != null && !tmp.equals(Constants.EMPTY)) { - String extTmp = extCombo.getText().trim(); + String tmp = text.getText(); + if (tmp != null && !tmp.trim().equals(Constants.EMPTY)) { + String extTmp = extCombo.getText(); if (extTmp != null) { - styleAttributes.addAttribute(key, tmp + extTmp); - } else { - styleAttributes.addAttribute(key, tmp); + tmp += extTmp; } + styleAttributes.addAttribute(key, tmp); } else { styleAttributes.removeAttribute(key); } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabTextControl.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabTextControl.java 2008-12-02 15:12:10 UTC (rev 12214) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabTextControl.java 2008-12-02 15:33:52 UTC (rev 12215) @@ -97,7 +97,7 @@ public void modifyText(ModifyEvent event) { String tmp = fontFamilyText.getText(); if (tmp != null && tmp.trim().length() > 0) { - styleAttributes.addAttribute(CSSConstants.FONT_FAMILY, tmp); + styleAttributes.addAttribute(CSSConstants.FONT_FAMILY, tmp.trim()); } else { styleAttributes.removeAttribute(CSSConstants.FONT_FAMILY); } @@ -142,7 +142,7 @@ public void modifyText(ModifyEvent event) { String tmp = colorCombo.getText(); if (tmp != null && tmp.trim().length() > 0) { - styleAttributes.addAttribute(CSSConstants.COLOR, tmp); + styleAttributes.addAttribute(CSSConstants.COLOR, tmp.trim()); } else { styleAttributes.removeAttribute(CSSConstants.COLOR); } @@ -203,12 +203,15 @@ extFontSizeCombo.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false)); extFontSizeCombo.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent event) { - String fontSize = fontSizeCombo.getText().trim(); - if (fontSize != null && !fontSize.equals(Constants.EMPTY)) { + String fontSize = fontSizeCombo.getText(); + if (fontSize != null && !fontSize.trim().equals(Constants.EMPTY)) { String tmp = extFontSizeCombo.getText(); if (tmp != null) { styleAttributes.addAttribute(CSSConstants.FONT_SIZE, fontSize + tmp); } + } else { + extFontSizeCombo.select(0); + return; } if (!updateDataFromStyleAttributes) { notifyListeners(); @@ -238,12 +241,11 @@ extFontSizeCombo.setEnabled(true); String tmp = fontSizeCombo.getText(); if (tmp != null && tmp.trim().length() > 0) { - String extFont = extFontSizeCombo.getText().trim(); + String extFont = extFontSizeCombo.getText(); if (extFont != null) { - styleAttributes.addAttribute(CSSConstants.FONT_SIZE, tmp + extFont); - } else { - styleAttributes.addAttribute(CSSConstants.FONT_SIZE, tmp); + tmp += extFont; } + styleAttributes.addAttribute(CSSConstants.FONT_SIZE, tmp); } else { styleAttributes.removeAttribute(CSSConstants.FONT_SIZE); } @@ -272,7 +274,7 @@ public void modifyText(ModifyEvent event) { String tmp = fontStyleCombo.getText(); if (tmp != null && tmp.trim().length() > 0) { - styleAttributes.addAttribute(CSSConstants.FONT_STYLE, tmp); + styleAttributes.addAttribute(CSSConstants.FONT_STYLE, tmp.trim()); } else { styleAttributes.removeAttribute(CSSConstants.FONT_STYLE); } @@ -301,7 +303,7 @@ public void modifyText(ModifyEvent event) { String tmp = fontWeigthCombo.getText(); if (tmp != null && tmp.trim().length() > 0) { - styleAttributes.addAttribute(CSSConstants.FONT_WEIGHT, tmp); + styleAttributes.addAttribute(CSSConstants.FONT_WEIGHT, tmp.trim()); } else { styleAttributes.removeAttribute(CSSConstants.FONT_WEIGHT); } @@ -330,7 +332,7 @@ public void modifyText(ModifyEvent event) { String tmp = textDecorationCombo.getText(); if (tmp != null && tmp.trim().length() > 0) { - styleAttributes.addAttribute(CSSConstants.TEXT_DECORATION, tmp); + styleAttributes.addAttribute(CSSConstants.TEXT_DECORATION, tmp.trim()); } else { styleAttributes.removeAttribute(CSSConstants.TEXT_DECORATION); } @@ -359,7 +361,7 @@ public void modifyText(ModifyEvent event) { String tmp = textAlignCombo.getText(); if (tmp != null && tmp.trim().length() > 0) { - styleAttributes.addAttribute(CSSConstants.TEXT_ALIGN, tmp); + styleAttributes.addAttribute(CSSConstants.TEXT_ALIGN, tmp.trim()); } else { styleAttributes.removeAttribute(CSSConstants.TEXT_ALIGN); } @@ -399,65 +401,41 @@ updateDataFromStyleAttributes = true; // set FONT_FAMILY attribute String tmp = styleAttributes.getAttribute(CSSConstants.FONT_FAMILY); - if (tmp == null) { - tmp = Constants.EMPTY; - } if (!tmp.equals(fontFamilyText.getText())) { fontFamilyText.setText(tmp); } // set COLOR attribute tmp = styleAttributes.getAttribute(CSSConstants.COLOR); - if (tmp == null) { - tmp = Constants.EMPTY; - } if (!tmp.equals(colorCombo.getText())) { colorCombo.setText(tmp); } // set FONT_SIZE and EXTENSION_FONT_SIZE attributes tmp = styleAttributes.getAttribute(CSSConstants.FONT_SIZE); - if (tmp == null) { - tmp = Constants.EMPTY; - extFontSizeCombo.select(0); - } String[] str = Util.convertExtString(tmp); if (!str[0].equals(fontSizeCombo.getText())) { fontSizeCombo.setText(str[0]); if (extFontSizeCombo.indexOf(str[1]) != -1) { extFontSizeCombo.setText(str[1]); extFontSizeCombo.select(extFontSizeCombo.indexOf(str[1])); - } else { - extFontSizeCombo.select(0); } } // set TEXT_DECORATION attribute tmp = styleAttributes.getAttribute(CSSConstants.TEXT_DECORATION); - if (tmp == null) { - tmp = Constants.EMPTY; - } if (!tmp.equals(textDecorationCombo.getText())) { textDecorationCombo.setText(tmp); } // set FONT_STYLE attribute tmp = styleAttributes.getAttribute(CSSConstants.FONT_STYLE); - if (tmp == null) { - tmp = Constants.EMPTY; - } if (!tmp.equals(fontStyleCombo.getText())) { fontStyleCombo.setText(tmp); } // set FONT_WEIGHT attribute tmp = styleAttributes.getAttribute(CSSConstants.FONT_WEIGHT); - if (tmp == null) { - tmp = Constants.EMPTY; - } if (!tmp.equals(fontWeigthCombo.getText())) { fontWeigthCombo.setText(tmp); } // set TEXT_ALIGN attribute tmp = styleAttributes.getAttribute(CSSConstants.TEXT_ALIGN); - if (tmp == null) { - tmp = Constants.EMPTY; - } if (!tmp.equals(textAlignCombo.getText())) { textAlignCombo.setText(tmp); }