July 2010 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r23184 - trunk/smooks/plugins/org.jboss.tools.smooks.runtime.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2010-07-02 13:01:40 -0400 (Fri, 02 Jul 2010) New Revision: 23184 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.runtime/pom.xml Log: groupId fixed in smooks.runtime plugin Modified: trunk/smooks/plugins/org.jboss.tools.smooks.runtime/pom.xml =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.runtime/pom.xml 2010-07-02 16:40:04 UTC (rev 23183) +++ trunk/smooks/plugins/org.jboss.tools.smooks.runtime/pom.xml 2010-07-02 17:01:40 UTC (rev 23184) @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tool.smooks.plugins</groupId> + <groupId>org.jboss.tools.smooks.plugins</groupId> <artifactId>org.jboss.tools.smooks.runtime</artifactId> <version>1.2.1-SNAPSHOT</version> <packaging>eclipse-plugin</packaging>

14 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r23183 - trunk.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-07-02 12:40:04 -0400 (Fri, 02 Jul 2010) New Revision: 23183 Modified: trunk/parent-pom.xml Log: remove scp and deploy stuff; not needed Modified: trunk/parent-pom.xml =================================================================== --- trunk/parent-pom.xml 2010-07-02 16:14:08 UTC (rev 23182) +++ trunk/parent-pom.xml 2010-07-02 16:40:04 UTC (rev 23183) @@ -118,18 +118,7 @@ <parallel>true</parallel> </configuration> </plugin> -  -  - </plugins> -  -  </build> <scm>

14 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r23182 - branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks.

by jbosstools-commits＠lists.jboss.org

Author: tfennelly Date: 2010-07-02 12:14:08 -0400 (Fri, 02 Jul 2010) New Revision: 23182 Removed: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/ Log: removed edimap

14 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r23181 - in branches/smooks-dmb: plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: tfennelly Date: 2010-07-02 12:02:47 -0400 (Fri, 02 Jul 2010) New Revision: 23181 Removed: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/actions/ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/models/ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/wizard/ Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/all/SmooksModelBuilderTest.java Log: removed edimap Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2010-07-02 15:38:19 UTC (rev 23180) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2010-07-02 16:02:47 UTC (rev 23181) @@ -51,7 +51,6 @@ org.jboss.tools.smooks.configuration.editors.javabean12, org.jboss.tools.smooks.configuration.editors.uitls, org.jboss.tools.smooks.configuration.editors.xml, - org.jboss.tools.smooks.edimap.editor, org.jboss.tools.smooks.editor, org.jboss.tools.smooks.gef.common, org.jboss.tools.smooks.gef.model, Modified: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/all/SmooksModelBuilderTest.java =================================================================== --- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/all/SmooksModelBuilderTest.java 2010-07-02 15:38:19 UTC (rev 23180) +++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/all/SmooksModelBuilderTest.java 2010-07-02 16:02:47 UTC (rev 23181) @@ -81,18 +81,17 @@ ftl.setTemplate("people[] : etc etc etc").setApplyOnElement("#document"); smooksModel.getComponents().add(ftl); - // No serialize it.... + // Now serialize it.... StringWriter writer = new StringWriter(); model.writeModel(writer); -// System.out.println(writer); XMLUnit.setIgnoreWhitespace( true ); XMLAssert.assertXMLEqual(new InputStreamReader(getClass().getResourceAsStream("expected_01.xml")), new StringReader(writer.toString())); // Recreate the model from the serialized form... model = modelBuilder.readModel(new StringReader(writer.toString())); - // serialize it again and check it again... + // Serialize it again and check it again... writer = new StringWriter(); model.writeModel(writer);

