Author: dsakovich Date: 2008-08-05 10:25:04 -0400 (Tue, 05 Aug 2008) New Revision: 9518 Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/resources/cssdialog/ Removed: trunk/jst/plugins/org.jboss.tools.jst.jsp/resources/org/jboss/tools/jst/ Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/build.properties trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JspEditorPlugin.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/ImageSelectionDialog.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/parsers/CSSElementsParser.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/parsers/ColorParser.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/parsers/ComboParser.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/TabQuickEditControl.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabTextControl.java Log: https://jira.jboss.org/jira/browse/JBIDE-2499 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/build.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/build.properties 2008-08-05 14:14:15 UTC (rev 9517) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/build.properties 2008-08-05 14:25:04 UTC (rev 9518) @@ -7,3 +7,4 @@ about.html,\ META-INF/,\ jspeditor.jar +src.includes = resources/ Copied: trunk/jst/plugins/org.jboss.tools.jst.jsp/resources/cssdialog (from rev 9510, trunk/jst/plugins/org.jboss.tools.jst.jsp/resources/org/jboss/tools/jst/jsp/outline/cssdialog) Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JspEditorPlugin.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JspEditorPlugin.java 2008-08-05 14:14:15 UTC (rev 9517) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JspEditorPlugin.java 2008-08-05 14:25:04 UTC (rev 9518) @@ -42,7 +42,7 @@ public static final String PLUGIN_ID = "org.jboss.tools.jst.jsp"; - public static final String PLUGIN_CSSDIALOG_RESOURCES = "/resources/org/jboss/tools/jst/jsp/outline/cssdialog"; + public static final String RESOURCES_PATH = "/resources"; /** * The constructor. @@ -153,15 +153,15 @@ * * @return path */ - public static String getPluginCSSDialogResourcePath() { + public static String getPluginResourcePath() { Bundle bundle = Platform.getBundle(PLUGIN_ID); URL url = null; try { url = bundle == null ? null : FileLocator.resolve(bundle - .getEntry(PLUGIN_CSSDIALOG_RESOURCES)); + .getEntry(RESOURCES_PATH)); } catch (IOException e) { - url = bundle.getEntry(PLUGIN_CSSDIALOG_RESOURCES); + url = bundle.getEntry(RESOURCES_PATH); } return (url == null) ? null : url.getPath(); } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/ImageSelectionDialog.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/ImageSelectionDialog.java 2008-08-05 14:14:15 UTC (rev 9517) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/ImageSelectionDialog.java 2008-08-05 14:25:04 UTC (rev 9518) @@ -68,6 +68,7 @@ import org.eclipse.ui.dialogs.ISelectionStatusValidator; import org.eclipse.ui.dialogs.SelectionStatusDialog; import org.eclipse.ui.internal.WorkbenchMessages; +import org.jboss.tools.jst.jsp.JspEditorPlugin; import org.jboss.tools.jst.jsp.outline.cssdialog.common.MessageUtil; /** @@ -709,7 +710,7 @@ return true; } } catch (CoreException e) { - // TODO Sakovich exception + JspEditorPlugin.getPluginLog().logError(e); } } return false; Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/parsers/CSSElementsParser.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/parsers/CSSElementsParser.java 2008-08-05 14:14:15 UTC (rev 9517) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/parsers/CSSElementsParser.java 2008-08-05 14:25:04 UTC (rev 9518) @@ -10,21 +10,19 @@ ******************************************************************************/ package org.jboss.tools.jst.jsp.outline.cssdialog.parsers; -import java.io.File; import java.io.IOException; +import java.io.InputStream; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; import org.jboss.tools.jst.jsp.JspEditorPlugin; import org.xml.sax.SAXException; public class CSSElementsParser { - private String FILE_NAME = "cssElements.xml"; + private String FILE_NAME = "cssdialog/cssElements.xml"; private BaseListener listener; @@ -39,31 +37,20 @@ saxParser = fact.newSAXParser(); } catch (ParserConfigurationException e) { - // TODO Evgeny Zheleznyakov remove all printStackTrace - e.printStackTrace(); + JspEditorPlugin.getPluginLog().logError(e); } catch (SAXException e) { - // TODO Evgeny Zheleznyakov remove all printStackTrace - e.printStackTrace(); + JspEditorPlugin.getPluginLog().logError(e); } } public void parse() { - - String pluginPath = JspEditorPlugin.getPluginCSSDialogResourcePath(); - IPath pluginFile = new Path(pluginPath); - String path = pluginFile.append(FILE_NAME).toFile().getAbsolutePath(); - File file = new File(path); - if (!file.exists()) - throw new RuntimeException(); - try { - saxParser.parse(file, listener); + InputStream is = JspEditorPlugin.getDefault().getBundle().getResource(FILE_NAME).openStream(); + saxParser.parse(is, listener); } catch (SAXException e) { - // TODO Evgeny Zheleznyakov remove all printStackTrace - e.printStackTrace(); + JspEditorPlugin.getPluginLog().logError(e); } catch (IOException e) { - // TODO Evgeny Zheleznyakov remove all printStackTrace - e.printStackTrace(); + JspEditorPlugin.getPluginLog().logError(e); } } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/parsers/ColorParser.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/parsers/ColorParser.java 2008-08-05 14:14:15 UTC (rev 9517) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/parsers/ColorParser.java 2008-08-05 14:25:04 UTC (rev 9518) @@ -10,17 +10,14 @@ ******************************************************************************/ package org.jboss.tools.jst.jsp.outline.cssdialog.parsers; -import java.io.File; import java.io.IOException; +import java.io.InputStream; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; import org.jboss.tools.jst.jsp.JspEditorPlugin; - import org.xml.sax.SAXException; /** @@ -32,7 +29,7 @@ */ public class ColorParser { - private String FILE_NAME = "colors.xml"; + private String FILE_NAME = "cssdialog/colors.xml"; private ColorParserListener listener; @@ -50,11 +47,9 @@ saxParser = fact.newSAXParser(); } catch (ParserConfigurationException e) { - // TODO Evgeny Zheleznyakov remove all printStackTrace - e.printStackTrace(); + JspEditorPlugin.getPluginLog().logError(e); } catch (SAXException e) { - // TODO Evgeny Zheleznyakov remove all printStackTrace - e.printStackTrace(); + JspEditorPlugin.getPluginLog().logError(e); } } @@ -62,22 +57,13 @@ * Parse the content of the file specified as XML using the specified */ public void parse() { - - String pluginPath = JspEditorPlugin.getPluginCSSDialogResourcePath(); - IPath pluginFile = new Path(pluginPath); - String path = pluginFile.append(FILE_NAME).toFile().getAbsolutePath(); - File file = new File(path); - if (!file.exists()) - throw new RuntimeException(); - try { - saxParser.parse(file, listener); + InputStream is = JspEditorPlugin.getDefault().getBundle().getResource(FILE_NAME).openStream(); + saxParser.parse(is, listener); } catch (SAXException e) { - // TODO Evgeny Zheleznyakov remove all printStackTrace - e.printStackTrace(); + JspEditorPlugin.getPluginLog().logError(e); } catch (IOException e) { - // TODO Evgeny Zheleznyakov remove all printStackTrace - e.printStackTrace(); + JspEditorPlugin.getPluginLog().logError(e); } } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/parsers/ComboParser.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/parsers/ComboParser.java 2008-08-05 14:14:15 UTC (rev 9517) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/parsers/ComboParser.java 2008-08-05 14:25:04 UTC (rev 9518) @@ -10,15 +10,13 @@ ******************************************************************************/ package org.jboss.tools.jst.jsp.outline.cssdialog.parsers; -import java.io.File; import java.io.IOException; +import java.io.InputStream; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; import org.jboss.tools.jst.jsp.JspEditorPlugin; import org.xml.sax.SAXException; @@ -29,7 +27,7 @@ */ public class ComboParser { - private String FILE_NAME = "cssElementsWithCombo.xml"; + private String FILE_NAME = "cssdialog/cssElementsWithCombo.xml"; private BaseListener listener; @@ -41,33 +39,21 @@ saxParser = SAXParserFactory.newInstance().newSAXParser(); } catch (ParserConfigurationException e) { - // TODO Evgeny Zheleznyakov remove all printStackTrace - e.printStackTrace(); + JspEditorPlugin.getPluginLog().logError(e); } catch (SAXException e) { - // TODO Evgeny Zheleznyakov remove all printStackTrace - e.printStackTrace(); + JspEditorPlugin.getPluginLog().logError(e); } } public void parse() { - - String pluginPath = JspEditorPlugin.getPluginCSSDialogResourcePath(); - IPath pluginFile = new Path(pluginPath); - String path = pluginFile.append(FILE_NAME).toFile().getAbsolutePath(); - File file = new File(path); - if (!file.exists()) - throw new RuntimeException(); - try { - saxParser.parse(file, listener); + InputStream is = JspEditorPlugin.getDefault().getBundle().getResource(FILE_NAME).openStream(); + saxParser.parse(is, listener); } catch (SAXException e) { - // TODO Evgeny Zheleznyakov remove all printStackTrace - e.printStackTrace(); + JspEditorPlugin.getPluginLog().logError(e); } catch (IOException e) { - // TODO Evgeny Zheleznyakov remove all printStackTrace - e.printStackTrace(); + JspEditorPlugin.getPluginLog().logError(e); } - } public void setListener(BaseListener listener) { 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-08-05 14:14:15 UTC (rev 9517) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabBackgroundControl.java 2008-08-05 14:25:04 UTC (rev 9518) @@ -264,31 +264,6 @@ */ public void updateData(boolean param) { String tmp; - - //TODO Evgeny Zheleznyakov remove block comment - /*if (param) { - tmp = colorCombo.getText(); - if (tmp != null) { - if (tmp.trim().length() > 0) - attributesMap.put(CSSConstants.BACKGROUND_COLOR, tmp); - else - attributesMap.remove(CSSConstants.BACKGROUND_COLOR); - } - tmp = backgroundImageCombo.getText(); - if (tmp != null) { - if (tmp.trim().length() > 0) - attributesMap.put(CSSConstants.BACKGROUND_IMAGE, tmp); - else - attributesMap.remove(CSSConstants.BACKGROUND_IMAGE); - } - tmp = backgroundRepeatCombo.getText(); - if (tmp != null) { - if (tmp.trim().length() > 0) - attributesMap.put(CSSConstants.BACKGROUND_REPEAT, tmp); - else - attributesMap.remove(CSSConstants.BACKGROUND_REPEAT); - } - } else {*/ if ((tmp = attributesMap.get(CSSConstants.BACKGROUND_COLOR)) != null) colorCombo.setText(tmp); else 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-08-05 14:14:15 UTC (rev 9517) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabBoxesControl.java 2008-08-05 14:25:04 UTC (rev 9518) @@ -7,7 +7,7 @@ * * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ + ******************************************************************************/ package org.jboss.tools.jst.jsp.outline.cssdialog.tabs; import java.util.ArrayList; @@ -59,13 +59,13 @@ private Combo extBorderWidthCombo; private Combo borderStyleCombo; private Combo extMarginCombo; - + private ImageCombo borderColorCombo; private Text widthText; private Text heightText; private Text marginText; - private Text paddingText; + private Text paddingText; private ArrayList<String> list; private HashMap<String, String> attributesMap; @@ -221,22 +221,22 @@ label.setText(MessageUtil.getString("BORDER_STYLE")); borderStyleCombo = new Combo(this, SWT.BORDER); - + borderStyleCombo.addModifyListener(new ModifyListener() { - + public void modifyText(ModifyEvent event) { String tmp = borderStyleCombo.getText().trim(); - if(tmp != null) - if(!tmp.equals(Constants.EMPTY_STRING)) { - attributesMap.put(CSSConstants.BORDER_STYLE, tmp); - cssDialog.setStyleForPreview(); - return; - } - attributesMap.remove(CSSConstants.BORDER_STYLE); - cssDialog.setStyleForPreview(); + if (tmp != null) + if (!tmp.equals(Constants.EMPTY_STRING)) { + attributesMap.put(CSSConstants.BORDER_STYLE, tmp); + cssDialog.setStyleForPreview(); + return; + } + attributesMap.remove(CSSConstants.BORDER_STYLE); + cssDialog.setStyleForPreview(); } }); - + borderStyleCombo.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false)); list = comboMap.get(CSSConstants.BORDER_STYLE); @@ -255,22 +255,22 @@ label.setText(MessageUtil.getString("BORDER_COLOR")); borderColorCombo = new ImageCombo(this, SWT.BORDER); - + borderColorCombo.addModifyListener(new ModifyListener() { - + public void modifyText(ModifyEvent event) { String tmp = borderColorCombo.getText().trim(); - if(tmp != null) - if(!tmp.equals(Constants.EMPTY_STRING)) { - attributesMap.put(CSSConstants.BORDER_COLOR, tmp); - cssDialog.setStyleForPreview(); - return; - } - attributesMap.remove(CSSConstants.BORDER_COLOR); - cssDialog.setStyleForPreview(); + if (tmp != null) + if (!tmp.equals(Constants.EMPTY_STRING)) { + attributesMap.put(CSSConstants.BORDER_COLOR, tmp); + cssDialog.setStyleForPreview(); + return; + } + attributesMap.remove(CSSConstants.BORDER_COLOR); + cssDialog.setStyleForPreview(); } }); - + borderColorCombo.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false)); Set<Entry<String, String>> set = ColorParserListener.getMap() @@ -365,7 +365,7 @@ } extBorderWidthCombo = new Combo(this, SWT.BORDER | SWT.READ_ONLY); - + extBorderWidthCombo.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent event) { String borderWidth = borderWidthCombo.getText().trim(); @@ -377,12 +377,13 @@ String tmp = extBorderWidthCombo.getText(); if (tmp != null) { - attributesMap.put(CSSConstants.BORDER_WIDTH, borderWidth + tmp); + attributesMap.put(CSSConstants.BORDER_WIDTH, borderWidth + + tmp); cssDialog.setStyleForPreview(); } } }); - + extBorderWidthCombo.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false)); for (int i = 0; i < Constants.extSizes.length; i++) { @@ -534,147 +535,73 @@ */ public void updateData(boolean param) { String tmp; - - //TODO Evgeny Zheleznyakov remove block comment - /*if (param) { - tmp = widthText.getText(); - if (tmp != null) { - if (tmp.trim().length() > 0) - attributesMap - .put( - CSSConstants.WIDTH, - tmp - + (extWidthCombo.getText() == null ? Constants.EMPTY_STRING - : extWidthCombo.getText())); - else - attributesMap.remove(CSSConstants.WIDTH); - } - tmp = heightText.getText(); - if (tmp != null) { - if (tmp.trim().length() > 0) - attributesMap - .put( - CSSConstants.HEIGHT, - tmp - + (extHeightCombo.getText() == null ? Constants.EMPTY_STRING - : extHeightCombo.getText())); - else - attributesMap.remove(CSSConstants.HEIGHT); - } - tmp = borderStyleCombo.getText(); - if (tmp != null && tmp.trim().length() > 0) { - attributesMap.put(CSSConstants.BORDER_STYLE, tmp); - } - tmp = borderColorCombo.getText(); - if (tmp != null && tmp.trim().length() > 0) { - attributesMap.put(CSSConstants.BORDER_COLOR, tmp); - } - tmp = borderWidthCombo.getText(); - if (tmp != null) { - if (tmp.trim().length() > 0) - attributesMap - .put( - CSSConstants.BORDER_WIDTH, - tmp - + (extBorderWidthCombo.getText() == null ? Constants.EMPTY_STRING - : extBorderWidthCombo - .getText())); - else - attributesMap.remove(CSSConstants.BORDER_WIDTH); - } - tmp = marginText.getText(); - if (tmp != null) { - if (tmp.trim().length() > 0) - attributesMap - .put( - CSSConstants.MARGIN, - tmp - + (extMarginCombo.getText() == null ? Constants.EMPTY_STRING - : extMarginCombo.getText())); - else - attributesMap.remove(CSSConstants.MARGIN); - } - tmp = paddingText.getText(); - if (tmp != null) { - if (tmp.trim().length() > 0) - attributesMap - .put( - CSSConstants.PADDING, - tmp - + (extPaddingCombo.getText() == null ? Constants.EMPTY_STRING - : extPaddingCombo.getText())); - else - attributesMap.remove(CSSConstants.PADDING); - } - } else {*/ - if ((tmp = attributesMap.get(CSSConstants.WIDTH)) != null) { - String[] str = Util.convertExtString(tmp); - widthText.setText(str[0]); - if (extWidthCombo.indexOf(str[1]) != -1) { - extWidthCombo.setText(str[1]); - extWidthCombo.select(extWidthCombo.indexOf(str[1])); - } else - extWidthCombo.select(0); - } else { - widthText.setText(Constants.EMPTY_STRING); + if ((tmp = attributesMap.get(CSSConstants.WIDTH)) != null) { + String[] str = Util.convertExtString(tmp); + widthText.setText(str[0]); + if (extWidthCombo.indexOf(str[1]) != -1) { + extWidthCombo.setText(str[1]); + extWidthCombo.select(extWidthCombo.indexOf(str[1])); + } else extWidthCombo.select(0); - } - if ((tmp = attributesMap.get(CSSConstants.HEIGHT)) != null) { - String[] str = Util.convertExtString(tmp); - heightText.setText(str[0]); - if (extHeightCombo.indexOf(str[1]) != -1) { - extHeightCombo.setText(str[1]); - extHeightCombo.select(extHeightCombo.indexOf(str[1])); - } else - extHeightCombo.select(0); - } else { - heightText.setText(Constants.EMPTY_STRING); + } else { + widthText.setText(Constants.EMPTY_STRING); + extWidthCombo.select(0); + } + if ((tmp = attributesMap.get(CSSConstants.HEIGHT)) != null) { + String[] str = Util.convertExtString(tmp); + heightText.setText(str[0]); + if (extHeightCombo.indexOf(str[1]) != -1) { + extHeightCombo.setText(str[1]); + extHeightCombo.select(extHeightCombo.indexOf(str[1])); + } else extHeightCombo.select(0); - } - if ((tmp = attributesMap.get(CSSConstants.BORDER_STYLE)) != null) - borderStyleCombo.setText(tmp); - else - borderStyleCombo.setText(Constants.EMPTY_STRING); - if ((tmp = attributesMap.get(CSSConstants.BORDER_COLOR)) != null) - borderColorCombo.setText(tmp); - else - borderColorCombo.setText(Constants.EMPTY_STRING); - if ((tmp = attributesMap.get(CSSConstants.BORDER_WIDTH)) != null) { - String[] str = Util.convertExtString(tmp); - borderWidthCombo.setText(str[0]); - if (extBorderWidthCombo.indexOf(str[1]) != -1) { - extBorderWidthCombo.setText(str[1]); - extBorderWidthCombo.select(extBorderWidthCombo - .indexOf(str[1])); - } else - extBorderWidthCombo.select(0); - } else { - borderWidthCombo.setText(Constants.EMPTY_STRING); + } else { + heightText.setText(Constants.EMPTY_STRING); + extHeightCombo.select(0); + } + if ((tmp = attributesMap.get(CSSConstants.BORDER_STYLE)) != null) + borderStyleCombo.setText(tmp); + else + borderStyleCombo.setText(Constants.EMPTY_STRING); + if ((tmp = attributesMap.get(CSSConstants.BORDER_COLOR)) != null) + borderColorCombo.setText(tmp); + else + borderColorCombo.setText(Constants.EMPTY_STRING); + if ((tmp = attributesMap.get(CSSConstants.BORDER_WIDTH)) != null) { + String[] str = Util.convertExtString(tmp); + borderWidthCombo.setText(str[0]); + if (extBorderWidthCombo.indexOf(str[1]) != -1) { + extBorderWidthCombo.setText(str[1]); + extBorderWidthCombo.select(extBorderWidthCombo.indexOf(str[1])); + } else extBorderWidthCombo.select(0); - } - if ((tmp = attributesMap.get(CSSConstants.MARGIN)) != null) { - String[] str = Util.convertExtString(tmp); - marginText.setText(str[0]); - if (extMarginCombo.indexOf(str[1]) != -1) { - extMarginCombo.setText(str[1]); - extMarginCombo.select(extMarginCombo.indexOf(str[1])); - } else - extMarginCombo.select(0); - } else { - marginText.setText(Constants.EMPTY_STRING); + } else { + borderWidthCombo.setText(Constants.EMPTY_STRING); + extBorderWidthCombo.select(0); + } + if ((tmp = attributesMap.get(CSSConstants.MARGIN)) != null) { + String[] str = Util.convertExtString(tmp); + marginText.setText(str[0]); + if (extMarginCombo.indexOf(str[1]) != -1) { + extMarginCombo.setText(str[1]); + extMarginCombo.select(extMarginCombo.indexOf(str[1])); + } else extMarginCombo.select(0); - } - if ((tmp = attributesMap.get(CSSConstants.PADDING)) != null) { - String[] str = Util.convertExtString(tmp); - paddingText.setText(str[0]); - if (extPaddingCombo.indexOf(str[1]) != -1) { - extPaddingCombo.setText(str[1]); - extPaddingCombo.select(extPaddingCombo.indexOf(str[1])); - } else - extPaddingCombo.select(0); - } else { - paddingText.setText(Constants.EMPTY_STRING); + } else { + marginText.setText(Constants.EMPTY_STRING); + extMarginCombo.select(0); + } + if ((tmp = attributesMap.get(CSSConstants.PADDING)) != null) { + String[] str = Util.convertExtString(tmp); + paddingText.setText(str[0]); + if (extPaddingCombo.indexOf(str[1]) != -1) { + extPaddingCombo.setText(str[1]); + extPaddingCombo.select(extPaddingCombo.indexOf(str[1])); + } else extPaddingCombo.select(0); - } + } else { + paddingText.setText(Constants.EMPTY_STRING); + extPaddingCombo.select(0); + } } } \ No newline at end of file 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-08-05 14:14:15 UTC (rev 9517) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabQuickEditControl.java 2008-08-05 14:25:04 UTC (rev 9518) @@ -296,22 +296,6 @@ extCombo.add(Constants.extSizes[i]); extCombo.select(extCombo.indexOf(values[EXT_VALUE_NUMBER])); - //TODO Evgeny Zheleznyakov remove block comment - /*extCombo.addSelectionListener(new SelectionAdapter() { - - String key = name; - - public void widgetSelected(SelectionEvent event) { - - if (!attributesMap.get(key).trim().equals( - Constants.EMPTY_STRING)) { - attributesMap.put(key, combo.getText() - + extCombo.getText()); - dialog.setStyleForPreview(); - } - } - });*/ - extCombo.addModifyListener(new ModifyListener() { String key = name; @@ -471,22 +455,6 @@ extCombo.add(Constants.extSizes[i]); extCombo.select(extCombo.indexOf(values[EXT_VALUE_NUMBER])); - //TODO Evgeny Zheleznyakov remove block comment - /*extCombo.addSelectionListener(new SelectionAdapter() { - - String key = name; - - public void widgetSelected(SelectionEvent event) { - - if (!attributesMap.get(key).trim().equals( - Constants.EMPTY_STRING)) { - attributesMap.put(key, text.getText() - + extCombo.getText()); - dialog.setStyleForPreview(); - } - } - });*/ - extCombo.addModifyListener(new ModifyListener() { String key = name; 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-08-05 14:14:15 UTC (rev 9517) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/tabs/TabTextControl.java 2008-08-05 14:25:04 UTC (rev 9518) @@ -7,7 +7,7 @@ * * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ + ******************************************************************************/ package org.jboss.tools.jst.jsp.outline.cssdialog.tabs; import java.util.ArrayList; @@ -154,7 +154,8 @@ } }); - // //////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////// + // // Set<Entry<String, String>> set = ColorParserListener.getMap() .entrySet(); @@ -162,7 +163,8 @@ RGB rgb = Util.getColor(me.getKey()); colorCombo.add(me.getValue(), rgb); } - // /////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////// + // / button = new Button(this, SWT.PUSH); button.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, @@ -412,99 +414,42 @@ */ public void updateData(boolean param) { String tmp; - //TODO Evgeny Zheleznyakov remove block comment - /*if (param) { - tmp = fontFamilyText.getText(); - if (tmp != null) { - if (tmp.trim().length() > 0) - attributesMap.put(CSSConstants.FONT_FAMILY, tmp); - else - attributesMap.remove(CSSConstants.FONT_FAMILY); - } - tmp = colorCombo.getText(); - if (tmp != null) { - if (tmp.trim().length() > 0) - attributesMap.put(CSSConstants.COLOR, tmp); - else - attributesMap.remove(CSSConstants.COLOR); - } - tmp = fontSizeCombo.getText(); - if (tmp != null) { - if (tmp.trim().length() > 0) - attributesMap - .put( - CSSConstants.FONT_SIZE, - tmp - + (extFontSizeCombo.getText() == null ? Constants.EMPTY_STRING - : extFontSizeCombo - .getText())); - else - attributesMap.remove(CSSConstants.FONT_SIZE); - } - tmp = textDecorationCombo.getText(); - if (tmp != null) { - if (tmp.trim().length() > 0) - attributesMap.put(CSSConstants.TEXT_DECORATION, tmp); - else - attributesMap.remove(CSSConstants.TEXT_DECORATION); - } - tmp = fontStyleCombo.getText(); - if (tmp != null) { - if (tmp.trim().length() > 0) - attributesMap.put(CSSConstants.FONT_STYLE, tmp); - else - attributesMap.remove(CSSConstants.FONT_STYLE); - } - tmp = fontWeigthCombo.getText(); - if (tmp != null) { - if (tmp.trim().length() > 0) - attributesMap.put(CSSConstants.FONT_WEIGHT, tmp); - else - attributesMap.remove(CSSConstants.FONT_WEIGHT); - } - tmp = textAlignCombo.getText(); - if (tmp != null) { - if (tmp.trim().length() > 0) - attributesMap.put(CSSConstants.TEXT_ALIGN, tmp); - else - attributesMap.remove(CSSConstants.TEXT_ALIGN); - } - } else {*/ - if ((tmp = attributesMap.get(CSSConstants.FONT_FAMILY)) != null) - fontFamilyText.setText(tmp); - else - fontFamilyText.setText(Constants.EMPTY_STRING); - if ((tmp = attributesMap.get(CSSConstants.COLOR)) != null) - colorCombo.setText(tmp); - else - colorCombo.setText(Constants.EMPTY_STRING); - if ((tmp = attributesMap.get(CSSConstants.FONT_SIZE)) != null) { - String[] str = Util.convertExtString(tmp); - fontSizeCombo.setText(str[0]); - if (extFontSizeCombo.indexOf(str[1]) != -1) { - extFontSizeCombo.setText(str[1]); - extFontSizeCombo.select(extFontSizeCombo.indexOf(str[1])); - } else - extFontSizeCombo.select(0); - } else { - fontSizeCombo.setText(Constants.EMPTY_STRING); + + if ((tmp = attributesMap.get(CSSConstants.FONT_FAMILY)) != null) + fontFamilyText.setText(tmp); + else + fontFamilyText.setText(Constants.EMPTY_STRING); + if ((tmp = attributesMap.get(CSSConstants.COLOR)) != null) + colorCombo.setText(tmp); + else + colorCombo.setText(Constants.EMPTY_STRING); + if ((tmp = attributesMap.get(CSSConstants.FONT_SIZE)) != null) { + String[] str = Util.convertExtString(tmp); + fontSizeCombo.setText(str[0]); + if (extFontSizeCombo.indexOf(str[1]) != -1) { + extFontSizeCombo.setText(str[1]); + extFontSizeCombo.select(extFontSizeCombo.indexOf(str[1])); + } else extFontSizeCombo.select(0); - } - if ((tmp = attributesMap.get(CSSConstants.TEXT_DECORATION)) != null) - textDecorationCombo.setText(tmp); - else - textDecorationCombo.setText(Constants.EMPTY_STRING); - if ((tmp = attributesMap.get(CSSConstants.FONT_STYLE)) != null) - fontStyleCombo.setText(tmp); - else - fontStyleCombo.setText(Constants.EMPTY_STRING); - if ((tmp = attributesMap.get(CSSConstants.FONT_WEIGHT)) != null) - fontWeigthCombo.setText(tmp); - else - fontWeigthCombo.setText(Constants.EMPTY_STRING); - if ((tmp = attributesMap.get(CSSConstants.TEXT_ALIGN)) != null) - textAlignCombo.setText(tmp); - else - textAlignCombo.setText(Constants.EMPTY_STRING); + } else { + fontSizeCombo.setText(Constants.EMPTY_STRING); + extFontSizeCombo.select(0); + } + if ((tmp = attributesMap.get(CSSConstants.TEXT_DECORATION)) != null) + textDecorationCombo.setText(tmp); + else + textDecorationCombo.setText(Constants.EMPTY_STRING); + if ((tmp = attributesMap.get(CSSConstants.FONT_STYLE)) != null) + fontStyleCombo.setText(tmp); + else + fontStyleCombo.setText(Constants.EMPTY_STRING); + if ((tmp = attributesMap.get(CSSConstants.FONT_WEIGHT)) != null) + fontWeigthCombo.setText(tmp); + else + fontWeigthCombo.setText(Constants.EMPTY_STRING); + if ((tmp = attributesMap.get(CSSConstants.TEXT_ALIGN)) != null) + textAlignCombo.setText(tmp); + else + textAlignCombo.setText(Constants.EMPTY_STRING); } } \ No newline at end of file