August 2008 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r9520 - trunk/documentation/movies/index/en.

by jbosstools-commits＠lists.jboss.org

Author: smukhina Date: 2008-08-05 11:00:10 -0400 (Tue, 05 Aug 2008) New Revision: 9520 Modified: trunk/documentation/movies/index/en/master.xml Log: http://jira.jboss.com/jira/browse/JBDS-348 formated description for movies area added Modified: trunk/documentation/movies/index/en/master.xml =================================================================== --- trunk/documentation/movies/index/en/master.xml 2008-08-05 14:58:17 UTC (rev 9519) +++ trunk/documentation/movies/index/en/master.xml 2008-08-05 15:00:10 UTC (rev 9520) @@ -40,7 +40,7 @@ <para> <ulink url="demos/archiving/archiving.htm">Archiving</ulink> </para> - <para>This screencast tells you how to create archives with JBDS</para> + <para>This screencast tells you how to create archives</para> </listitem> <listitem>

17 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r9519 - trunk/documentation/movies/index/en.

by jbosstools-commits＠lists.jboss.org

Author: smukhina Date: 2008-08-05 10:58:17 -0400 (Tue, 05 Aug 2008) New Revision: 9519 Modified: trunk/documentation/movies/index/en/master.xml Log: http://jira.jboss.com/jira/browse/JBDS-348 formated description for movies area added Modified: trunk/documentation/movies/index/en/master.xml =================================================================== --- trunk/documentation/movies/index/en/master.xml 2008-08-05 14:25:04 UTC (rev 9518) +++ trunk/documentation/movies/index/en/master.xml 2008-08-05 14:58:17 UTC (rev 9519) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN" -"http://www.oasis-open.org/docbook/xml/4.3CR3/docbookx.dtd"> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" +"http://www.docbook.org/xsd/4.3/docbook.xsd" > + <book> <bookinfo> <title>JBoss Tools Movies</title> @@ -10,137 +11,58 @@ <holder>JBoss, a division of Red Hat Inc.</holder> </copyright> </bookinfo> - <index> - <title/> - <indexentry> - <primaryie> - <ulink url="demos/create_console_config/create_console_config.htm">Creating Console Configuration</ulink> - </primaryie> - </indexentry> - - <indexentry> - <primaryie> - <ulink url="demos/cust_tag_lib_to_palette/cust_tag_lib_to_palette.htm">Importing Custom Tag Library to Palette</ulink> - </primaryie> - </indexentry> - - <indexentry> - <primaryie> - <ulink url="demos/seam2_plus_ejb3/seam2_plus_ejb3.htm">Creating Seam2 + EJB3 EAR Project</ulink> - </primaryie> - </indexentry> - - <indexentry> - <primaryie> - <ulink url="demos/ootb_new_seam_project/ootb_new_seam_project.htm">New Seam Project</ulink> - </primaryie> - </indexentry> - - <indexentry> - <primaryie> - <ulink url="demos/archiving/archiving.htm">Archiving</ulink> - </primaryie> - </indexentry> - - <indexentry> - <primaryie> - <ulink url="demos/HQL_JPA-QL_queries/HQL_JPA-QL_queries.htm">Edit and run HQL/JPA-QL queries</ulink> - </primaryie> - </indexentry> - - - <indexentry> - <primaryie> - <ulink url="demos/rich_faces_demo/rich_faces_demo.htm">RichFaces Toolkit for developing Web application</ulink> - </primaryie> - </indexentry> - - -  - - </index> + <index> + <title/> +  + <itemizedlist> + <listitem> + <para> + <ulink url="demos/create_console_config/create_console_config.htm">Creating Console Configuration</ulink> + </para> + <para>This movie shows how to create a console configuration for JPA; but it is the same steps needed for projects using hbm.xml or Hibernate Annotations stand alone</para> + </listitem> + + <listitem> + <para> + <ulink url="demos/cust_tag_lib_to_palette/cust_tag_lib_to_palette.htm">Importing Custom Tag Library to Palette</ulink> + </para> + <para>It explains how you can easy and fast add a CustomTag Library to the Palette </para> + </listitem> + + <listitem> + <para> + <ulink url="demos/seam2_plus_ejb3/seam2_plus_ejb3.htm">Creating Seam2 + EJB3 EAR Project</ulink> + </para> + <para>The online demo shows all the basics you'll need to create such application</para> + </listitem> + + <listitem> + <para> + <ulink url="demos/archiving/archiving.htm">Archiving</ulink> + </para> + <para>This screencast tells you how to create archives with JBDS</para> + </listitem> + + <listitem> + <para> + <ulink url="demos/ootb_new_seam_project/ootb_new_seam_project.htm">Archiving</ulink> + </para> + <para>This movie shows you step-by-step how to crete a new seam project</para> + </listitem> + + <listitem> + <para> + <ulink url="demos/HQL_JPA-QL_queries/HQL_JPA-QL_queries.htm">Edit and run HQL/JPA-QL queries</ulink> + </para> + <para>It demonstrates how to use the HQL editor with code completion and dynamic sql preview and how to inspect the results</para> + </listitem> + + <listitem> + <para> + <ulink url="demos/rich_faces_demo/rich_faces_demo.htm">RichFaces Toolkit for developing Web application</ulink> + </para> + <para>This demo covers a creation of a jsf application with simple content using the RichFaces components</para> + </listitem> + </itemizedlist> + </index> </book>

17 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r9518 - in trunk/jst/plugins/org.jboss.tools.jst.jsp: resources and 5 other directories.