14 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r23180 - trunk/build/aggregate/site.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-07-02 11:38:19 -0400 (Fri, 02 Jul 2010) New Revision: 23180 Modified: trunk/build/aggregate/site/pom.xml trunk/build/aggregate/site/site.xml Log: temporarily remove teiid Modified: trunk/build/aggregate/site/pom.xml =================================================================== --- trunk/build/aggregate/site/pom.xml 2010-07-02 13:25:48 UTC (rev 23179) +++ trunk/build/aggregate/site/pom.xml 2010-07-02 15:38:19 UTC (rev 23180) @@ -38,7 +38,8 @@ <enabled>true</enabled> </snapshots> </repository> - <repository> + </repositories> </project> Modified: trunk/build/aggregate/site/site.xml =================================================================== --- trunk/build/aggregate/site/site.xml 2010-07-02 13:25:48 UTC (rev 23179) +++ trunk/build/aggregate/site/site.xml 2010-07-02 15:38:19 UTC (rev 23180) @@ -270,10 +270,11 @@  - <feature url="features/org.pi4soa.core.feature_0.0.0.jar" id="org.pi4soa.core.feature" version="0.0.0"> + <feature url="features/org.pi4soa.core.feature_0.0.0.jar" id="org.pi4soa.core.feature" version="0.0.0"> <category name="AllTools" /> </feature> - <feature url="features/org.teiid.datatools.connectivity.feature_0.0.0.jar" id="org.teiid.datatools.connectivity.feature" version="0.0.0"> + </site>

14 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r23179 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2010-07-02 09:25:48 -0400 (Fri, 02 Jul 2010) New Revision: 23179 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationSettingsTab.java Log: https://jira.jboss.org/browse/JBIDE-6571 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationSettingsTab.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationSettingsTab.java 2010-07-02 13:09:07 UTC (rev 23178) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationSettingsTab.java 2010-07-02 13:25:48 UTC (rev 23179) @@ -67,6 +67,8 @@ @SuppressWarnings("restriction") public class CodeGenerationSettingsTab extends AbstractLaunchConfigurationTab { + + public static final String NULL_CONFIG = "<None>"; //$NON-NLS-1$ private ComboDialogField consoleConfigurationName; @@ -114,10 +116,11 @@ consoleConfigurationName = new ComboDialogField(SWT.READ_ONLY); consoleConfigurationName.setLabelText(HibernateConsoleMessages.CodeGenerationSettingsTab_console_configuration); ConsoleConfiguration[] cfg = LaunchHelper.findFilteredSortedConsoleConfigs(); - String[] names = new String[cfg.length]; + String[] names = new String[cfg.length + 1]; + names[0] = NULL_CONFIG; for (int i = 0; i < cfg.length; i++) { ConsoleConfiguration configuration = cfg[i]; - names[i] = configuration.getName(); + names[i + 1] = configuration.getName(); } consoleConfigurationName.setItems(names); @@ -373,7 +376,8 @@ } public String getConfigurationName() { - return consoleConfigurationName.getText(); + String text = consoleConfigurationName.getText(); + return NULL_CONFIG.equals(text) ? "" : text; } @@ -422,7 +426,11 @@ public void initializeFrom(ILaunchConfiguration configuration) { try { ExporterAttributes attributes = new ExporterAttributes(configuration); - consoleConfigurationName.setText(attributes.getConsoleConfigurationName()); + if ( consoleConfigurationName.getText() != attributes.getConsoleConfigurationName()){ + consoleConfigurationName.selectItem(0);//NULL_CONFIG + consoleConfigurationName.setText(attributes.getConsoleConfigurationName()); + } + preferRawCompositeIds.setSelection(attributes.isPreferBasicCompositeIds()); autoManyToMany.setSelection( attributes.detectManyToMany() ); autoVersioning.setSelection( attributes.detectOptimisticLock() );

14 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r23178 - trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types.

by jbosstools-commits＠lists.jboss.org