by jbosstools-commits＠lists.jboss.org

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

17 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r9517 - in trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph: editor and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2008-08-05 10:14:15 -0400 (Tue, 05 Aug 2008) New Revision: 9517 Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/strategy/ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/strategy/ProcessAcceptsElementStrategy.java Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editor/JpdlPaletteFactory.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/ProcessWrapper.java trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/SuperStateWrapper.java Log: add support for pluggable strategy for containers to accept elements Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editor/JpdlPaletteFactory.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editor/JpdlPaletteFactory.java 2008-08-05 14:13:53 UTC (rev 9516) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/editor/JpdlPaletteFactory.java 2008-08-05 14:14:15 UTC (rev 9517) @@ -66,14 +66,6 @@ "Transition", "Creating a new Transition", new SimpleFactory(TransitionWrapper.class), -// new CreationFactory() { -// public Object getNewObject() { -// return new TransitionWrapper(); -// } -// public Object getObjectType() { -// return AbstractConnectionWrapper.class; -// } -// }, ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/transition.gif")), ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/transition.gif")) ); Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/strategy/ProcessAcceptsElementStrategy.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/strategy/ProcessAcceptsElementStrategy.java (rev 0) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/strategy/ProcessAcceptsElementStrategy.java 2008-08-05 14:14:15 UTC (rev 9517) @@ -0,0 +1,28 @@ +package org.jboss.tools.flow.jpdl4.graph.strategy; + +import org.jboss.tools.flow.common.core.Container; +import org.jboss.tools.flow.editor.strategy.AcceptsElementStrategy; +import org.jboss.tools.flow.jpdl4.core.Process; +import org.jboss.tools.flow.jpdl4.core.StartState; + +public class ProcessAcceptsElementStrategy implements AcceptsElementStrategy { + + private Process process; + + public boolean acceptsElement(Object element) { + if (process == null) { + return false; + } else if (element instanceof StartState) { + return process.getStartState() == null; + } else { + return true; + } + } + + public void setContainer(Container container) { + if (container instanceof Process) { + this.process = (Process)container; + } + } + +} Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/ProcessWrapper.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/ProcessWrapper.java 2008-08-05 14:13:53 UTC (rev 9516) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/ProcessWrapper.java 2008-08-05 14:14:15 UTC (rev 9517) @@ -1,25 +1,15 @@ package org.jboss.tools.flow.jpdl4.graph.wrapper; import org.jboss.tools.flow.editor.core.DefaultFlowWrapper; -import org.jboss.tools.flow.editor.core.NodeWrapper; import org.jboss.tools.flow.jpdl4.core.Process; -import org.jboss.tools.flow.jpdl4.core.StartState; +import org.jboss.tools.flow.jpdl4.graph.strategy.ProcessAcceptsElementStrategy; public class ProcessWrapper extends DefaultFlowWrapper { public ProcessWrapper() { setElement(new Process()); + ProcessAcceptsElementStrategy acceptsElementStrategy = new ProcessAcceptsElementStrategy(); + acceptsElementStrategy.setContainer((Process)getElement()); } - public Process getProcess() { - return (Process) getElement(); - } - - public boolean acceptsElement(NodeWrapper element) { - if (element.getElement() instanceof StartState) { - return getProcess().getStartState() == null; - } - return super.acceptsElement(element); - } - } Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/SuperStateWrapper.java =================================================================== --- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/SuperStateWrapper.java 2008-08-05 14:13:53 UTC (rev 9516) +++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.graph/src/org/jboss/tools/flow/jpdl4/graph/wrapper/SuperStateWrapper.java 2008-08-05 14:14:15 UTC (rev 9517) @@ -1,9 +1,6 @@ package org.jboss.tools.flow.jpdl4.graph.wrapper; import org.jboss.tools.flow.editor.core.DefaultContainerWrapper; -import org.jboss.tools.flow.editor.core.NodeWrapper; -import org.jboss.tools.flow.jpdl4.core.Process; -import org.jboss.tools.flow.jpdl4.core.StartState; import org.jboss.tools.flow.jpdl4.core.SuperState; public class SuperStateWrapper extends DefaultContainerWrapper { @@ -12,11 +9,4 @@ setElement(new SuperState()); } - public boolean acceptsElement(NodeWrapper element) { - if (element.getElement() instanceof StartState) { - return ((Process)getFlowWrapper().getElement()).getStartState() == null; - } - return super.acceptsElement(element); - } - }