Author: vpakan(a)redhat.com Date: 2010-07-02 09:09:07 -0400 (Fri, 02 Jul 2010) New Revision: 23178 Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java Log: Added constants for JBoss AS 5.1 Server and JBoss AS 5.1 Server Runtime. Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2010-07-02 13:03:25 UTC (rev 23177) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2010-07-02 13:09:07 UTC (rev 23178) @@ -311,6 +311,7 @@ // Server Runtime with this Label is created during JBDS installation for bundled EAP public static final String JBOSS_EAP = "jboss-eap Runtime"; public static final String JBOSS_EAP_5_0 = "JBoss EAP 5.0 Runtime"; + public static final String JBOSS_AS_5_1 = "JBoss 5.1 Runtime"; } @@ -357,19 +358,22 @@ public static final String JBOSS_EAP_4_3 = "JBoss Enterprise Middleware"; public static final String JBOSS_EAP_5_0 = "JBoss Enterprise Middleware"; + public static final String JBOSS_COMMUNITY = "JBoss Community"; } public static final class ServerRuntimeType { public static final String JBOSS_EAP_4_3 = "JBoss Enterprise Application Platform 4.3 Runtime"; public static final String JBOSS_EAP_5_0 = "JBoss Enterprise Application Platform 5.0 Runtime"; + public static final String JBOSS_AS_5_1 = "JBoss 5.1 Runtime"; } public static final class ServerType { public static final String JBOSS_EAP_4_3 = "JBoss Enterprise Application Platform 4.3"; public static final String JBOSS_EAP_5_0 = "JBoss Enterprise Application Platform 5.0"; - + public static final String JBOSS_AS_5_1 = "JBoss AS 5.1"; + } public static final class DroolsRuntimeDialog {

14 years, 6 months

1
0
0 / 0

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

by jbosstools-commits＠lists.jboss.org

Author: dvinnichek Date: 2010-07-02 09:03:25 -0400 (Fri, 02 Jul 2010) New Revision: 23177 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesFileUploadTemplate.java Log: fix rich:fileUpload template 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 2010-07-02 12:12:58 UTC (rev 23176) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesFileUploadTemplate.java 2010-07-02 13:03:25 UTC (rev 23177) @@ -209,11 +209,9 @@ listWidth = DEFAULT_LIST_WIDTH; } - addControlLabel = sourceElement.getAttribute("addControlLabel"); //$NON-NLS-1$ - if (addControlLabel == null) { - addControlLabel = DEFAULT_CONTROL_LABEL_VALUE; - } - + String addControlLabelAttrName = "addControlLabel"; //$NON-NLS-1$ + addControlLabel = sourceElement.hasAttribute(addControlLabelAttrName) ? sourceElement.getAttribute(addControlLabelAttrName) : DEFAULT_CONTROL_LABEL_VALUE; + this.uploadControlLabel = ComponentUtil.getAttribute(sourceElement, "uploadControlLabel"); //$NON-NLS-1$ if (ComponentUtil.isBlank(this.uploadControlLabel)) {

14 years, 6 months

1
0
0 / 0

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

by jbosstools-commits＠lists.jboss.org

Author: dvinnichek Date: 2010-07-02 08:12:58 -0400 (Fri, 02 Jul 2010) New Revision: 23176 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java Log: fix rich:orderingList template Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java 2010-07-02 11:36:40 UTC (rev 23175) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java 2010-07-02 12:12:58 UTC (rev 23176) @@ -126,16 +126,11 @@ */ Element sourceElement = (Element) sourceNode; - String width = sourceElement.getAttribute(WIDTH); - String height = sourceElement.getAttribute(HEIGHT); - String listWidth = sourceElement.getAttribute(LIST_WIDTH); - String listHeight = sourceElement.getAttribute(LIST_HEIGHT); + String width = sourceElement.hasAttribute(WIDTH) ? sourceElement.getAttribute(WIDTH) : DEFAULT_WIDTH; + String height = sourceElement.hasAttribute(HEIGHT) ? sourceElement.getAttribute(HEIGHT) : DEFAULT_HEIGHT; +// String listWidth = sourceElement.getAttribute(LIST_WIDTH); +// String listHeight = sourceElement.getAttribute(LIST_HEIGHT); - String controlsType = sourceElement.getAttribute(CONTROLS_TYPE); - String controlsHorizontalAlign = sourceElement.getAttribute(CONTROLS_HORIZONTAL_ALIGN); - String controlsVerticalAlign = sourceElement.getAttribute(CONTROLS_VERTICAL_ALIGN); - String captionLabel = sourceElement.getAttribute(CAPTION_LABEL); - /* * Crating tags structure */ @@ -160,6 +155,7 @@ /* * Set correct controls position */ + String controlsHorizontalAlign = sourceElement.getAttribute(CONTROLS_HORIZONTAL_ALIGN); if ("left".equalsIgnoreCase(controlsHorizontalAlign)) { //$NON-NLS-1$ tableButtonsCell = leftCell; tableListCell = rightCell; @@ -177,8 +173,8 @@ /* * Setting required attributes */ - tableCommon.setAttribute(HTML.ATTR_WIDTH, (width == null ? DEFAULT_WIDTH : width)); - tableCommon.setAttribute(HTML.ATTR_HEIGHT, (height == null ? DEFAULT_HEIGHT : height)); + tableCommon.setAttribute(HTML.ATTR_WIDTH, width); + tableCommon.setAttribute(HTML.ATTR_HEIGHT, height); tableCommon.setAttribute(HTML.ATTR_CLASS, CSS_LIST_BODY_CLASS); tableCaptionCell.setAttribute(HTML.ATTR_CLASS, CSS_CAPTION_CLASS); @@ -197,22 +193,24 @@ /* * Get value from caption label */ + String captionLabel = sourceElement.getAttribute(CAPTION_LABEL); tableCaptionCell.appendChild(visualDocument.createTextNode(captionLabel)); } /* * Encode controls */ + String controlsType = sourceElement.getAttribute(CONTROLS_TYPE); if (!"none".equalsIgnoreCase(controlsType)) { //$NON-NLS-1$ nsIDOMElement controlsDiv = createControlsDiv(pageContext, creationData, visualDocument, sourceElement); tableButtonsCell.setAttribute(HTML.ATTR_CLASS, CSS_BUTTON_VALIGN_CLASS); - tableButtonsCell.setAttribute(HTML.ATTR_ALIGN, "center"); //$NON-NLS-1$ + tableButtonsCell.setAttribute(HTML.ATTR_ALIGN, "center"); //$NON-NLS-1$ - if ((null != controlsVerticalAlign) && ("".equals(controlsVerticalAlign))){ //$NON-NLS-1$ - tableButtonsCell.setAttribute(HTML.ATTR_VALIGN, ("center" //$NON-NLS-1$ - .equalsIgnoreCase(controlsVerticalAlign) ? "middle" //$NON-NLS-1$ - : controlsVerticalAlign)); + if (sourceElement.hasAttribute(CONTROLS_VERTICAL_ALIGN)){ + String controlsVerticalAlign = sourceElement.getAttribute(CONTROLS_VERTICAL_ALIGN); + String valign = "center".equalsIgnoreCase(controlsVerticalAlign) ? "middle" : controlsVerticalAlign; //$NON-NLS-1$ //$NON-NLS-2$ + tableButtonsCell.setAttribute(HTML.ATTR_VALIGN, valign); } tableButtonsCell.appendChild(controlsDiv); @@ -243,23 +241,20 @@ String downControlClass = sourceElement.getAttribute(DOWN_CONTROL_CLASS); String bottomControlClass = sourceElement.getAttribute(BOTTOM_CONTROL_CLASS); - String topControlLabel = sourceElement.getAttribute(TOP_CONTROL_LABEL); - String upControlLabel = sourceElement.getAttribute(UP_CONTROL_LABEL); - String downControlLabel = sourceElement.getAttribute(DOWN_CONTROL_LABEL); - String bottomControlLabel = sourceElement.getAttribute(BOTTOM_CONTROL_LABEL); - String showButtonLabelsStr = sourceElement.getAttribute(SHOW_BUTTON_LABELS); String fastOrderControlsVisibleStr = sourceElement.getAttribute(FAST_ORDER_CONTROL_VISIBLE); String orderControlsVisibleStr = sourceElement.getAttribute(ORDER_CONTROL_VISIBLE); boolean showButtonLabels = ComponentUtil.string2boolean(showButtonLabelsStr); boolean fastOrderControlsVisible = ComponentUtil.string2boolean(fastOrderControlsVisibleStr); boolean orderControlsVisible = ComponentUtil.string2boolean(orderControlsVisibleStr); - String controlsClass = sourceElement.getAttribute(CONTROLS_CLASS); nsIDOMElement buttonsDiv = visualDocument.createElement(HTML.TAG_DIV); - buttonsDiv.setAttribute(HTML.ATTR_CLASS, - CSS_CONTROLS_CLASS + " " + (null != controlsClass ? controlsClass + " " : "") //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - + CSS_BUTTON_LAYOUT_CLASS); + + String controlsClass = CSS_CONTROLS_CLASS + " "; //$NON-NLS-1$ + if (sourceElement.hasAttribute(CONTROLS_CLASS)) { + controlsClass += sourceElement.getAttribute(CONTROLS_CLASS) + " "; //$NON-NLS-1$ + } + buttonsDiv.setAttribute(HTML.ATTR_CLASS, controlsClass + CSS_BUTTON_LAYOUT_CLASS); Element top_control_facet = ComponentUtil.getFacet(sourceElement, TOP_CONTROL_FACET); Element up_control_facet = ComponentUtil.getFacet(sourceElement, UP_CONTROL_FACET); @@ -267,34 +262,43 @@ Element bottom_control_facet = ComponentUtil.getFacet(sourceElement, BOTTOM_CONTROL_FACET); if (fastOrderControlsVisible) { + + String topControlLabel = sourceElement.hasAttribute(TOP_CONTROL_LABEL) ? sourceElement.getAttribute(TOP_CONTROL_LABEL) : TOP_CONTROL_LABEL_DEFAULT; + nsIDOMElement btnTopDiv = createSingleButtonDiv(pageContext, creationData, visualDocument, - (null == topControlLabel ? TOP_CONTROL_LABEL_DEFAULT - : topControlLabel), TOP_CONTROL_IMG, - showButtonLabels, top_control_facet, CSS_TOP_CONTROL_CLASS, topControlClass); + topControlLabel, TOP_CONTROL_IMG, showButtonLabels, top_control_facet, + CSS_TOP_CONTROL_CLASS, topControlClass); + buttonsDiv.appendChild(btnTopDiv); } if (orderControlsVisible) { + + String upControlLabel = sourceElement.hasAttribute(UP_CONTROL_LABEL)? sourceElement.getAttribute(UP_CONTROL_LABEL) : UP_CONTROL_LABEL_DEFAULT; + String downControlLabel = sourceElement.hasAttribute(DOWN_CONTROL_LABEL) ? sourceElement.getAttribute(DOWN_CONTROL_LABEL) : DOWN_CONTROL_LABEL_DEFAULT; + nsIDOMElement btnUpDiv = createSingleButtonDiv(pageContext, creationData, visualDocument, - (null == upControlLabel ? UP_CONTROL_LABEL_DEFAULT - : upControlLabel), UP_CONTROL_IMG, - showButtonLabels, up_control_facet, CSS_UP_CONTROL_CLASS, upControlClass); + upControlLabel, UP_CONTROL_IMG, showButtonLabels, up_control_facet, + CSS_UP_CONTROL_CLASS, upControlClass); nsIDOMElement btnDownDiv = createSingleButtonDiv(pageContext, creationData, visualDocument, - (null == downControlLabel ? DOWN_CONTROL_LABEL_DEFAULT - : downControlLabel), DOWN_CONTROL_IMG, - showButtonLabels, down_control_facet, CSS_DOWN_CONTROL_CLASS, downControlClass); + downControlLabel, DOWN_CONTROL_IMG, showButtonLabels, down_control_facet, + CSS_DOWN_CONTROL_CLASS, downControlClass); + buttonsDiv.appendChild(btnUpDiv); buttonsDiv.appendChild(btnDownDiv); } - + if (fastOrderControlsVisible) { + + String bottomControlLabel = sourceElement.hasAttribute(BOTTOM_CONTROL_LABEL) ? sourceElement.getAttribute(BOTTOM_CONTROL_LABEL) : BOTTOM_CONTROL_LABEL_DEFAULT; + nsIDOMElement btnBottomDiv = createSingleButtonDiv(pageContext, creationData, visualDocument, - (null == bottomControlLabel ? BOTTOM_CONTROL_LABEL_DEFAULT - : bottomControlLabel), BOTTOM_CONTROL_IMG, - showButtonLabels, bottom_control_facet, CSS_BOTTOM_CONTROL_CLASS, bottomControlClass); + bottomControlLabel, BOTTOM_CONTROL_IMG, showButtonLabels, bottom_control_facet, + CSS_BOTTOM_CONTROL_CLASS, bottomControlClass); + buttonsDiv.appendChild(btnBottomDiv); - } + return buttonsDiv; } @@ -391,7 +395,7 @@ */ ArrayList<Element> columnsHeaders = ComponentUtil.getColumnsWithFacet(columns, HEADER); if (!columnsHeaders.isEmpty()) { - String headerClass = (String) sourceElement.getAttribute(HEADER_CLASS); + String headerClass = sourceElement.hasAttribute(HEADER_CLASS) ? sourceElement.getAttribute(HEADER_CLASS) : null; nsIDOMElement tr = visualDocument.createElement(HTML.TAG_TR); thead.appendChild(tr); String styleClass = ComponentUtil.encodeStyleClass(null, @@ -405,17 +409,17 @@ * Encoding columns headers */ for (Element column : columnsHeaders) { - String columnHeaderClass = column.getAttribute(RichFaces.ATTR_HEADER_CLASS); + String columnHeaderClass = column.hasAttribute(RichFaces.ATTR_HEADER_CLASS) ? column.getAttribute(RichFaces.ATTR_HEADER_CLASS) : null; nsIDOMElement td = visualDocument.createElement(HTML.TAG_TD); tr.appendChild(td); td.setAttribute(HTML.ATTR_BACKGROUND, "file:///" //$NON-NLS-1$ + ComponentUtil.getAbsoluteResourcePath(HEADER_CELL_BG).replace('\\', '/')); styleClass = ComponentUtil.encodeStyleClass(null, CSS_TABLE_HEADER_CELL_CLASS, headerClass, columnHeaderClass); - td.setAttribute(HTML.ATTR_CLASS, styleClass); + td.setAttribute(HTML.ATTR_CLASS, styleClass); - String colspan = column.getAttribute(HTML.ATTR_COLSPAN); - if (colspan != null && colspan.length() > 0) { + if (column.hasAttribute(HTML.ATTR_COLSPAN)) { + String colspan = column.getAttribute(HTML.ATTR_COLSPAN); td.setAttribute(HTML.ATTR_COLSPAN, colspan); } Element facetBody = ComponentUtil.getFacet(column, RichFaces.NAME_FACET_HEADER); @@ -428,9 +432,6 @@ /* * Encode content */ - String listWidth = sourceElement.getAttribute(LIST_WIDTH); - String listHeight = sourceElement.getAttribute(LIST_HEIGHT); - String listClass = sourceElement.getAttribute(LIST_CLASS); /* * TODO: implement support of rowClasses @@ -439,19 +440,23 @@ */ // String rowClasses = sourceElement.getAttribute(ROW_CLASSES); + String listWidth = sourceElement.hasAttribute(LIST_WIDTH) ? sourceElement.getAttribute(LIST_WIDTH) : DEFAULT_LIST_WIDTH; + String listHeight = sourceElement.hasAttribute(LIST_HEIGHT) ? sourceElement.getAttribute(LIST_HEIGHT) : DEFAULT_LIST_HEIGHT; + String divStyle = HTML.ATTR_WIDTH + " : " //$NON-NLS-1$ - + (listWidth == null ? DEFAULT_LIST_WIDTH : listWidth) + ";" //$NON-NLS-1$ - + HTML.ATTR_HEIGHT + " : " //$NON-NLS-1$ - + (listHeight == null ? DEFAULT_LIST_HEIGHT : listHeight) + ";" //$NON-NLS-1$ - + "overflow: scroll;"; //$NON-NLS-1$ - - contentDiv.setAttribute(HTML.ATTR_STYLE, divStyle); - + + listWidth + ";" //$NON-NLS-1$ + + HTML.ATTR_HEIGHT + " : " //$NON-NLS-1$ + + listHeight + ";" //$NON-NLS-1$ + + "overflow: scroll;"; //$NON-NLS-1$ + contentDiv.setAttribute(HTML.ATTR_STYLE, divStyle); contentDiv.setAttribute(HTML.ATTR_CLASS, CSS_LIST_OUTPUT_CLASS + " " + CSS_LIST_CONTENT_CLASS); //$NON-NLS-1$ - contentTable.setAttribute(HTML.ATTR_CLASS, - CSS_LIST_ITEMS_CLASS + " " + (null == listClass ? "" : listClass)); //$NON-NLS-1$ //$NON-NLS-2$ - + + String listClass = CSS_LIST_ITEMS_CLASS; + if (sourceElement.hasAttribute(LIST_CLASS)) { + listClass += " " + sourceElement.getAttribute(LIST_CLASS); //$NON-NLS-1$ + } + contentTable.setAttribute(HTML.ATTR_CLASS, listClass); contentTable.setAttribute(HTML.ATTR_CELLSPACING, "1"); //$NON-NLS-1$ VisualDomUtil.copyAttributes(sourceElement, contentTable);