17 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r9516 - in trunk/flow/plugins/org.jboss.tools.flow.common.graph: src/org/jboss/tools/flow/editor and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2008-08-05 10:13:53 -0400 (Tue, 05 Aug 2008) New Revision: 9516 Added: trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/strategy/ trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/strategy/AcceptsElementStrategy.java Modified: trunk/flow/plugins/org.jboss.tools.flow.common.graph/META-INF/MANIFEST.MF trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/core/ContainerWrapper.java trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/core/DefaultContainerWrapper.java trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/core/DefaultFlowWrapper.java Log: add support for pluggable strategy for containers to accept elements Modified: trunk/flow/plugins/org.jboss.tools.flow.common.graph/META-INF/MANIFEST.MF =================================================================== --- trunk/flow/plugins/org.jboss.tools.flow.common.graph/META-INF/MANIFEST.MF 2008-08-05 12:51:37 UTC (rev 9515) +++ trunk/flow/plugins/org.jboss.tools.flow.common.graph/META-INF/MANIFEST.MF 2008-08-05 14:13:53 UTC (rev 9516) @@ -23,6 +23,7 @@ org.jboss.tools.flow.editor.core, org.jboss.tools.flow.editor.editpart, org.jboss.tools.flow.editor.figure, - org.jboss.tools.flow.editor.policy + org.jboss.tools.flow.editor.policy, + org.jboss.tools.flow.editor.strategy Bundle-ClassPath: . Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/core/ContainerWrapper.java =================================================================== --- trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/core/ContainerWrapper.java 2008-08-05 12:51:37 UTC (rev 9515) +++ trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/core/ContainerWrapper.java 2008-08-05 14:13:53 UTC (rev 9516) @@ -31,5 +31,5 @@ AbstractFlowWrapper getFlowWrapper(); boolean acceptsElement(NodeWrapper element); - + } Modified: trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/core/DefaultContainerWrapper.java =================================================================== --- trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/core/DefaultContainerWrapper.java 2008-08-05 12:51:37 UTC (rev 9515) +++ trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/core/DefaultContainerWrapper.java 2008-08-05 14:13:53 UTC (rev 9516) @@ -61,4 +61,8 @@ return (Node)getElement(); } + public boolean acceptsElement(NodeWrapper element) { + return getParent().acceptsElement(element); + } + } Modified: trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/core/DefaultFlowWrapper.java =================================================================== --- trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/core/DefaultFlowWrapper.java 2008-08-05 12:51:37 UTC (rev 9515) +++ trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/core/DefaultFlowWrapper.java 2008-08-05 14:13:53 UTC (rev 9516) @@ -4,8 +4,11 @@ import org.jboss.tools.flow.common.core.Node; import org.jboss.tools.flow.editor.core.AbstractFlowWrapper; import org.jboss.tools.flow.editor.core.NodeWrapper; +import org.jboss.tools.flow.editor.strategy.AcceptsElementStrategy; public class DefaultFlowWrapper extends AbstractFlowWrapper { + + private AcceptsElementStrategy acceptsElementStrategy; public Integer getRouterLayout() { Integer routerLayout = (Integer) ((Flow)getElement()).getMetaData("routerLayout"); @@ -35,4 +38,18 @@ ((Flow)getElement()).removeNode((Node)element.getElement()); } + public boolean acceptsElement(NodeWrapper wrapper) { + if (wrapper == null) { + return false; + } else if (acceptsElementStrategy != null) { + return acceptsElementStrategy.acceptsElement(wrapper.getElement()); + } else { + return true; + } + } + + public void setAcceptsElementStrategy(AcceptsElementStrategy strategy) { + this.acceptsElementStrategy = strategy; + } + } Added: trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/strategy/AcceptsElementStrategy.java =================================================================== --- trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/strategy/AcceptsElementStrategy.java (rev 0) +++ trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/strategy/AcceptsElementStrategy.java 2008-08-05 14:13:53 UTC (rev 9516) @@ -0,0 +1,11 @@ +package org.jboss.tools.flow.editor.strategy; + +import org.jboss.tools.flow.common.core.Container; + +public interface AcceptsElementStrategy { + + void setContainer(Container container); + + boolean acceptsElement(Object element); + +}

17 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r9515 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.

by jbosstools-commits＠lists.jboss.org