14 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r23175 - trunk/smooks/tests/org.jboss.tools.smooks.ui.test/src/org/jboss/tools/smooks/launch/serialize.

by jbosstools-commits＠lists.jboss.org

Author: tfennelly Date: 2010-07-02 07:36:40 -0400 (Fri, 02 Jul 2010) New Revision: 23175 Modified: trunk/smooks/tests/org.jboss.tools.smooks.ui.test/src/org/jboss/tools/smooks/launch/serialize/expected-01.txt Log: https://jira.jboss.org/browse/JBIDE-6565 test failure fix Modified: trunk/smooks/tests/org.jboss.tools.smooks.ui.test/src/org/jboss/tools/smooks/launch/serialize/expected-01.txt =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.ui.test/src/org/jboss/tools/smooks/launch/serialize/expected-01.txt 2010-07-02 10:12:02 UTC (rev 23174) +++ trunk/smooks/tests/org.jboss.tools.smooks.ui.test/src/org/jboss/tools/smooks/launch/serialize/expected-01.txt 2010-07-02 11:36:40 UTC (rev 23175) @@ -1,17 +1,17 @@ -> order (beanId = order) - > header (beanId = header) +> order (beanId = "order") + > header (beanId = "header") > customerNumber = 188276L > customerName = "Mr. Fox" - > orderItems (beanId = orderItems) - > org.jboss.tools.smooks.launch.serialize.OrderItem (beanId = orderItem) + > orderItems (beanId = "orderItems") + > org.jboss.tools.smooks.launch.serialize.OrderItem (beanId = "orderItem") > productId = 55126L > quantity = 6I > price = 65.98D - > org.jboss.tools.smooks.launch.serialize.OrderItem (beanId = orderItem) + > org.jboss.tools.smooks.launch.serialize.OrderItem (beanId = "orderItem") > productId = 23423L > quantity = 3I > price = 8.42D - > org.jboss.tools.smooks.launch.serialize.OrderItem (beanId = orderItem) + > org.jboss.tools.smooks.launch.serialize.OrderItem (beanId = "orderItem") > productId = 45645L > quantity = 7I > price = 999.0D \ No newline at end of file

14 years, 6 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 July 2010