Author: estherbin Date: 2008-08-05 08:51:37 -0400 (Tue, 05 Aug 2008) New Revision: 9515 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesFileUploadTemplate.java Log: Write junit for selection. Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesFileUploadTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesFileUploadTemplate.java 2008-08-05 12:51:05 UTC (rev 9514) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesFileUploadTemplate.java 2008-08-05 12:51:37 UTC (rev 9515) @@ -12,7 +12,6 @@ import org.jboss.tools.vpe.editor.template.VpeCreationData; import org.jboss.tools.vpe.editor.util.HTML; import org.jboss.tools.vpe.editor.util.VpeStyleUtil; -import org.jboss.tools.vpe.xulrunner.browser.util.DOMTreeDumper; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; @@ -28,19 +27,19 @@ public class RichFacesFileUploadTemplate extends VpeAbstractTemplate { /** The Constant DEFAULT_CONTROL_LABEL_VALUE. */ - private static final String DEFAULT_CONTROL_LABEL_VALUE = "Add..."; + private static final String DEFAULT_CONTROL_LABEL_VALUE = "Add..."; //$NON-NLS-1$ /** The Constant DEFAULT_LIST_HEIGHT. */ - private static final String DEFAULT_LIST_HEIGHT = "210px"; + private static final String DEFAULT_LIST_HEIGHT = "210px"; //$NON-NLS-1$ /** The Constant DEFAULT_LIST_WIDTH. */ - private static final String DEFAULT_LIST_WIDTH = "400px"; + private static final String DEFAULT_LIST_WIDTH = "400px"; //$NON-NLS-1$ /** The Constant FILE_UPLOAD_FILE_UPLOAD_CSS. */ - private static final String FILE_UPLOAD_FILE_UPLOAD_CSS = "fileUpload/fileUpload.css"; + private static final String FILE_UPLOAD_FILE_UPLOAD_CSS = "fileUpload/fileUpload.css"; //$NON-NLS-1$ /** The Constant RICH_FACES_FILE_UPLOAD_EXT. */ - private static final String RICH_FACES_FILE_UPLOAD_EXT = "richFacesFileUpload"; + private static final String RICH_FACES_FILE_UPLOAD_EXT = "richFacesFileUpload"; //$NON-NLS-1$ /** The add control label. */ private String addControlLabel; @@ -88,25 +87,25 @@ final nsIDOMElement rootDiv = visualDocument.createElement(HTML.TAG_DIV); - rootDiv.setAttribute(HTML.ATTR_CLASS, "rich-fileupload-list-decor"); + rootDiv.setAttribute(HTML.ATTR_CLASS, "rich-fileupload-list-decor"); //$NON-NLS-1$ rootDiv.setAttribute(HTML.ATTR_STYLE, VpeStyleUtil.PARAMETER_WIDTH + VpeStyleUtil.COLON_STRING + this.listWidth); final nsIDOMElement table = visualDocument.createElement(HTML.TAG_TABLE); - table.setAttribute(HTML.ATTR_CLASS, "rich-fileupload-toolbar-decor"); + table.setAttribute(HTML.ATTR_CLASS, "rich-fileupload-toolbar-decor"); //$NON-NLS-1$ final nsIDOMElement tr = visualDocument.createElement(HTML.TAG_TR); final nsIDOMElement td = visualDocument.createElement(HTML.TAG_TD); final nsIDOMElement buttonBorderDiv = visualDocument.createElement(HTML.TAG_DIV); - buttonBorderDiv.setAttribute(HTML.ATTR_CLASS, "rich-fileupload-button-border"); - buttonBorderDiv.setAttribute(HTML.ATTR_STYLE, "float: left;"); + buttonBorderDiv.setAttribute(HTML.ATTR_CLASS, "rich-fileupload-button-border"); //$NON-NLS-1$ + buttonBorderDiv.setAttribute(HTML.ATTR_STYLE, "float: left;"); //$NON-NLS-1$ final nsIDOMElement fileuploadButtonDiv = visualDocument.createElement(HTML.TAG_DIV); - fileuploadButtonDiv.setAttribute(HTML.ATTR_CLASS, defaultStyleClasses.get("addButtonClass")); - fileuploadButtonDiv.setAttribute(HTML.ATTR_STYLE, "position: relative;"); + fileuploadButtonDiv.setAttribute(HTML.ATTR_CLASS, defaultStyleClasses.get("addButtonClass")); //$NON-NLS-1$ + fileuploadButtonDiv.setAttribute(HTML.ATTR_STYLE, "position: relative;"); //$NON-NLS-1$ final nsIDOMElement labelDiv = visualDocument.createElement(HTML.TAG_DIV); - labelDiv.setAttribute(HTML.ATTR_CLASS, defaultStyleClasses.get("addButtonClassDiv2")); + labelDiv.setAttribute(HTML.ATTR_CLASS, defaultStyleClasses.get("addButtonClassDiv2")); //$NON-NLS-1$ labelDiv.appendChild(visualDocument.createTextNode(this.addControlLabel)); fileuploadButtonDiv.appendChild(labelDiv); @@ -118,14 +117,14 @@ tr.appendChild(td); td.appendChild(buttonBorderDiv); buttonBorderDiv.appendChild(fileuploadButtonDiv); - td.appendChild(createControl(pageContext, sourceNode, visualDocument, defaultStyleClasses.get("uploadButtonClass2"), + td.appendChild(createControl(pageContext, sourceNode, visualDocument, defaultStyleClasses.get("uploadButtonClass2"), //$NON-NLS-1$ uploadControlLabel, false)); - td.appendChild(createControl(pageContext, sourceNode, visualDocument, defaultStyleClasses.get("clearAllButtonClass2"), + td.appendChild(createControl(pageContext, sourceNode, visualDocument, defaultStyleClasses.get("clearAllButtonClass2"), //$NON-NLS-1$ clearAllControlLabel, true)); - DOMTreeDumper dumper = new DOMTreeDumper(); - dumper.dumpToStream(System.err, rootDiv); +// DOMTreeDumper dumper = new DOMTreeDumper(); +// dumper.dumpToStream(System.err, rootDiv); data = new VpeCreationData(rootDiv); return data; @@ -141,19 +140,19 @@ //<div class="rich-fileupload-button-border" style="float: left;"> final nsIDOMElement firstDiv = visualDocument.createElement(HTML.TAG_DIV); - firstDiv.setAttribute(HTML.ATTR_CLASS, "rich-fileupload-button-border"); + firstDiv.setAttribute(HTML.ATTR_CLASS, "rich-fileupload-button-border"); //$NON-NLS-1$ - firstDiv.setAttribute(HTML.ATTR_STYLE,"float: "+(isClearButton ? "right;" : "left;")); + firstDiv.setAttribute(HTML.ATTR_STYLE,"float: "+(isClearButton ? "right;" : "left;")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ final nsIDOMElement secondDiv = visualDocument.createElement(HTML.TAG_DIV); if (isClearButton) { - secondDiv.setAttribute(HTML.ATTR_CLASS, "rich-fileupload-button rich-fileupload-font"); + secondDiv.setAttribute(HTML.ATTR_CLASS, "rich-fileupload-button rich-fileupload-font"); //$NON-NLS-1$ final nsIDOMElement thirdDiv = visualDocument.createElement(HTML.TAG_DIV); final nsIDOMElement aElement = visualDocument.createElement(HTML.TAG_A); - aElement.setAttribute(HTML.ATTR_CLASS, "rich-fileupload-button-selection"); - thirdDiv.setAttribute(HTML.ATTR_CLASS,defaultStyleClasses.get("clearAllButtonClass2")); + aElement.setAttribute(HTML.ATTR_CLASS, "rich-fileupload-button-selection"); //$NON-NLS-1$ + thirdDiv.setAttribute(HTML.ATTR_CLASS,defaultStyleClasses.get("clearAllButtonClass2")); //$NON-NLS-1$ firstDiv.appendChild(secondDiv); secondDiv.appendChild(aElement); aElement.appendChild(thirdDiv); @@ -188,8 +187,8 @@ private nsIDOMElement createPanelDiv(VpePageContext pageContext, Element source, nsIDOMDocument visualDocument) { final nsIDOMElement div = visualDocument.createElement(HTML.TAG_DIV); - div.setAttribute(HTML.ATTR_CLASS, defaultStyleClasses.get("uploadListClass")); - div.setAttribute(HTML.ATTR_STYLE, VpeStyleUtil.PARAMETER_WIDTH + VpeStyleUtil.COLON_STRING + "100%" + VpeStyleUtil.SEMICOLON_STRING + div.setAttribute(HTML.ATTR_CLASS, defaultStyleClasses.get("uploadListClass")); //$NON-NLS-1$ + div.setAttribute(HTML.ATTR_STYLE, VpeStyleUtil.PARAMETER_WIDTH + VpeStyleUtil.COLON_STRING + "100%" + VpeStyleUtil.SEMICOLON_STRING //$NON-NLS-1$ + VpeStyleUtil.PARAMETER_HEIGHT + VpeStyleUtil.COLON_STRING + this.listHeight); return div; } @@ -198,14 +197,14 @@ * Inits the default style classes. */ private void initDefaultStyleClasses() { - defaultStyleClasses.put("addButtonClass", "rich-fileupload-button rich-fileupload-font"); - defaultStyleClasses.put("uploadButtonClass","rich-fileupload-button rich-fileupload-font"); - defaultStyleClasses.put("addButtonClassDiv2", - " rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-add"); - defaultStyleClasses.put("clearAllButtonClass2", "rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-clear"); - defaultStyleClasses.put("uploadButtonClass2", - "rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-start "); - defaultStyleClasses.put("uploadListClass", "rich-fileupload-list-overflow"); + defaultStyleClasses.put("addButtonClass", "rich-fileupload-button rich-fileupload-font"); //$NON-NLS-1$ //$NON-NLS-2$ + defaultStyleClasses.put("uploadButtonClass","rich-fileupload-button rich-fileupload-font"); //$NON-NLS-1$ //$NON-NLS-2$ + defaultStyleClasses.put("addButtonClassDiv2", //$NON-NLS-1$ + " rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-add"); //$NON-NLS-1$ + defaultStyleClasses.put("clearAllButtonClass2", "rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-clear"); //$NON-NLS-1$ //$NON-NLS-2$ + defaultStyleClasses.put("uploadButtonClass2", //$NON-NLS-1$ + "rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-start "); //$NON-NLS-1$ + defaultStyleClasses.put("uploadListClass", "rich-fileupload-list-overflow"); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -235,54 +234,54 @@ */ private void prepareData(Element sourceElement) { try { - listHeight = String.valueOf(ComponentUtil.parseWidthHeightValue(sourceElement.getAttribute("listHeight"))); + listHeight = String.valueOf(ComponentUtil.parseWidthHeightValue(sourceElement.getAttribute("listHeight"))); //$NON-NLS-1$ } catch (NumberFormatException e) { listHeight = DEFAULT_LIST_HEIGHT; } try { - listWidth = String.valueOf(ComponentUtil.parseWidthHeightValue(sourceElement.getAttribute("listWidth"))); + listWidth = String.valueOf(ComponentUtil.parseWidthHeightValue(sourceElement.getAttribute("listWidth"))); //$NON-NLS-1$ } catch (NumberFormatException e) { listWidth = DEFAULT_LIST_WIDTH; } - addControlLabel = sourceElement.getAttribute("addControlLabel"); + addControlLabel = sourceElement.getAttribute("addControlLabel"); //$NON-NLS-1$ if (addControlLabel == null) { addControlLabel = DEFAULT_CONTROL_LABEL_VALUE; } - String addButtonClass = sourceElement.getAttribute("addButtonClass"); + String addButtonClass = sourceElement.getAttribute("addButtonClass"); //$NON-NLS-1$ if (ComponentUtil.isNotBlank(addButtonClass)) { - defaultStyleClasses.put("addButtonClass", defaultStyleClasses.get("addButtonClass") + " " + addButtonClass); - defaultStyleClasses.put("addButtonClassDiv2", defaultStyleClasses.get("addButtonClassDiv2") + " " + addButtonClass); + defaultStyleClasses.put("addButtonClass", defaultStyleClasses.get("addButtonClass") + " " + addButtonClass); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + defaultStyleClasses.put("addButtonClassDiv2", defaultStyleClasses.get("addButtonClassDiv2") + " " + addButtonClass); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } - String uploadListClass = sourceElement.getAttribute("uploadListClass"); + String uploadListClass = sourceElement.getAttribute("uploadListClass"); //$NON-NLS-1$ if (ComponentUtil.isNotBlank(uploadListClass)) { - defaultStyleClasses.put("uploadListClass", defaultStyleClasses.get("uploadListClass") + " " + uploadListClass); + defaultStyleClasses.put("uploadListClass", defaultStyleClasses.get("uploadListClass") + " " + uploadListClass); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } - this.uploadControlClass = ComponentUtil.getAttribute(sourceElement, "uploadControlClass"); + this.uploadControlClass = ComponentUtil.getAttribute(sourceElement, "uploadControlClass"); //$NON-NLS-1$ if(ComponentUtil.isNotBlank(uploadControlClass)){ - defaultStyleClasses.put("uploadButtonClass2", defaultStyleClasses.get("uploadButtonClass2")+" "+uploadListClass); + defaultStyleClasses.put("uploadButtonClass2", defaultStyleClasses.get("uploadButtonClass2")+" "+uploadListClass); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } - this.uploadControlLabel = ComponentUtil.getAttribute(sourceElement, "uploadControlLabel"); + this.uploadControlLabel = ComponentUtil.getAttribute(sourceElement, "uploadControlLabel"); //$NON-NLS-1$ if (ComponentUtil.isBlank(this.uploadControlLabel)) { - this.uploadControlLabel = "Upload"; + this.uploadControlLabel = "Upload"; //$NON-NLS-1$ } - this.clearAllControlLabel = ComponentUtil.getAttribute(sourceElement, "clearAllControlLabel"); + this.clearAllControlLabel = ComponentUtil.getAttribute(sourceElement, "clearAllControlLabel"); //$NON-NLS-1$ if(ComponentUtil.isBlank(this.clearAllControlLabel)){ - this.clearAllControlLabel = "Clear All"; + this.clearAllControlLabel = "Clear All"; //$NON-NLS-1$ } - clearAllControlClass = ComponentUtil.getAttribute(sourceElement, ""); + clearAllControlClass = ComponentUtil.getAttribute(sourceElement, ""); //$NON-NLS-1$ }

17 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r9514 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template.

by jbosstools-commits＠lists.jboss.org

Author: estherbin Date: 2008-08-05 08:51:05 -0400 (Tue, 05 Aug 2008) New Revision: 9514 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputTextTemplate.java Log: Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputTextTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputTextTemplate.java 2008-08-05 12:15:36 UTC (rev 9513) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfInputTextTemplate.java 2008-08-05 12:51:05 UTC (rev 9514) @@ -14,7 +14,6 @@ import org.jboss.tools.jsf.vpe.jsf.template.util.JSF; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.mapping.AttributeData; -import org.jboss.tools.vpe.editor.mapping.NodeData; import org.jboss.tools.vpe.editor.mapping.VpeElementData; import org.jboss.tools.vpe.editor.template.VpeCreationData; import org.jboss.tools.vpe.editor.util.HTML; @@ -60,6 +59,12 @@ } @Override + public Attr getOutputAttributeNode(Element element) { + // TODO Auto-generated method stub + return element.getAttributeNode(JSF.ATTR_VALUE); + } + + @Override public boolean isRecreateAtAttrChange(VpePageContext pageContext, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMElement visualNode, Object data, String name, String value) {

17 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r9513 - in trunk/vpe/plugins: org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: mareshkau Date: 2008-08-05 08:15:36 -0400 (Tue, 05 Aug 2008) New Revision: 9513 Modified: trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlCommentTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Constants.java Log: JBIDE-2584 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-08-05 11:10:43 UTC (rev 9512) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-08-05 12:15:36 UTC (rev 9513) @@ -105,9 +105,6 @@ private static final String PSEUDO_ELEMENT_ATTR = "vpe:pseudo-element"; //$NON-NLS-1$ private static final String INIT_ELEMENT_ATTR = "vpe:init-element"; //$NON-NLS-1$ private static final String MOZ_ANONCLASS_ATTR = "_MOZ_ANONCLASS"; //$NON-NLS-1$ - private static final String COMMENT_STYLE = "font-style:italic; color:green"; //$NON-NLS-1$ - private static final String COMMENT_PREFIX = ""; //$NON-NLS-1$ - private static final String COMMENT_SUFFIX = ""; //$NON-NLS-1$ private static final String INCLUDE_ELEMENT_ATTR = "vpe:include-element"; //$NON-NLS-1$ private static final int DRAG_AREA_WIDTH = 10; private static final int DRAG_AREA_HEIGHT = 10; @@ -419,14 +416,6 @@ return null; } -// -// if(sourceNode.getNodeType() == Node.TEXT_NODE){ -// System.err.println("Hello world"); -// } -// switch (sourceNode.getNodeType()) { - -// case Node.ELEMENT_NODE: -// Map<?, ?> xmlnsMap = createXmlns((Element) sourceNode); Set<Node> ifDependencySet = new HashSet<Node>(); pageContext.setCurrentVisualNode(visualOldContainer); VpeTemplate template = templateManager.getTemplate(pageContext, @@ -537,19 +526,6 @@ return border; else return visualNewNode; -// case Node.TEXT_NODE: -// return createTextNode(sourceNode, registerFlag); -// case Node.COMMENT_NODE: -// if (!YES_STRING.equals(VpePreference.SHOW_COMMENTS.getValue())) { -// return null; -// } -// nsIDOMElement visualNewComment = createComment(sourceNode); -// if (registerFlag) { -// registerNodes(new VpeNodeMapping(sourceNode, visualNewComment)); -// } -// return visualNewComment; -// } -// return null; } private void correctVisualAttribute(nsIDOMElement element) { @@ -572,16 +548,6 @@ } } - private nsIDOMElement createComment(Node sourceNode) { - nsIDOMElement div = visualDocument.createElement(HTML.TAG_DIV); - div.setAttribute(VpeStyleUtil.ATTRIBUTE_STYLE, COMMENT_STYLE); - String value = COMMENT_PREFIX + sourceNode.getNodeValue() - + COMMENT_SUFFIX; - nsIDOMText text = visualDocument.createTextNode(value); - div.appendChild(text); - return div; - } - protected void addChildren(VpeTemplate containerTemplate, Node sourceContainer, nsIDOMNode visualContainer) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Constants.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Constants.java 2008-08-05 11:10:43 UTC (rev 9512) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Constants.java 2008-08-05 12:15:36 UTC (rev 9513) @@ -16,5 +16,5 @@ public static final String TRUE = "true"; //$NON-NLS-1$ public static final String FALSE = "false"; //$NON-NLS-1$ public static final String EMPTY = ""; //$NON-NLS-1$ - + public static final String YES_STRING = "yes"; //$NON-NLS-1$ } Modified: trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlCommentTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlCommentTemplate.java 2008-08-05 11:10:43 UTC (rev 9512) +++ trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlCommentTemplate.java 2008-08-05 12:15:36 UTC (rev 9513) @@ -10,11 +10,17 @@ ******************************************************************************/ package org.jboss.tools.vpe.html.template; +import org.jboss.tools.jst.jsp.preferences.VpePreference; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.editor.util.Constants; +import org.jboss.tools.vpe.editor.util.HTML; +import org.jboss.tools.vpe.editor.util.VpeStyleUtil; import org.mozilla.interfaces.nsIDOMDocument; +import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; +import org.mozilla.interfaces.nsIDOMText; import org.w3c.dom.Node; /** @@ -23,15 +29,24 @@ */ public class HtmlCommentTemplate extends VpeAbstractTemplate { + private static final String COMMENT_STYLE = "font-style:italic; color:green"; //$NON-NLS-1$ /* (non-Javadoc) * @see org.jboss.tools.vpe.editor.template.VpeTemplate#create(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMDocument) */ public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { - - nsIDOMNode commentNode = visualDocument.createComment(sourceNode.getNodeValue()); - - return new VpeCreationData(commentNode); + nsIDOMNode visualNode; + if (Constants.YES_STRING.equals(VpePreference.SHOW_COMMENTS_VALUE)) { + visualNode = visualDocument.createElement(HTML.TAG_DIV); + ((nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)).setAttribute(VpeStyleUtil.ATTRIBUTE_STYLE, COMMENT_STYLE); + String value = sourceNode.getNodeValue(); + nsIDOMText text = visualDocument.createTextNode(value); + ((nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)).appendChild(text); + + } else { + visualNode = visualDocument.createComment(sourceNode.getNodeValue()); + } + return new VpeCreationData(visualNode); } }

17 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r9512 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.

by jbosstools-commits＠lists.jboss.org

Author: sdzmitrovich Date: 2008-08-05 07:10:43 -0400 (Tue, 05 Aug 2008) New Revision: 9512 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Constants.java Log: add license comment Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Constants.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Constants.java 2008-08-05 11:03:59 UTC (rev 9511) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Constants.java 2008-08-05 11:10:43 UTC (rev 9512) @@ -1,3 +1,14 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + package org.jboss.tools.vpe.editor.util; public class Constants {

17 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r9511 - in trunk/vpe/tests/org.jboss.tools.vpe.test: src/org/jboss/tools/vpe/test and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: estherbin Date: 2008-08-05 07:03:59 -0400 (Tue, 05 Aug 2008) New Revision: 9511 Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/META-INF/MANIFEST.MF trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/JBIDE2582Test.java Log: Write junit for selection. Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/META-INF/MANIFEST.MF 2008-08-05 07:55:41 UTC (rev 9510) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/META-INF/MANIFEST.MF 2008-08-05 11:03:59 UTC (rev 9511) @@ -19,9 +19,11 @@ org.jboss.tools.vpe.xulrunner, org.mozilla.xpcom, org.jboss.tools.tests;bundle-version="2.0.0", - org.jboss.tools.common.model.ui;bundle-version="2.0.0" + org.jboss.tools.common.model.ui;bundle-version="2.0.0", + org.eclipse.jface.text;bundle-version="3.4.0" Eclipse-LazyStart: true Export-Package: org.jboss.tools.vpe.editor.preferences, org.jboss.tools.vpe.editor.template, org.jboss.tools.vpe.test Bundle-ClassPath: vpe-tests.jar +Import-Package: org.eclipse.ui.part Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/JBIDE2582Test.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/JBIDE2582Test.java 2008-08-05 07:55:41 UTC (rev 9510) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/JBIDE2582Test.java 2008-08-05 11:03:59 UTC (rev 9511) @@ -14,15 +14,29 @@ import java.util.ArrayList; +import java.util.Collection; import java.util.List; +import java.util.Map; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.part.FileEditorInput; +import org.eclipse.wst.sse.core.StructuredModelManager; +import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; +import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.editor.VpeController; +import org.jboss.tools.vpe.editor.mapping.VpeDomMapping; +import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping; import org.jboss.tools.vpe.editor.util.HTML; +import org.jboss.tools.vpe.editor.util.SelectionUtil; import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.xulrunner.browser.util.DOMTreeDumper; +import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; +import org.w3c.dom.Node; /** @@ -32,13 +46,12 @@ * @author Evgenij Stherbin */ public class JBIDE2582Test extends CommonJBIDE2010Test { - + /** The Constant DIR_TEST_PAGE_NAME_3. */ - protected static final String PAGE_1 = "JBIDE/2582/page1.xhtml"; - - + protected static final String PAGE_1 = "JBIDE/2582/page1.xhtml"; //$NON-NLS-1$ + /** The Constant DIR_TEST_PAGE_NAME_3. */ - protected static final String PAGE_2 = "JBIDE/2582/page2.xhtml"; + protected static final String PAGE_2 = "JBIDE/2582/page2.xhtml"; //$NON-NLS-1$ /** * The Constructor. @@ -55,7 +68,7 @@ * * @throws Throwable the throwable */ - public void testRsSubstitution() throws Throwable { + public void _testRsSubstitution() throws Throwable { final nsIDOMElement rst = performTestForRichFacesComponent(file); assertNotNull(rst); @@ -64,39 +77,103 @@ TestUtil.findAllElementsByName(rst, elements, HTML.TAG_SPAN); - assertEquals("Size should be equals 1", 1, elements.size()); + assertEquals("Size should be equals 1", 1, elements.size()); //$NON-NLS-1$ final nsIDOMElement spanOne = (nsIDOMElement) elements.get(0).queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); - assertEquals("Style attribute should be substituted", "Hello", spanOne.getFirstChild().getNodeValue()); - + assertEquals("Style attribute should be substituted", "Hello", spanOne.getFirstChild().getNodeValue()); //$NON-NLS-1$ //$NON-NLS-2$ + } - - - - public void testResourceSubstitutionInText() throws CoreException, Throwable { + + /** + * _test resource substitution in text. + * + * @throws CoreException the core exception + * @throws Throwable the throwable + */ + public void _testResourceSubstitutionInText() throws CoreException, Throwable { final nsIDOMElement rst = performTestForRichFacesComponent((IFile) TestUtil.getComponentPath(PAGE_2, getOpenProjectName())); final List<nsIDOMNode> elements = new ArrayList<nsIDOMNode>(); -// DOMTreeDumper dumper = new DOMTreeDumper(); -// dumper.dumpToStream(System.out, rst); - TestUtil.findAllElementsByName(rst, elements, "H3"); - assertEquals("Size should be equals 1",1,elements.size()); - + // DOMTreeDumper dumper = new DOMTreeDumper(); + // dumper.dumpToStream(System.out, rst); + TestUtil.findAllElementsByName(rst, elements, "H3"); //$NON-NLS-1$ + assertEquals("Size should be equals 1", 1, elements.size()); //$NON-NLS-1$ + final nsIDOMElement h3one = (nsIDOMElement) elements.get(0).queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); - - assertEquals("Style attribute should be substituted", "Hello", h3one.getFirstChild().getFirstChild().getNodeValue()); - - //There are the label:#{msg.header}f - - TestUtil.findAllElementsByName(rst, elements, "SPAN"); - assertEquals("Size should be equals 1",4,elements.size()); + + assertEquals("Style attribute should be substituted", "Hello", h3one.getFirstChild().getFirstChild().getNodeValue()); //$NON-NLS-1$ //$NON-NLS-2$ + + // There are the label:#{msg.header}f + + TestUtil.findAllElementsByName(rst, elements, "SPAN"); //$NON-NLS-1$ + assertEquals("Size should be equals 1", 4, elements.size()); //$NON-NLS-1$ final nsIDOMElement pOne = ((nsIDOMElement) elements.get(2).queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)); - - assertEquals("Style attribute should be substituted", "There are the label:Hello Demo Application", pOne.getFirstChild().getNodeValue()); + assertEquals( + "Style attribute should be substituted", "There are the label:Hello Demo Application", pOne.getFirstChild().getNodeValue()); //$NON-NLS-1$ //$NON-NLS-2$ + } /** + * Test selection with resource string. + * + * @throws CoreException the core exception + */ + @SuppressWarnings("restriction") + public void testSelectionWithResourceString() throws CoreException { + IFile lfile = (IFile) TestUtil.getComponentPath(PAGE_2, getOpenProjectName()); + IEditorInput input = new FileEditorInput(lfile); + // open and get editor + JSPMultiPageEditor part = openEditor(input); + + // get controller + VpeController controller = getVpeController(part); + assertNotNull(controller); + + // get dommapping + VpeDomMapping domMapping = controller.getDomMapping(); + + assertNotNull(domMapping); + + // get source map + Map<Node, VpeNodeMapping> sourceMap = domMapping.getSourceMap(); + assertNotNull(sourceMap); + + // get collection of VpeNodeMapping + Collection<VpeNodeMapping> mappings = sourceMap.values(); + assertNotNull(mappings); + + // get xulrunner editor + XulRunnerEditor xulRunnerEditor = controller.getXulRunnerEditor(); + assertNotNull(xulRunnerEditor); + + int start = controller.getPageContext().getSourceBuilder().getStructuredTextViewer().getTextWidget().getText().indexOf( + "#{msg.hello_message}"); //$NON-NLS-1$ + + assertTrue("Should be gt that 100", start > 100); //$NON-NLS-1$ + + IStructuredModel model; + model = StructuredModelManager.getModelManager() + .getExistingModelForRead(controller.getSourceEditor().getTextViewer().getDocument()); + IDOMDocument document = null; + document = ((IDOMModel) model).getDocument(); + ; + org.w3c.dom.NodeList nodeList = document.getElementsByTagName("h:outputText"); //$NON-NLS-1$ + + assertNotNull("Can't be null", nodeList); //$NON-NLS-1$ + assertTrue("Size should be great that 0", nodeList.getLength() > 0); //$NON-NLS-1$ + + final Node elementNode = nodeList.item(0); + + SelectionUtil.setSourceSelection(controller.getPageContext(), elementNode, 0, 0); + + nsIDOMNode node = SelectionUtil.getLastSelectedNode(controller.getPageContext()); + + assertEquals("Node names should be equals", "Hello", node.getFirstChild().getNodeValue()); //$NON-NLS-1$ //$NON-NLS-2$ + + } + + /** * Gets the open page name. * * @return the open page name

17 years, 4 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits August 2008