November 2011 - jbosstools-commits

JBoss Tools SVN: r36722 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-11-29 07:18:55 -0500 (Tue, 29 Nov 2011) New Revision: 36722 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java Log: renamed the "Embed" button to "Edit" Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java 2011-11-29 11:49:59 UTC (rev 36721) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java 2011-11-29 12:18:55 UTC (rev 36722) @@ -160,7 +160,7 @@ deleteButton.addSelectionListener(onDelete(dbc)); Button embedButton = new Button(applicationGroup, SWT.PUSH); - embedButton.setText("E&mbed"); + embedButton.setText("E&dit"); GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).hint(80, SWT.DEFAULT).applyTo(embedButton); DataBindingUtils.bindEnablementToValidationStatus(embedButton, IStatus.OK, dbc, selectedApplicationBinding); embedButton.addSelectionListener(onEmbed(dbc));

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r36721 - in trunk/jsf: plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template and 5 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2011-11-29 06:49:59 -0500 (Tue, 29 Nov 2011) New Revision: 36721 Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/editor/editor4.css trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/editor/richEditorToolbar.png trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/editor/sprites.png trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFaces4EditorTemplate.java Removed: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/1579/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1579Test.java Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesEditorTemplate.java 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/RichFacesPickListTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/editor.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/editor.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/orderingList.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/orderingList.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/pickList.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllImportantTests.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesPickListTemplateTestCase.java Log: https://issues.jboss.org/browse/JBIDE-10150 - Update some RichFaces 4 components visual preview Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/editor/editor4.css =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/editor/editor4.css (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/editor/editor4.css 2011-11-29 11:49:59 UTC (rev 36721) @@ -0,0 +1,93 @@ +.cke_skin_richfaces { + border-color: #C4C0B9; + border-style: solid; + border-width: 1px; + display: block; +} + +.cke_wrapper { + overflow: hidden; + background-color: #D4CFC7; + background-image: url("sprites.png"); + background-position: 0 -1950px; + background-repeat: repeat-x; + display: block; + padding: 1px; +} + +.cke_editor { + display: inline-table; + width: 100%; +} + +.cke_toolbox { + clear: both; + padding-bottom: 1px; +} + +.cke_toolbar { + display: block; + float: left; +} + +.cke_toolgroup { + background-position: 0 -500px; + background-repeat: repeat-x; + display: inline; + float: left; + margin-bottom: 5px; + margin-right: 6px; + padding: 2px; +} + +.cke_editor { + display: inline-table; + width: 100%; +} + +.cke_toolbox_collapser { + background-image: url("sprites.png"); + background-position: 3px -1366px; + background-repeat: no-repeat; + border: 1px outset #D3D3D3; + cursor: pointer; + float: right; + height: 11px; + margin: 11px 0 2px; + width: 11px; +} + +.cke_resizer { + background-image: url("sprites.png"); + background-position: 0 -1428px; + background-repeat: no-repeat; + cursor: se-resize; + display: block; + float: right; + height: 12px; + margin-top: 5px; + width: 12px; +} + +.cke_path { + display: inline-block; + float: left; + margin-top: 5px; +} + +.cke_contents { + margin: 5px; +} + +.jbds_rf_editor_toolbar_image_internal_css_class { + display: block; + height:25px; + width:200px; + background-repeat: no-repeat; + background-image: url(richEditorToolbar.png); +} + +.jbds_rf_editor_content_textarea_internal_css_class { + height: 100%; + width: 100%; +} Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/editor/richEditorToolbar.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/editor/richEditorToolbar.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/editor/sprites.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/editor/sprites.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFaces4EditorTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFaces4EditorTemplate.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFaces4EditorTemplate.java 2011-11-29 11:49:59 UTC (rev 36721) @@ -0,0 +1,136 @@ +/******************************************************************************* + * Copyright (c) 2007-2011 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jsf.vpe.richfaces.template; + +import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil; +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.w3c.dom.Element; +import org.w3c.dom.Node; + +public class RichFaces4EditorTemplate extends VpeAbstractTemplate { + + private static final String STYLE_PATH = "editor/editor4.css"; //$NON-NLS-1$ + + private static final String CSS_CKE_SKIN_RF_CLASS = "cke_skin_richfaces"; //$NON-NLS-1$ + private static final String CSS_CKE_WRAPPER_CLASS = "cke_wrapper"; //$NON-NLS-1$ + private static final String CSS_CKE_EDITOR_CLASS = "cke_editor"; //$NON-NLS-1$ + private static final String CSS_CKE_TOP_CLASS = "cke_top"; //$NON-NLS-1$ + private static final String CSS_CKE_CONTENTS_CLASS = "cke_contents"; //$NON-NLS-1$ + private static final String CSS_CKE_BOTTOM_CLASS = "cke_bottom"; //$NON-NLS-1$ + private static final String CSS_CKE_TOOLBOX_CLASS = "cke_toolbox"; //$NON-NLS-1$ + private static final String CSS_CKE_TOOLBOX_COLLAPSER_CLASS = "cke_toolbox_collapser"; //$NON-NLS-1$ + private static final String CSS_CKE_RESIZER_CLASS = "cke_resizer"; //$NON-NLS-1$ + private static final String CSS_CKE_PATH_CLASS = "cke_path"; //$NON-NLS-1$ + private static final String CSS_CKE_TOOLBAR_CLASS = "cke_toolbar"; //$NON-NLS-1$ + private static final String CSS_CKE_TOOLGROUP_CLASS = "cke_toolgroup"; //$NON-NLS-1$ + private static final String CSS_TOOLBAR_IMAGE_CLASS = "jbds_rf_editor_toolbar_image_internal_css_class"; //$NON-NLS-1$ + private static final String CSS_TEXTAREA_CLASS = "jbds_rf_editor_content_textarea_internal_css_class"; //$NON-NLS-1$ + + @Override + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, + nsIDOMDocument visualDocument) { + Element sourceElement = (Element) sourceNode; + /* + * Add required css file + */ + ComponentUtil.setCSSLink(pageContext, STYLE_PATH, "editor4"); //$NON-NLS-1$ + + nsIDOMElement topSpan = visualDocument.createElement(HTML.TAG_SPAN); + nsIDOMElement spanWrapper = visualDocument.createElement(HTML.TAG_SPAN); + nsIDOMElement table = visualDocument.createElement(HTML.TAG_TABLE); + nsIDOMElement tbody = visualDocument.createElement(HTML.TAG_TBODY); + nsIDOMElement tr1 = visualDocument.createElement(HTML.TAG_TR); + nsIDOMElement tr2 = visualDocument.createElement(HTML.TAG_TR); + nsIDOMElement tr3 = visualDocument.createElement(HTML.TAG_TR); + nsIDOMElement td1 = visualDocument.createElement(HTML.TAG_TD); + nsIDOMElement td2 = visualDocument.createElement(HTML.TAG_TD); + nsIDOMElement td3 = visualDocument.createElement(HTML.TAG_TD); + /* + * Process Source Element attributes + */ + if (sourceElement.hasAttribute(HTML.ATTR_WIDTH)) { + topSpan.setAttribute(HTML.ATTR_STYLE, HTML.ATTR_WIDTH + Constants.COLON + + VpeStyleUtil.addPxIfNecessary(sourceElement.getAttribute(HTML.ATTR_WIDTH))); + } + if (sourceElement.hasAttribute(HTML.ATTR_HEIGHT)) { + td2.setAttribute(HTML.ATTR_STYLE, HTML.ATTR_HEIGHT + Constants.COLON + + VpeStyleUtil.addPxIfNecessary(sourceElement.getAttribute(HTML.ATTR_HEIGHT))); + } + /* + * TOP ROW + */ + nsIDOMElement divToolbox = visualDocument.createElement(HTML.TAG_DIV); + nsIDOMElement a = visualDocument.createElement(HTML.TAG_SPAN); + + nsIDOMElement span1 = visualDocument.createElement(HTML.TAG_SPAN); + nsIDOMElement span2 = visualDocument.createElement(HTML.TAG_SPAN); + nsIDOMElement span3img = visualDocument.createElement(HTML.TAG_SPAN); + span1.setAttribute(HTML.ATTR_CLASS, CSS_CKE_TOOLBAR_CLASS); + span2.setAttribute(HTML.ATTR_CLASS, CSS_CKE_TOOLGROUP_CLASS); + span3img.setAttribute(HTML.ATTR_CLASS, CSS_TOOLBAR_IMAGE_CLASS); + span2.appendChild(span3img); + span1.appendChild(span2); + divToolbox.appendChild(span1); + divToolbox.appendChild(a); + /* + * MIDDLE TEXT AREA ROW + */ + nsIDOMElement textArea = visualDocument.createElement(HTML.TAG_TEXTAREA); + /* + * BOTTOM ROW + */ + nsIDOMElement divResizer = visualDocument.createElement(HTML.TAG_DIV); + nsIDOMElement divPath = visualDocument.createElement(HTML.TAG_DIV); + /* + * Add css style classes + */ + topSpan.setAttribute(HTML.ATTR_CLASS, CSS_CKE_SKIN_RF_CLASS); + spanWrapper.setAttribute(HTML.ATTR_CLASS, CSS_CKE_WRAPPER_CLASS); + table.setAttribute(HTML.ATTR_CLASS, CSS_CKE_EDITOR_CLASS); + td1.setAttribute(HTML.ATTR_CLASS, CSS_CKE_TOP_CLASS); + td2.setAttribute(HTML.ATTR_CLASS, CSS_CKE_CONTENTS_CLASS); + td3.setAttribute(HTML.ATTR_CLASS, CSS_CKE_BOTTOM_CLASS); + divToolbox.setAttribute(HTML.ATTR_CLASS, CSS_CKE_TOOLBOX_CLASS); + a.setAttribute(HTML.ATTR_CLASS, CSS_CKE_TOOLBOX_COLLAPSER_CLASS); + textArea.setAttribute(HTML.ATTR_CLASS, CSS_TEXTAREA_CLASS); + divResizer.setAttribute(HTML.ATTR_CLASS, CSS_CKE_RESIZER_CLASS); + divPath.setAttribute(HTML.ATTR_CLASS, CSS_CKE_PATH_CLASS); + /* + * Nesting the elements + */ + td1.appendChild(divToolbox); + td1.appendChild(a); + td2.appendChild(textArea); + td3.appendChild(divResizer); + td3.appendChild(divPath); + tr1.appendChild(td1); + tr2.appendChild(td2); + tr3.appendChild(td3); + tbody.appendChild(tr1); + tbody.appendChild(tr2); + tbody.appendChild(tr3); + table.appendChild(tbody); + spanWrapper.appendChild(table); + topSpan.appendChild(spanWrapper); + /* + * Create VpeCreationData + */ + VpeCreationData creationData = new VpeCreationData(topSpan); + return creationData; + } +} \ No newline at end of file Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesEditorTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesEditorTemplate.java 2011-11-29 11:38:37 UTC (rev 36720) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesEditorTemplate.java 2011-11-29 11:49:59 UTC (rev 36721) @@ -42,13 +42,6 @@ VpeCreationData creationData = new VpeCreationData(mainElement); return creationData; } - - @Override - public boolean recreateAtAttrChange(VpePageContext pageContext, - Element sourceElement, nsIDOMDocument visualDocument, - nsIDOMElement visualNode, Object data, String name, String value) { - return true; - } } /** 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 2011-11-29 11:38:37 UTC (rev 36720) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java 2011-11-29 11:49:59 UTC (rev 36721) @@ -44,6 +44,11 @@ private static final String HEADER = "header"; //$NON-NLS-1$ private static final String HEADER_CLASS = "headerClass"; //$NON-NLS-1$ + private static final String ARROW_TOP = "\u21D1"; //$NON-NLS-1$ + private static final String ARROW_UP = "\u2191"; //$NON-NLS-1$ + private static final String ARROW_DOWN = "\u2193"; //$NON-NLS-1$ + private static final String ARROW_BOTTOM = "\u21D3"; //$NON-NLS-1$ + private static final String TOP_CONTROL_IMG = "orderingList/top.gif"; //$NON-NLS-1$ private static final String UP_CONTROL_IMG = "orderingList/up.gif"; //$NON-NLS-1$ private static final String DOWN_CONTROL_IMG = "orderingList/down.gif"; //$NON-NLS-1$ @@ -266,7 +271,7 @@ String topControlLabel = sourceElement.hasAttribute(TOP_CONTROL_LABEL) ? sourceElement.getAttribute(TOP_CONTROL_LABEL) : TOP_CONTROL_LABEL_DEFAULT; nsIDOMElement btnTopDiv = createSingleButtonDiv(pageContext, creationData, visualDocument, - topControlLabel, TOP_CONTROL_IMG, showButtonLabels, top_control_facet, + topControlLabel, ARROW_TOP, showButtonLabels, top_control_facet, CSS_TOP_CONTROL_CLASS, topControlClass); buttonsDiv.appendChild(btnTopDiv); @@ -278,10 +283,10 @@ String downControlLabel = sourceElement.hasAttribute(DOWN_CONTROL_LABEL) ? sourceElement.getAttribute(DOWN_CONTROL_LABEL) : DOWN_CONTROL_LABEL_DEFAULT; nsIDOMElement btnUpDiv = createSingleButtonDiv(pageContext, creationData, visualDocument, - upControlLabel, UP_CONTROL_IMG, showButtonLabels, up_control_facet, + upControlLabel, ARROW_UP, showButtonLabels, up_control_facet, CSS_UP_CONTROL_CLASS, upControlClass); nsIDOMElement btnDownDiv = createSingleButtonDiv(pageContext, creationData, visualDocument, - downControlLabel, DOWN_CONTROL_IMG, showButtonLabels, down_control_facet, + downControlLabel, ARROW_DOWN, showButtonLabels, down_control_facet, CSS_DOWN_CONTROL_CLASS, downControlClass); buttonsDiv.appendChild(btnUpDiv); @@ -293,7 +298,7 @@ String bottomControlLabel = sourceElement.hasAttribute(BOTTOM_CONTROL_LABEL) ? sourceElement.getAttribute(BOTTOM_CONTROL_LABEL) : BOTTOM_CONTROL_LABEL_DEFAULT; nsIDOMElement btnBottomDiv = createSingleButtonDiv(pageContext, creationData, visualDocument, - bottomControlLabel, BOTTOM_CONTROL_IMG, showButtonLabels, bottom_control_facet, + bottomControlLabel, ARROW_BOTTOM, showButtonLabels, bottom_control_facet, CSS_BOTTOM_CONTROL_CLASS, bottomControlClass); buttonsDiv.appendChild(btnBottomDiv); @@ -309,7 +314,7 @@ * @param creationData the creation data * @param visualDocument the visual document * @param btnName the btn name - * @param imgName the img name + * @param arrowName the img name * @param showButtonLabels the show button labels * @param buttonFacet the button facet * @param cssStyleName the css style name @@ -318,15 +323,15 @@ * @return the element */ private nsIDOMElement createSingleButtonDiv(final VpePageContext pageContext, VpeCreationData creationData, - nsIDOMDocument visualDocument, String btnName, String imgName, + nsIDOMDocument visualDocument, String btnName, String arrowName, boolean showButtonLabels, Element buttonFacet, String cssStyleName, String customStyleClass) { nsIDOMElement div1 = visualDocument.createElement(HTML.TAG_DIV); nsIDOMElement div2 = visualDocument.createElement(HTML.TAG_DIV); - nsIDOMElement a = visualDocument.createElement(HTML.TAG_A); +// nsIDOMElement a = visualDocument.createElement(HTML.TAG_A); nsIDOMElement div3 = visualDocument.createElement(HTML.TAG_DIV); - nsIDOMElement img = visualDocument.createElement(HTML.TAG_IMG); +// nsIDOMElement arrowImg = visualDocument.createElement(HTML.TAG_IMG); div1.setAttribute(HTML.ATTR_CLASS, "dr-buttons-border" + " " + cssStyleName //$NON-NLS-1$ //$NON-NLS-2$ @@ -349,18 +354,21 @@ /* * Creating button with image and label */ - ComponentUtil.setImg(img, imgName); - img.setAttribute(HTML.ATTR_WIDTH, "15"); //$NON-NLS-1$ - img.setAttribute(HTML.ATTR_HEIGHT, "15"); //$NON-NLS-1$ - div3.appendChild(img); +// ComponentUtil.setImg(arrowImg, arrowName); +// arrowImg.setAttribute(HTML.ATTR_WIDTH, "15"); //$NON-NLS-1$ +// arrowImg.setAttribute(HTML.ATTR_HEIGHT, "15"); //$NON-NLS-1$ +// div3.appendChild(arrowImg); if (showButtonLabels) { - div3.appendChild(visualDocument.createTextNode(btnName)); + div3.appendChild(visualDocument.createTextNode(arrowName + + Constants.WHITE_SPACE + btnName)); + } else { + div3.appendChild(visualDocument.createTextNode(arrowName)); } - a.setAttribute(HTML.ATTR_CLASS, CSS_BUTTON_SELECTION_CLASS); - div3.setAttribute(HTML.ATTR_CLASS, CSS_BUTTON_CONTENT_CLASS); - a.appendChild(div3); - div2.appendChild(a); +// a.setAttribute(HTML.ATTR_CLASS, CSS_BUTTON_SELECTION_CLASS); +// a.appendChild(div3); + div3.setAttribute(HTML.ATTR_CLASS, CSS_BUTTON_SELECTION_CLASS + " " + CSS_BUTTON_CONTENT_CLASS); //$NON-NLS-1$ + div2.appendChild(div3); } return div1; } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPickListTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPickListTemplate.java 2011-11-29 11:38:37 UTC (rev 36720) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPickListTemplate.java 2011-11-29 11:49:59 UTC (rev 36721) @@ -185,6 +185,11 @@ /** value of width attribute of target list. */ private String targetListsWidth; + private static final String REMOVE_ALL_CONTROL = "\u21D0"; //$NON-NLS-1$ + private static final String REMOVE_CONTROL = "\u2190"; //$NON-NLS-1$ + private static final String COPY_CONTROL = "\u2192"; //$NON-NLS-1$ + private static final String COPY_ALL_CONTROL = "\u21D2"; //$NON-NLS-1$ + private enum LabelKey { COPY_ALL_CONTROL("copyAllControl"), //$NON-NLS-1$ COPY_CONTROL("copyControl"), //$NON-NLS-1$ @@ -400,17 +405,18 @@ nsIDOMElement buttonContent = visualDocument.createElement(HTML.TAG_DIV); buttonContent.setAttribute(HTML.ATTR_CLASS, RICH_LIST_PICKLIST_BUTTON_CONTENT_CSS_CLASS); - nsIDOMElement buttonImage = visualDocument.createElement(HTML.TAG_IMG); +// nsIDOMElement buttonImage = visualDocument.createElement(HTML.TAG_IMG); +// buttonImage.setAttribute(HTML.ATTR_WIDTH, WIDTH_15); +// buttonImage.setAttribute(HTML.ATTR_HEIGHT, WIDTH_15); +// ComponentUtil.setImg(buttonImage, buttonImages.get(buttonId)); +// buttonContent.appendChild(buttonImage); - buttonImage.setAttribute(HTML.ATTR_WIDTH, WIDTH_15); - buttonImage.setAttribute(HTML.ATTR_HEIGHT, WIDTH_15); - ComponentUtil.setImg(buttonImage, buttonImages.get(buttonId)); - buttonContent.appendChild(buttonImage); - if (isShowButtonLabels) { - nsIDOMText buttonText = visualDocument.createTextNode(labels.get(buttonId.getValue())); - - buttonContent.appendChild(buttonText); + buttonContent.appendChild(visualDocument.createTextNode( + buttonImages.get(buttonId) + " " + labels.get(buttonId.getValue()))); //$NON-NLS-1$ + } else { + buttonContent.appendChild(visualDocument.createTextNode( + buttonImages.get(buttonId))); } buttonSpace.appendChild(metaButton); @@ -517,11 +523,16 @@ */ private void initButtonImagesMap() { // images of the first set of buttons - buttonImages.put(LabelKey.COPY_ALL_CONTROL, getCssExtension() + "/arrow_copy_all.gif"); //$NON-NLS-1$ - buttonImages.put(LabelKey.COPY_CONTROL, getCssExtension() + "/arrow_copy.gif"); //$NON-NLS-1$ - buttonImages.put(LabelKey.REMOVE_CONTROL, getCssExtension() + "/arrow_remove.gif"); //$NON-NLS-1$ - buttonImages.put(LabelKey.REMOVE_ALL_CONTROL, getCssExtension() + "/arrow_remove_all.gif"); //$NON-NLS-1$ +// buttonImages.put(LabelKey.COPY_ALL_CONTROL, getCssExtension() + "/arrow_copy_all.gif"); //$NON-NLS-1$ +// buttonImages.put(LabelKey.COPY_CONTROL, getCssExtension() + "/arrow_copy.gif"); //$NON-NLS-1$ +// buttonImages.put(LabelKey.REMOVE_CONTROL, getCssExtension() + "/arrow_remove.gif"); //$NON-NLS-1$ +// buttonImages.put(LabelKey.REMOVE_ALL_CONTROL, getCssExtension() + "/arrow_remove_all.gif"); //$NON-NLS-1$ + buttonImages.put(LabelKey.COPY_ALL_CONTROL, COPY_ALL_CONTROL); + buttonImages.put(LabelKey.COPY_CONTROL, COPY_CONTROL); + buttonImages.put(LabelKey.REMOVE_CONTROL, REMOVE_CONTROL); + buttonImages.put(LabelKey.REMOVE_ALL_CONTROL, REMOVE_ALL_CONTROL); + } /** Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml 2011-11-29 11:38:37 UTC (rev 36720) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml 2011-11-29 11:49:59 UTC (rev 36721) @@ -314,7 +314,7 @@ <vpe:tag name="rich:editor" case-sensitive="yes"> <vpe:if test="tld_version('min=3.3')"> <vpe:template children="no" modify="no" - class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesEditorTemplate"> + class="org.jboss.tools.jsf.vpe.richfaces.template.RichFaces4EditorTemplate"> <vpe:resize> <vpe:width width-attr="width" /> <vpe:height height-attr="height" /> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/editor.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/editor.xhtml 2011-11-29 11:38:37 UTC (rev 36720) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/editor.xhtml 2011-11-29 11:49:59 UTC (rev 36721) @@ -8,11 +8,11 @@ <head> </head> <body> -<rich:panel id="editor"> +<rich:panel> <f:facet name="header"> <h:outputText value="Editor" /> </f:facet> - <rich:editor width="264" height="200" + <rich:editor width="264" height="200" id="editor" style="width:500; background-color:red"> </rich:editor> </rich:panel> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/editor.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/editor.xhtml.xml 2011-11-29 11:38:37 UTC (rev 36720) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/editor.xhtml.xml 2011-11-29 11:49:59 UTC (rev 36721) @@ -1,43 +1,40 @@ <tests> <test id="editor"> - <DIV CLASS="dr-pnl rich-panel"> - <DIV CLASS="dr-pnl-h rich-panel-header" - STYLE="/background-image: url$.*resources/common/background.gif$;/"> - <SPAN CLASS="vpe-text"> - Editor - </SPAN> - </DIV> - <DIV CLASS="dr-pnl-b rich-panel-body"> - <SPAN CLASS="richfacesSimpleSkin" STYLE="display: table; background-color: red;"> - <TABLE CELLSPACING="0" CELLPADDING="0" CLASS="mceLayout" - STYLE="width: 264px; height: 200px;"> - <TR STYLE="height: 100%;"> - <TD> - <DIV CLASS="mceIframeContainer" STYLE="height: 100%;"> - <TABLE BORDER="0" STYLE="width: 100%; height: 100%;"> - <TR> - <TD> - </TD> - </TR> - </TABLE> + <SPAN STYLE="width: 264px;" CLASS="cke_skin_richfaces"> + <SPAN CLASS="cke_wrapper"> + <TABLE CLASS="cke_editor"> + <TBODY> + <TR> + <TD CLASS="cke_top"> + <DIV CLASS="cke_toolbox"> + <SPAN CLASS="cke_toolbar"> + <SPAN CLASS="cke_toolgroup"> + <SPAN CLASS="jbds_rf_editor_toolbar_image_internal_css_class"> + </SPAN> + </SPAN> + </SPAN> </DIV> + <SPAN CLASS="cke_toolbox_collapser"> + </SPAN> </TD> </TR> <TR> - <TD CLASS="mceToolbar"> - <TABLE CELLSPACING="0" CELLPADDING="0" CLASS="mceToolbarTable"> - <TR> - <TD> - <DIV CLASS="mce_panel"> - </DIV> - </TD> - </TR> - </TABLE> + <TD STYLE="height: 200px;" CLASS="cke_contents"> + <TEXTAREA CLASS="jbds_rf_editor_content_textarea_internal_css_class"> + </TEXTAREA> </TD> </TR> - </TABLE> - </SPAN> - </DIV> - </DIV> + <TR> + <TD CLASS="cke_bottom"> + <DIV CLASS="cke_resizer"> + </DIV> + <DIV CLASS="cke_path"> + </DIV> + </TD> + </TR> + </TBODY> + </TABLE> + </SPAN> + </SPAN> </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/orderingList.xhtml =================================================================== (Binary files differ) Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/orderingList.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/orderingList.xhtml.xml 2011-11-29 11:38:37 UTC (rev 36720) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/orderingList.xhtml.xml 2011-11-29 11:49:59 UTC (rev 36721) @@ -1,6 +1,5 @@ <tests> <test id="orderingList"> - <TABLE WIDTH="300px" HEIGHT="200px" CLASS="rich-ordering-list-body"> <TBODY> <TR> @@ -52,49 +51,33 @@ <DIV CLASS="dr-buttons-border rich-ordering-control-top"> <DIV CLASS="rich-ordering-list-button" STYLE="/width: 100%; background-image: url$.*resources/orderingList/button_bg.gif$;/"> - <A CLASS="rich-ordering-list-button-selection"> - <DIV CLASS="rich-ordering-list-button-content"> - <IMG WIDTH="15" HEIGHT="15" - SRC="/.*resources/orderingList/top.gif/" /> - First + <DIV CLASS="rich-ordering-list-button-selection rich-ordering-list-button-content"> + ⇑ First </DIV> - </A> </DIV> </DIV> <DIV CLASS="dr-buttons-border rich-ordering-control-up"> <DIV CLASS="rich-ordering-list-button" STYLE="/width: 100%; background-image: url$.*resources/orderingList/button_bg.gif$;/"> - <A CLASS="rich-ordering-list-button-selection"> - <DIV CLASS="rich-ordering-list-button-content"> - <IMG WIDTH="15" HEIGHT="15" - SRC="/.*resources/orderingList/up.gif/" /> - Up + <DIV CLASS="rich-ordering-list-button-selection rich-ordering-list-button-content"> + ↑ Up </DIV> - </A> </DIV> </DIV> <DIV CLASS="dr-buttons-border rich-ordering-control-down"> <DIV CLASS="rich-ordering-list-button" STYLE="/width: 100%; background-image: url$.*resources/orderingList/button_bg.gif$;/"> - <A CLASS="rich-ordering-list-button-selection"> - <DIV CLASS="rich-ordering-list-button-content"> - <IMG WIDTH="15" HEIGHT="15" - SRC="/.*resources/orderingList/down.gif/" /> - Down + <DIV CLASS="rich-ordering-list-button-selection rich-ordering-list-button-content"> + ↓ Down </DIV> - </A> </DIV> </DIV> <DIV CLASS="dr-buttons-border rich-ordering-control-bottom"> <DIV CLASS="rich-ordering-list-button" STYLE="/width: 100%; background-image: url$.*resources/orderingList/button_bg.gif$;/"> - <A CLASS="rich-ordering-list-button-selection"> - <DIV CLASS="rich-ordering-list-button-content"> - <IMG WIDTH="15" HEIGHT="15" - SRC="/.*resources/orderingList/bottom.gif/" /> - Last + <DIV CLASS="rich-ordering-list-button-selection rich-ordering-list-button-content"> + ⇓ Last </DIV> - </A> </DIV> </DIV> </DIV> @@ -103,4 +86,76 @@ </TBODY> </TABLE> </test> + + <test id="orderingList1"> + <TABLE WIDTH="300px" HEIGHT="200px" CLASS="rich-ordering-list-body"> + <TBODY> + <TR> + <TD CLASS="rich-ordering-list-caption"> + <DIV> + </DIV> + </TD> + </TR> + <TR> + <TD> + <DIV STYLE="overflow: scroll;" + CLASS="rich-ordering-list-output rich-ordering-list-content"> + <TABLE CELLSPACING="1" CLASS="rich-ordering-list-items " + ID="orderingList1" LISTHEIGHT="300" LISTWIDTH="350" STYLE="width: 100%;"> + <THEAD> + <TR + CLASS="rich-ordering-list-header rich-ordering-list-table-header "> + <TD BACKGROUND="/.*resources/orderingList/table_header_cell_bg.gif/" + CLASS="rich-ordering-list-table-header-cell "> + <SPAN CLASS="vpe-text"> + Song Name +</SPAN> + </TD> + <TD BACKGROUND="/.*resources/orderingList/table_header_cell_bg.gif/" + CLASS="rich-ordering-list-table-header-cell "> + <SPAN CLASS="vpe-text"> + Artist Name +</SPAN> + </TD> + </TR> + </THEAD> + <TR CLASS="rich-ordering-list-row"> + <TD WIDTH="180" CLASS="dr-table-cell rich-table-cell"> + <SPAN CLASS="vpe-text"> + You must be evil +</SPAN> + </TD> + <TD CLASS="dr-table-cell rich-table-cell"> + <SPAN CLASS="vpe-text"> + Chris Rea +</SPAN> + </TD> + </TR> + </TABLE> + </DIV> + </TD> + <TD ALIGN="center" CLASS="rich-ordering-list-button-valign"> + <DIV CLASS="rich-ordering-controls rich-ordering-list-button-layout"> + <DIV CLASS="dr-buttons-border rich-ordering-control-up"> + <DIV CLASS="rich-ordering-list-button" + STYLE="/width: 100%; background-image: url$.*resources/orderingList/button_bg.gif$;/"> + <DIV CLASS="rich-ordering-list-button-selection rich-ordering-list-button-content"> + ↑ Up + </DIV> + </DIV> + </DIV> + <DIV CLASS="dr-buttons-border rich-ordering-control-down"> + <DIV CLASS="rich-ordering-list-button" + STYLE="/width: 100%; background-image: url$.*resources/orderingList/button_bg.gif$;/"> + <DIV CLASS="rich-ordering-list-button-selection rich-ordering-list-button-content"> + ↓ Down + </DIV> + </DIV> + </DIV> + </DIV> + </TD> + </TR> + </TBODY> + </TABLE> + </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/pickList.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/pickList.xhtml.xml 2011-11-29 11:38:37 UTC (rev 36720) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/pickList.xhtml.xml 2011-11-29 11:49:59 UTC (rev 36721) @@ -36,39 +36,28 @@ <DIV CLASS="rich-picklist-control-button-class"> <DIV STYLE="/.*/resources/pickList/button.gif/" CLASS="rich-list-picklist-button"> <DIV CLASS="rich-list-picklist-button-content"> - <IMG WIDTH="15" HEIGHT="15" SRC="/.*/pickList/arrow_copy_all.gif/" /> - - Copy all + ⇒ Copy all </DIV> </DIV> </DIV> <DIV CLASS="rich-picklist-control-button-class"> <DIV STYLE="/.*/resources/pickList/button.gif/" CLASS="rich-list-picklist-button"> <DIV CLASS="rich-list-picklist-button-content"> - <IMG WIDTH="15" HEIGHT="15" - SRC="/.*/resources/pickList/arrow_copy.gif/" /> - - Copy + → Copy </DIV> </DIV> </DIV> <DIV CLASS="rich-picklist-control-button-class"> <DIV STYLE="/.*/resources/pickList/button.gif/" CLASS="rich-list-picklist-button"> <DIV CLASS="rich-list-picklist-button-content"> - <IMG WIDTH="15" HEIGHT="15" - SRC="/.*/resources/pickList/arrow_remove.gif/" /> - - Remove + ← Remove </DIV> </DIV> </DIV> <DIV CLASS="rich-picklist-control-button-class"> <DIV STYLE="/.*/resources/pickList/button.gif/" CLASS="rich-list-picklist-button"> <DIV CLASS="rich-list-picklist-button-content"> - <IMG WIDTH="15" HEIGHT="15" - SRC="/.*/resources/pickList/arrow_remove_all.gif/" /> - - Remove All + ⇐ Remove All </DIV> </DIV> </DIV> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllImportantTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllImportantTests.java 2011-11-29 11:38:37 UTC (rev 36720) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllImportantTests.java 2011-11-29 11:49:59 UTC (rev 36721) @@ -1,6 +1,5 @@ package org.jboss.tools.jsf.vpe.richfaces.test; -import org.jboss.tools.jsf.vpe.richfaces.test.jbide.JBIDE1579Test; import org.jboss.tools.jsf.vpe.richfaces.test.jbide.JBIDE1606Test; import org.jboss.tools.jsf.vpe.richfaces.test.jbide.JBIDE1613Test; import org.jboss.tools.jsf.vpe.richfaces.test.jbide.JBIDE1713Test; @@ -25,7 +24,6 @@ TestSuite suite = new TestSuite( RichFacesAllImportantTests.class.getName()); //$JUnit-BEGIN$ - suite.addTestSuite(JBIDE1579Test.class); suite.addTestSuite(Jbide1580Test.class); suite.addTestSuite(JBIDE1613Test.class); suite.addTestSuite(Jbide1614Test.class); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesPickListTemplateTestCase.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesPickListTemplateTestCase.java 2011-11-29 11:38:37 UTC (rev 36720) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesPickListTemplateTestCase.java 2011-11-29 11:49:59 UTC (rev 36721) @@ -80,10 +80,7 @@ elements.clear(); TestUtil.findAllElementsByName(element, elements, HTML.TAG_DIV); assertEquals("Count of divs should be 15", 15, elements.size()); //$NON-NLS-1$ - elements.clear(); - TestUtil.findAllElementsByName(element, elements, HTML.TAG_IMG); - assertEquals("Count of img should be 4", 4, elements.size()); //$NON-NLS-1$ } } Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1579Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1579Test.java 2011-11-29 11:38:37 UTC (rev 36720) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1579Test.java 2011-11-29 11:49:59 UTC (rev 36721) @@ -1,93 +0,0 @@ -package org.jboss.tools.jsf.vpe.richfaces.test.jbide; - -import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.resources.IFile; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.part.FileEditorInput; -import org.jboss.tools.jsf.vpe.richfaces.test.RichFacesAllTests; -import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; -import org.jboss.tools.vpe.base.test.TestUtil; -import org.jboss.tools.vpe.base.test.VpeTest; -import org.jboss.tools.vpe.editor.VpeController; -import org.jboss.tools.vpe.editor.util.HTML; -import org.mozilla.interfaces.nsIDOMElement; -import org.mozilla.interfaces.nsIDOMNode; - -public class JBIDE1579Test extends VpeTest { - - private static final String TEST_PAGE_NAME_2BUTTONS = "JBIDE/1579/JBIDE-1579-2buttons.xhtml"; - private static final String TEST_PAGE_NAME_4BUTTONS = "JBIDE/1579/JBIDE-1579-4buttons.xhtml"; - private static final String TEST_ELEMENT_ID = "testElement"; - - public JBIDE1579Test(String name) { - super(name); - } - - public void testJBIDE_1579_2buttons() throws Throwable{ - // get test page path - IFile file = (IFile) TestUtil.getComponentPath( - TEST_PAGE_NAME_2BUTTONS, RichFacesAllTests.IMPORT_PROJECT_NAME); - - assertNotNull("Could not open specified file. componentPage = " + TEST_PAGE_NAME_2BUTTONS//$NON-NLS-1$ - + ";projectName = " + RichFacesAllTests.IMPORT_PROJECT_NAME, file);//$NON-NLS-1$ - - IEditorInput input = new FileEditorInput(file); - - assertNotNull("Editor input is null", input); - // open and get editor - JSPMultiPageEditor part = openEditor(input); - VpeController controller = TestUtil.getVpeController(part); - - nsIDOMElement element = findElementById(controller, TEST_ELEMENT_ID); - - //check that element is not null - assertNotNull(element); - - // get root node - nsIDOMNode node = queryInterface(element, nsIDOMNode.class); - - List<nsIDOMNode> elements = new ArrayList<nsIDOMNode>(); - - // find "img" elements - TestUtil.findElementsByName(node, elements, HTML.TAG_IMG); - assertEquals(2, elements.size()); - - } - - public void testJBIDE_1579_4buttons() throws Throwable{ - - // get test page path - IFile file = (IFile) TestUtil.getComponentPath( - TEST_PAGE_NAME_4BUTTONS, RichFacesAllTests.IMPORT_PROJECT_NAME); - - assertNotNull("Could not open specified file. componentPage = " + TEST_PAGE_NAME_4BUTTONS//$NON-NLS-1$ - + ";projectName = " + RichFacesAllTests.IMPORT_PROJECT_NAME, file);//$NON-NLS-1$ - - IEditorInput input = new FileEditorInput(file); - - assertNotNull("Editor input is null", input); - // open and get editor - JSPMultiPageEditor part = openEditor(input); - VpeController controller = TestUtil.getVpeController(part); - - nsIDOMElement element = findElementById(controller, TEST_ELEMENT_ID); - - //check that element is not null - assertNotNull(element); - - // get root node - nsIDOMNode node = queryInterface(element, nsIDOMNode.class); - - List<nsIDOMNode> elements = new ArrayList<nsIDOMNode>(); - - // find "img" elements - TestUtil.findElementsByName(node, elements, HTML.TAG_IMG); - assertEquals(4, elements.size()); - - } - -}

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r36720 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task: wait and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: ljelinko Date: 2011-11-29 06:38:37 -0500 (Tue, 29 Nov 2011) New Revision: 36720 Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/TaskDuration.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/WaitUntilTask.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/WaitWhileTask.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/condition/ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/condition/NonSystemJobRunsCondition.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/condition/ShellIsActiveCondition.java Removed: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/progress/ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/AllJobsFinishedWaitingTask.java Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/WizardFillingTask.java Log: changed the way swtbot waits for wizard to complete Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/AllJobsFinishedWaitingTask.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/progress/AllJobsFinishedWaitingTask.java 2011-11-28 16:20:04 UTC (rev 36703) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/AllJobsFinishedWaitingTask.java 2011-11-29 11:38:37 UTC (rev 36720) @@ -1,57 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.task.progress; - -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.swtbot.swt.finder.SWTBot; -import org.eclipse.swtbot.swt.finder.waits.ICondition; -import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask; - -/** - * Waits until there is no job running. - * - * @author Lucia Jelinkova - * - */ -public class AllJobsFinishedWaitingTask extends AbstractSWTTask { - - public enum JobDuration { - SHORT(1 * 1000), NORMAL(10 * 1000), LONG(1 * 60 * 1000), VERY_LONG(10 * 60 * 1000); - - private long timeout; - - private JobDuration(long timeout) { - this.timeout = timeout; - } - - public long getTimeout() { - return timeout; - } - } - - private JobDuration jobDuration; - - public AllJobsFinishedWaitingTask(JobDuration timeout) { - super(); - this.jobDuration = timeout; - } - - @Override - public void perform() { - getBot().waitUntil(new ICondition() { - - @Override - public boolean test() throws Exception { - return Job.getJobManager().isIdle(); - } - - @Override - public void init(SWTBot bot) { - - } - - @Override - public String getFailureMessage() { - return null; - } - }, jobDuration.getTimeout()); - } -} Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/TaskDuration.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/TaskDuration.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/TaskDuration.java 2011-11-29 11:38:37 UTC (rev 36720) @@ -0,0 +1,15 @@ +package org.jboss.tools.portlet.ui.bot.task.wait; + +public enum TaskDuration { + SHORT(1 * 1000), NORMAL(10 * 1000), LONG(1 * 60 * 1000), VERY_LONG(10 * 60 * 1000); + + private long timeout; + + private TaskDuration(long timeout) { + this.timeout = timeout; + } + + public long getTimeout() { + return timeout; + } +} \ No newline at end of file Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/WaitUntilTask.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/WaitUntilTask.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/WaitUntilTask.java 2011-11-29 11:38:37 UTC (rev 36720) @@ -0,0 +1,27 @@ +package org.jboss.tools.portlet.ui.bot.task.wait; + +import org.eclipse.swtbot.swt.finder.waits.ICondition; +import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask; + +/** + * Waits for the specified condition with the specified timeout. + * + * @author Lucia Jelinkova + * + */ +public class WaitUntilTask extends AbstractSWTTask { + + private TaskDuration taskDuration; + + private ICondition condition; + + public WaitUntilTask(ICondition condition, TaskDuration taskDuration) { + this.condition = condition; + this.taskDuration = taskDuration; + } + + @Override + public void perform() { + getBot().waitUntil(condition, taskDuration.getTimeout()); + } +} Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/WaitWhileTask.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/WaitWhileTask.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/WaitWhileTask.java 2011-11-29 11:38:37 UTC (rev 36720) @@ -0,0 +1,27 @@ +package org.jboss.tools.portlet.ui.bot.task.wait; + +import org.eclipse.swtbot.swt.finder.waits.ICondition; +import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask; + +/** + * Waits while the specified condition is valid with the specified timeout. + * + * @author Lucia Jelinkova + * + */ +public class WaitWhileTask extends AbstractSWTTask { + + private TaskDuration taskDuration; + + private ICondition condition; + + public WaitWhileTask(ICondition condition, TaskDuration taskDuration) { + this.condition = condition; + this.taskDuration = taskDuration; + } + + @Override + public void perform() { + getBot().waitWhile(condition, taskDuration.getTimeout()); + } +} Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/condition/NonSystemJobRunsCondition.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/condition/NonSystemJobRunsCondition.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/condition/NonSystemJobRunsCondition.java 2011-11-29 11:38:37 UTC (rev 36720) @@ -0,0 +1,46 @@ +package org.jboss.tools.portlet.ui.bot.task.wait.condition; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.waits.ICondition; + +/** + * Returns true, if there is a non system job running, false + * otherwise. + * + * @author Lucia Jelinkova + * + */ +public class NonSystemJobRunsCondition implements ICondition { + + @Override + public boolean test() throws Exception { + return getJobs().size() != 0; + } + + @Override + public void init(SWTBot bot) { + } + + @Override + public String getFailureMessage() { + StringBuilder msg = new StringBuilder("Expected no running jobs, found the following jobs: \n"); + for (Job job : getJobs()){ + msg.append(job.getName() + "\n"); + } + return msg.toString(); + } + + private List<Job> getJobs(){ + List<Job> jobs = new ArrayList<Job>(); + for (Job job : Job.getJobManager().find(null)){ + if (!job.isSystem()){ + jobs.add(job); + } + } + return jobs; + } +} Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/condition/ShellIsActiveCondition.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/condition/ShellIsActiveCondition.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/condition/ShellIsActiveCondition.java 2011-11-29 11:38:37 UTC (rev 36720) @@ -0,0 +1,35 @@ +package org.jboss.tools.portlet.ui.bot.task.wait.condition; + +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.waits.ICondition; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; + +/** + * Returns true while the specified shell is active. + * + * @author Lucia Jelinkova + * + */ +public class ShellIsActiveCondition implements ICondition { + + private SWTBotShell shell; + + public ShellIsActiveCondition(SWTBotShell shell) { + super(); + this.shell = shell; + } + + @Override + public void init(SWTBot bot) { + } + + @Override + public boolean test() throws Exception { + return shell.isActive(); + } + + @Override + public String getFailureMessage() { + return "Expected the shell to become non active: " + shell; + } +} Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/WizardFillingTask.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/WizardFillingTask.java 2011-11-29 10:30:25 UTC (rev 36719) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/WizardFillingTask.java 2011-11-29 11:38:37 UTC (rev 36720) @@ -3,8 +3,12 @@ import java.util.ArrayList; import java.util.List; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.jboss.tools.portlet.ui.bot.task.CompositeSWTTask; -import org.jboss.tools.portlet.ui.bot.task.progress.AllJobsFinishedWaitingTask; +import org.jboss.tools.portlet.ui.bot.task.wait.TaskDuration; +import org.jboss.tools.portlet.ui.bot.task.wait.WaitWhileTask; +import org.jboss.tools.portlet.ui.bot.task.wait.condition.NonSystemJobRunsCondition; +import org.jboss.tools.portlet.ui.bot.task.wait.condition.ShellIsActiveCondition; /** * @@ -17,37 +21,50 @@ public class WizardFillingTask extends CompositeSWTTask<WizardPageFillingTask>{ private List<WizardPageFillingTask> wizardPages; - + public WizardFillingTask() { super(); wizardPages = new ArrayList<WizardPageFillingTask>(); } - + @Override public void perform() { + SWTBotShell activeShell = getActiveShell(); + super.setTasks(wizardPages); super.perform(); + getBot().button("Finish").click(); - - performInnerTask(new AllJobsFinishedWaitingTask(AllJobsFinishedWaitingTask.JobDuration.LONG)); + performInnerTask(new WaitWhileTask(new ShellIsActiveCondition(activeShell), TaskDuration.LONG)); + performInnerTask(new WaitWhileTask(new NonSystemJobRunsCondition(), TaskDuration.LONG)); } - + public void addWizardPage(WizardPageFillingTask task){ wizardPages.add(task); } - + public void addAllWizardPages(List<WizardPageFillingTask> tasks){ wizardPages.addAll(tasks); } - + @Override protected void beforeTask(WizardPageFillingTask task) { if (!isFirst(task)){ getBot().button("Next >").click(); } } - + private boolean isFirst(WizardPageFillingTask task){ return getTasks().indexOf(task) == 0; } + + private SWTBotShell getActiveShell(){ + for (SWTBotShell shell : getBot().shells()){ + if (shell.isActive()){ + return shell; + } + } + + throw new IllegalStateException("No active shell found"); + } }

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r36719 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management.

by jbosstools-commits＠lists.jboss.org

Author: max.andersen(a)jboss.com Date: 2011-11-29 05:30:25 -0500 (Tue, 29 Nov 2011) New Revision: 36719 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java Log: added comment to explain hack for AS7-2772 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java 2011-11-29 10:12:47 UTC (rev 36718) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java 2011-11-29 10:30:25 UTC (rev 36719) @@ -32,7 +32,11 @@ } private static boolean initialized = false; - /* HUUUUUUUUGE HACK */ + /* HUUUUUUUUGE HACK + * + * Workaround for https://issues.jboss.org/browse/AS7-2772 + * Issue is that AS7.1beta1 client jars changes the security protocol thus we need to ensure it gets registered first. + * */ private synchronized static void skipLazyInit() { if( !initialized ) {

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r36718 - trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard.

by jbosstools-commits＠lists.jboss.org

Author: fbricon Date: 2011-11-29 05:12:47 -0500 (Tue, 29 Nov 2011) New Revision: 36718 Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/MavenArtifactHelper.java Log: fixed typo Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/MavenArtifactHelper.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/MavenArtifactHelper.java 2011-11-29 10:11:23 UTC (rev 36717) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/MavenArtifactHelper.java 2011-11-29 10:12:47 UTC (rev 36718) @@ -30,12 +30,12 @@ */ public static boolean isEnterpriseRepositoryAvailable() { String keyString = "org.jboss.spec:jboss-javaee-web-6.0:3.0.0.Beta1-redhat-1::"; //$NON-NLS-1$ - boolean isRepoAvailable = isArtifactAvailable(keyString, "pom"); + boolean isRepoAvailable = isArtifactAvailable(keyString, "pom"); //$NON-NLS-1$ return isRepoAvailable; } /** - * Checks is an artifact can be resolved + * Checks if an artifact can be resolved * @param artifactKey * @return true is the artifactKey can be resolved to an artifact. */

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r36717 - trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard.

by jbosstools-commits＠lists.jboss.org

Author: fbricon Date: 2011-11-29 05:11:23 -0500 (Tue, 29 Nov 2011) New Revision: 36717 Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/MavenArtifactHelper.java Log: Use a real dependency reference to identify missing EAP repo Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/MavenArtifactHelper.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/MavenArtifactHelper.java 2011-11-29 06:32:04 UTC (rev 36716) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/MavenArtifactHelper.java 2011-11-29 10:11:23 UTC (rev 36717) @@ -29,7 +29,7 @@ * @return true if org.jboss.spec:jboss-javaee-web-6.0:3.0.0.Beta1-redhat-1 can be resolved */ public static boolean isEnterpriseRepositoryAvailable() { - String keyString = "org.jboss.spec:jboss-javaee-web-6.0:4.0.0.Beta1-redhat-1::"; //$NON-NLS-1$ + String keyString = "org.jboss.spec:jboss-javaee-web-6.0:3.0.0.Beta1-redhat-1::"; //$NON-NLS-1$ boolean isRepoAvailable = isArtifactAvailable(keyString, "pom"); return isRepoAvailable; }

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r36716 - in trunk/openshift/docs/reference/en-US: images and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2011-11-29 01:32:04 -0500 (Tue, 29 Nov 2011) New Revision: 36716 Added: trunk/openshift/docs/reference/en-US/Author_Group.xml trunk/openshift/docs/reference/en-US/Book_Info.xml trunk/openshift/docs/reference/en-US/Feedback.xml trunk/openshift/docs/reference/en-US/Introduction.xml trunk/openshift/docs/reference/en-US/OpenShift_Tools_Reference_Guide.ent trunk/openshift/docs/reference/en-US/OpenShift_Tools_Reference_Guide.xml trunk/openshift/docs/reference/en-US/Preface.xml trunk/openshift/docs/reference/en-US/Revision_History.xml trunk/openshift/docs/reference/en-US/images/ trunk/openshift/docs/reference/en-US/images/icon.svg trunk/openshift/docs/reference/en-US/master.xml Log: adding in the beginning of an Openshift tools reference guide Added: trunk/openshift/docs/reference/en-US/Author_Group.xml =================================================================== --- trunk/openshift/docs/reference/en-US/Author_Group.xml (rev 0) +++ trunk/openshift/docs/reference/en-US/Author_Group.xml 2011-11-29 06:32:04 UTC (rev 36716) @@ -0,0 +1,11 @@ +<?xml version='1.0' encoding='utf-8' ?> +<!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +]> +<authorgroup> + <author> + <firstname>Isaac</firstname> + <surname>Rooskov</surname> + <email>irooskov(a)redhat.com</email> + </author> +</authorgroup> + Added: trunk/openshift/docs/reference/en-US/Book_Info.xml =================================================================== --- trunk/openshift/docs/reference/en-US/Book_Info.xml (rev 0) +++ trunk/openshift/docs/reference/en-US/Book_Info.xml 2011-11-29 06:32:04 UTC (rev 36716) @@ -0,0 +1,35 @@ +<?xml version='1.0' encoding='utf-8' ?> +<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +]> +<bookinfo id="book-OpenShift_Tools_Reference_Guide-OpenShift_Tools_Reference_Guide"> + <title>OpenShift Tools Reference Guide</title> + <subtitle> + Provides information about the use of the <application>JBoss Developer Studio</application> from a beginners level. + </subtitle> + + <productname>JBoss Developer Studio</productname> + + <productnumber>5.0</productnumber> + + <edition>5.0.0</edition> + + <pubsnumber>1</pubsnumber> + + <abstract> + <para> + The Beginners Guide brings all concepts pertaining to the <application>JBoss Developer Studio</application>   back to basics. It is intended for individuals who may be new to application servers and the creation of applications for deployment. + </para> + </abstract> + + <corpauthor> + <inlinemediaobject> + <imageobject> + <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG" /> + </imageobject> + </inlinemediaobject> + </corpauthor> + + <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + + <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> +</bookinfo> Added: trunk/openshift/docs/reference/en-US/Feedback.xml =================================================================== --- trunk/openshift/docs/reference/en-US/Feedback.xml (rev 0) +++ trunk/openshift/docs/reference/en-US/Feedback.xml 2011-11-29 06:32:04 UTC (rev 36716) @@ -0,0 +1,92 @@ +<?xml version='1.0' encoding='utf-8' ?> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +<!ENTITY % BOOK_ENTITIES SYSTEM "../Document_Conventions.ent"> +%BOOK_ENTITIES; +]> +<appendix id="sect_JBoss-Getting_Help_and_Giving_Feedback" lang="en-US"> + <title>Getting Help and Giving Feedback</title> + <section id="sect_JBoss-Do_You_Need_Help"> + <title>Do You Need Help?</title> + <indexterm> + <primary>help</primary> + <secondary>getting help</secondary> + + </indexterm> + <para> + If you experience difficulty with a procedure described in this documentation, visit the Red Hat Customer Portal at <ulink url="http://access.redhat.com" />. Through the customer portal, you can: + </para> + <itemizedlist> + <listitem> + <para> + search or browse through a knowledgebase of technical support articles about Red Hat products. + </para> + + </listitem> + <listitem> + <para> + submit a support case to Red Hat Global Support Services (GSS). + </para> + + </listitem> + <listitem> + <para> + access other product documentation. + </para> + + </listitem> + + </itemizedlist> + <para> + Red Hat also hosts a large number of electronic mailing lists for discussion of Red Hat software and technology. You can find a list of publicly available mailing lists at <ulink url="https://www.redhat.com/mailman/listinfo" />. Click on the name of any mailing list to subscribe to that list or to access the list archives. + </para> + + </section> + + <section id="jboss-feedback"> + <title>Give us Feedback</title> +  <indexterm> + <primary>feedback</primary> + <secondary>contact information for this manual</secondary> + + </indexterm> + <para> + If you find a typographical error, or know how this guide can be improved, we would love to hear from you. Submit a report in Bugzilla against the product <literal>&BZPRODUCT;</literal> and the component <literal>&BZCOMPONENT;</literal>. The following link will take you to a pre-filled bug report for this product: &BZURL;. + </para> + <para> + Fill out the following template in Bugzilla's <literal>Description</literal> field. Be as specific as possible when describing the issue; this will help ensure that we can fix it quickly. + </para> + +<screen>Document URL: + + +Section Number and Name: + + +Describe the issue: + + +Suggestions for improvement: + + +Additional information: + + +</screen> + <para> + Be sure to give us your name so that you can receive full credit for reporting the issue. + </para> + + </section> + + +</appendix> + + Added: trunk/openshift/docs/reference/en-US/Introduction.xml =================================================================== --- trunk/openshift/docs/reference/en-US/Introduction.xml (rev 0) +++ trunk/openshift/docs/reference/en-US/Introduction.xml 2011-11-29 06:32:04 UTC (rev 36716) @@ -0,0 +1,9 @@ +<?xml version='1.0' encoding='utf-8' ?> + +<chapter id="chap-Beginners_Guide-Introduction"> + <title>Introduction</title> + <para> + OpenShift is a cloud solution for your application server requirements. OpenShift Express in particular is a free, cloud-based application platform for Java, Perl, PHP, Python, and Ruby applications. JBoss Developer Studio supports OpenShift Express and this guide will show you how to connect, create and deploy with OpenShift Express from your JBoss Developer Studio workbench. + </para> +</chapter> + Added: trunk/openshift/docs/reference/en-US/OpenShift_Tools_Reference_Guide.ent =================================================================== --- trunk/openshift/docs/reference/en-US/OpenShift_Tools_Reference_Guide.ent (rev 0) +++ trunk/openshift/docs/reference/en-US/OpenShift_Tools_Reference_Guide.ent 2011-11-29 06:32:04 UTC (rev 36716) @@ -0,0 +1,7 @@ +<!ENTITY PRODUCT "JBoss"> +<!ENTITY BOOKID "OpenShift_Tools_Reference_Guide"> +<!ENTITY YEAR "2011"> +<!ENTITY HOLDER "Red Hat"> +<!ENTITY BZPRODUCT "JBoss Developer Studio"> +<!ENTITY BZCOMPONENT "OpenShift Tools Reference Guide"> +<!ENTITY BZURL "<ulink url='https://bugzilla.redhat.com/enter_bug.cgi?product=JBoss&percnt;20Develope...'>http://bugzilla.redhat.com/</ulink>"> Added: trunk/openshift/docs/reference/en-US/OpenShift_Tools_Reference_Guide.xml =================================================================== --- trunk/openshift/docs/reference/en-US/OpenShift_Tools_Reference_Guide.xml (rev 0) +++ trunk/openshift/docs/reference/en-US/OpenShift_Tools_Reference_Guide.xml 2011-11-29 06:32:04 UTC (rev 36716) @@ -0,0 +1,11 @@ +<?xml version='1.0' encoding='utf-8' ?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +]> +<book> + <xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + <xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + <xi:include href="Introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + <xi:include href="Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> +</book> + Added: trunk/openshift/docs/reference/en-US/Preface.xml =================================================================== --- trunk/openshift/docs/reference/en-US/Preface.xml (rev 0) +++ trunk/openshift/docs/reference/en-US/Preface.xml 2011-11-29 06:32:04 UTC (rev 36716) @@ -0,0 +1,12 @@ +<?xml version='1.0' encoding='utf-8' ?> + +<preface id="pref-Cloud_Tools_Reference_Guide-Preface"> + <title>Preface</title> + <para> + This manual uses several conventions to highlight certain words and phrases and draw attention to specific pieces of information. To get more information on these conventions please refer to the <guilabel>Document Conventions</guilabel> manual, which can be found on the <ulink url="http://docs.redhat.com/docs/en-US/JBoss_Developer_Studio/index.html">Red Hat Documentation</ulink> website under the <guilabel>JBoss Developer Studio</guilabel> section. + </para> +</preface> + Added: trunk/openshift/docs/reference/en-US/Revision_History.xml =================================================================== --- trunk/openshift/docs/reference/en-US/Revision_History.xml (rev 0) +++ trunk/openshift/docs/reference/en-US/Revision_History.xml 2011-11-29 06:32:04 UTC (rev 36716) @@ -0,0 +1,24 @@ +<?xml version='1.0' encoding='utf-8' ?> + +<appendix id="appe-Beginners_Guide-Revision_History"> + <title>Revision History</title> + <simpara> + <revhistory> + <revision> + <revnumber>1-0</revnumber> + <date>Tue Nov 29 2011</date> + <author> + <firstname>Isaac</firstname> + <surname>Rooskov</surname> + <email>irooskov(a)redhat.com</email> + </author> + <revdescription> + <simplelist> + <member>Initial creation of book</member> + </simplelist> + </revdescription> + </revision> + </revhistory> + </simpara> +</appendix> + Added: trunk/openshift/docs/reference/en-US/images/icon.svg =================================================================== --- trunk/openshift/docs/reference/en-US/images/icon.svg (rev 0) +++ trunk/openshift/docs/reference/en-US/images/icon.svg 2011-11-29 06:32:04 UTC (rev 36716) @@ -0,0 +1,3936 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + +<svg + xmlns:ns="http://ns.adobe.com/AdobeSVGViewerExtensions/3/" + xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://web.resource.org/cc/" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.0" + width="32" + height="32" + id="svg3017" + sodipodi:version="0.32" + inkscape:version="0.44+devel" + sodipodi:docname="book.svg" + sodipodi:docbase="/home/andy/Desktop"> + <metadata + id="metadata489"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + inkscape:window-height="480" + inkscape:window-width="858" + inkscape:pageshadow="0" + inkscape:pageopacity="0.0" + guidetolerance="10.0" + gridtolerance="10.0" + objecttolerance="10.0" + borderopacity="1.0" + bordercolor="#666666" + pagecolor="#ffffff" + id="base" + inkscape:zoom="1" + inkscape:cx="16" + inkscape:cy="15.944056" + inkscape:window-x="0" + inkscape:window-y="33" + inkscape:current-layer="svg3017" /> + <defs + id="defs3019"> + <linearGradient + id="linearGradient2381"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="stop2383" /> + <stop + style="stop-color:white;stop-opacity:0" + offset="1" + id="stop2385" /> + </linearGradient> + <linearGradient + x1="415.73831" + y1="11.854" + x2="418.13361" + y2="18.8104" + id="XMLID_1758_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.8362,0.5206,-1.1904,0.992,147.62,-30.9374)"> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="0" + id="stop3903" /> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="1" + id="stop3905" /> + <a:midPointStop + style="stop-color:#CCCCCC" + offset="0" /> + <a:midPointStop + style="stop-color:#CCCCCC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#F2F2F2" + offset="1" /> + </linearGradient> + <linearGradient + x1="500.70749" + y1="-13.2441" + x2="513.46442" + y2="-2.1547" + id="XMLID_1757_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)"> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0" + id="stop3890" /> + <stop + style="stop-color:#96bad6;stop-opacity:1" + offset="1" + id="stop3892" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#96BAD6" + offset="1" /> + </linearGradient> + <clipPath + id="XMLID_1755_"> + <use + id="use3874" + x="0" + y="0" + width="744.09448" + height="600" + xlink:href="#XMLID_343_" /> + </clipPath> + <linearGradient + x1="505.62939" + y1="-14.9526" + x2="527.49402" + y2="-0.7536" + id="XMLID_1756_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)"> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0" + id="stop3877" /> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0.51120001" + id="stop3879" /> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0.64609998" + id="stop3881" /> + <stop + style="stop-color:#16336e;stop-opacity:1" + offset="1" + id="stop3883" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5112" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.6461" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#16336E" + offset="1" /> + </linearGradient> + <linearGradient + x1="471.0806" + y1="201.07761" + x2="481.91711" + y2="210.4977" + id="XMLID_1754_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#6498c1;stop-opacity:1" + offset="0.005618" + id="stop3863" /> + <stop + style="stop-color:#79a9cc;stop-opacity:1" + offset="0.2332" + id="stop3865" /> + <stop + style="stop-color:#a4cde2;stop-opacity:1" + offset="0.74049997" + id="stop3867" /> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="1" + id="stop3869" /> + <a:midPointStop + style="stop-color:#6498C1" + offset="5.618000e-003" /> + <a:midPointStop + style="stop-color:#6498C1" + offset="0.4438" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="1" /> + </linearGradient> + <linearGradient + x1="516.57672" + y1="-15.769" + x2="516.57672" + y2="0.84280002" + id="XMLID_1753_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)"> + <stop + style="stop-color:#b2b2b2;stop-opacity:1" + offset="0" + id="stop3851" /> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="1" + id="stop3853" /> + <a:midPointStop + style="stop-color:#B2B2B2" + offset="0" /> + <a:midPointStop + style="stop-color:#B2B2B2" + offset="0.5" /> + <a:midPointStop + style="stop-color:#F2F2F2" + offset="1" /> + </linearGradient> + <clipPath + id="XMLID_1751_"> + <use + id="use3837" + x="0" + y="0" + width="744.09448" + height="600" + xlink:href="#XMLID_338_" /> + </clipPath> + <linearGradient + x1="506.09909" + y1="-11.5137" + x2="527.99609" + y2="2.7063999" + id="XMLID_1752_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)"> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0" + id="stop3840" /> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0.51120001" + id="stop3842" /> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0.64609998" + id="stop3844" /> + <stop + style="stop-color:#16336e;stop-opacity:1" + offset="1" + id="stop3846" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5112" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.6461" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#16336E" + offset="1" /> + </linearGradient> + <linearGradient + x1="468.2915" + y1="204.7612" + x2="479.39871" + y2="214.4166" + id="XMLID_1750_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0" + id="stop3830" /> + <stop + style="stop-color:#96bad6;stop-opacity:1" + offset="1" + id="stop3832" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#96BAD6" + offset="1" /> + </linearGradient> + <linearGradient + x1="502.70749" + y1="115.3013" + x2="516.39001" + y2="127.1953" + id="XMLID_1749_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9703,0.2419,-0.2419,0.9703,11.0227,-35.6159)"> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0" + id="stop3818" /> + <stop + style="stop-color:#96bad6;stop-opacity:1" + offset="1" + id="stop3820" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#96BAD6" + offset="1" /> + </linearGradient> + <linearGradient + x1="501.0903" + y1="-19.2544" + x2="531.85413" + y2="0.72390002" + id="XMLID_1748_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)"> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0" + id="stop3803" /> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0.51120001" + id="stop3805" /> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0.64609998" + id="stop3807" /> + <stop + style="stop-color:#16336e;stop-opacity:1" + offset="1" + id="stop3809" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5112" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.6461" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#16336E" + offset="1" /> + </linearGradient> + <linearGradient + x1="481.23969" + y1="212.5742" + x2="472.92981" + y2="207.4967" + id="XMLID_2275_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#f3403f;stop-opacity:1" + offset="0" + id="stop9947" /> + <stop + style="stop-color:#d02a28;stop-opacity:1" + offset="0.37889999" + id="stop9949" /> + <stop + style="stop-color:#b21714;stop-opacity:1" + offset="0.77649999" + id="stop9951" /> + <stop + style="stop-color:#a6100c;stop-opacity:1" + offset="1" + id="stop9953" /> + <a:midPointStop + style="stop-color:#F3403F" + offset="0" /> + <a:midPointStop + style="stop-color:#F3403F" + offset="0.4213" /> + <a:midPointStop + style="stop-color:#A6100C" + offset="1" /> + </linearGradient> + <clipPath + id="XMLID_2273_"> + <use + id="use9933" + x="0" + y="0" + width="744.09448" + height="600" + xlink:href="#XMLID_960_" /> + </clipPath> + <linearGradient + x1="473.7681" + y1="209.17529" + x2="486.98099" + y2="213.2001" + id="XMLID_2274_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#f3403f;stop-opacity:1" + offset="0" + id="stop9936" /> + <stop + style="stop-color:#d02a28;stop-opacity:1" + offset="0.37889999" + id="stop9938" /> + <stop + style="stop-color:#b21714;stop-opacity:1" + offset="0.77649999" + id="stop9940" /> + <stop + style="stop-color:#a6100c;stop-opacity:1" + offset="1" + id="stop9942" /> + <a:midPointStop + style="stop-color:#F3403F" + offset="0" /> + <a:midPointStop + style="stop-color:#F3403F" + offset="0.4213" /> + <a:midPointStop + style="stop-color:#A6100C" + offset="1" /> + </linearGradient> + <linearGradient + x1="478.21341" + y1="-131.9297" + x2="469.85818" + y2="-140.28481" + id="XMLID_2272_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.5592,0.829,-0.829,0.5592,101.3357,-104.791)"> + <stop + style="stop-color:#f3403f;stop-opacity:1" + offset="0" + id="stop9917" /> + <stop + style="stop-color:#d02a28;stop-opacity:1" + offset="0.37889999" + id="stop9919" /> + <stop + style="stop-color:#b21714;stop-opacity:1" + offset="0.77649999" + id="stop9921" /> + <stop + style="stop-color:#a6100c;stop-opacity:1" + offset="1" + id="stop9923" /> + <a:midPointStop + style="stop-color:#F3403F" + offset="0" /> + <a:midPointStop + style="stop-color:#F3403F" + offset="0.4213" /> + <a:midPointStop + style="stop-color:#A6100C" + offset="1" /> + </linearGradient> + <marker + refX="0" + refY="0" + orient="auto" + style="overflow:visible" + id="TriangleInM"> + <path + d="M 5.77,0 L -2.88,5 L -2.88,-5 L 5.77,0 z " + transform="scale(-0.4,-0.4)" + style="fill:#5c5c4f" + id="path3197" /> + </marker> + <linearGradient + x1="200.7363" + y1="100.4028" + x2="211.99519" + y2="89.143997" + id="XMLID_3298_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#bfbfbf;stop-opacity:1" + offset="0" + id="stop20103" /> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="1" + id="stop20105" /> + <a:midPointStop + offset="0" + style="stop-color:#BFBFBF" /> + <a:midPointStop + offset="0.5" + style="stop-color:#BFBFBF" /> + <a:midPointStop + offset="1" + style="stop-color:#F2F2F2" /> + </linearGradient> + <linearGradient + x1="200.7363" + y1="100.4028" + x2="211.99519" + y2="89.143997" + id="linearGradient36592" + xlink:href="#XMLID_3298_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.029078,0,0,1,-183.2624,-79.44655)" /> + <linearGradient + x1="181.2925" + y1="110.8481" + x2="192.6369" + y2="99.5037" + id="XMLID_3297_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="0" + id="stop20096" /> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="1" + id="stop20098" /> + <a:midPointStop + offset="0" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="1" + style="stop-color:#CCCCCC" /> + </linearGradient> + <linearGradient + x1="181.2925" + y1="110.8481" + x2="192.6369" + y2="99.5037" + id="linearGradient36595" + xlink:href="#XMLID_3297_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.029078,0,0,1,-183.2624,-79.44655)" /> + <linearGradient + x1="211.77589" + y1="105.7749" + x2="212.6619" + y2="108.2092" + id="XMLID_3296_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#0f6124;stop-opacity:1" + offset="0" + id="stop20087" /> + <stop + style="stop-color:#219630;stop-opacity:1" + offset="1" + id="stop20089" /> + <a:midPointStop + offset="0" + style="stop-color:#0F6124" /> + <a:midPointStop + offset="0.5" + style="stop-color:#0F6124" /> + <a:midPointStop + offset="1" + style="stop-color:#219630" /> + </linearGradient> + <linearGradient + x1="211.77589" + y1="105.7749" + x2="212.6619" + y2="108.2092" + id="linearGradient36677" + xlink:href="#XMLID_3296_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.029078,0,0,1,-183.2624,-79.44655)" /> + <linearGradient + x1="208.9834" + y1="116.8296" + x2="200.0811" + y2="96.834602" + id="XMLID_3295_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#b2b2b2;stop-opacity:1" + offset="0" + id="stop20076" /> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="0.5" + id="stop20078" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="1" + id="stop20080" /> + <a:midPointStop + offset="0" + style="stop-color:#B2B2B2" /> + <a:midPointStop + offset="0.5" + style="stop-color:#B2B2B2" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="1" + style="stop-color:#FFFFFF" /> + </linearGradient> + <linearGradient + x1="208.9834" + y1="116.8296" + x2="200.0811" + y2="96.834602" + id="linearGradient36604" + xlink:href="#XMLID_3295_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.029078,0,0,1,-183.2624,-79.44655)" /> + <linearGradient + x1="195.5264" + y1="97.911102" + x2="213.5213" + y2="115.9061" + id="XMLID_3294_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="0" + id="stop20069" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="1" + id="stop20071" /> + <a:midPointStop + offset="0" + style="stop-color:#CCCCCC" /> + <a:midPointStop + offset="0.5" + style="stop-color:#CCCCCC" /> + <a:midPointStop + offset="1" + style="stop-color:#FFFFFF" /> + </linearGradient> + <linearGradient + x1="195.5264" + y1="97.911102" + x2="213.5213" + y2="115.9061" + id="linearGradient36607" + xlink:href="#XMLID_3294_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.029078,0,0,1,-183.2624,-79.44655)" /> + <linearGradient + x1="186.1938" + y1="109.1343" + x2="206.6881" + y2="88.639999" + id="XMLID_3293_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#b2b2b2;stop-opacity:1" + offset="0" + id="stop20056" /> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="0.16850001" + id="stop20058" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="0.23029999" + id="stop20060" /> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="0.2809" + id="stop20062" /> + <stop + style="stop-color:#c2c2c2;stop-opacity:1" + offset="0.5" + id="stop20064" /> + <a:midPointStop + offset="0" + style="stop-color:#B2B2B2" /> + <a:midPointStop + offset="0.5" + style="stop-color:#B2B2B2" /> + <a:midPointStop + offset="0.1685" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="0.2303" + style="stop-color:#FFFFFF" /> + <a:midPointStop + offset="0.5" + style="stop-color:#FFFFFF" /> + <a:midPointStop + offset="0.2809" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="0.5" + style="stop-color:#C2C2C2" /> + </linearGradient> + <linearGradient + x1="186.1938" + y1="109.1343" + x2="206.6881" + y2="88.639999" + id="linearGradient36610" + xlink:href="#XMLID_3293_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.029078,0,0,1,-183.2624,-79.44655)" /> + <linearGradient + x1="184.8569" + y1="112.2676" + x2="211.94099" + y2="89.541397" + id="XMLID_3292_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#b2b2b2;stop-opacity:1" + offset="0" + id="stop20043" /> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="0.16850001" + id="stop20045" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="0.23029999" + id="stop20047" /> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="0.2809" + id="stop20049" /> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="1" + id="stop20051" /> + <a:midPointStop + offset="0" + style="stop-color:#B2B2B2" /> + <a:midPointStop + offset="0.5" + style="stop-color:#B2B2B2" /> + <a:midPointStop + offset="0.1685" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="0.2303" + style="stop-color:#FFFFFF" /> + <a:midPointStop + offset="0.5" + style="stop-color:#FFFFFF" /> + <a:midPointStop + offset="0.2809" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="1" + style="stop-color:#CCCCCC" /> + </linearGradient> + <linearGradient + x1="184.8569" + y1="112.2676" + x2="211.94099" + y2="89.541397" + id="linearGradient36613" + xlink:href="#XMLID_3292_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.029078,0,0,1,-183.2624,-79.44655)" /> + <marker + refX="0" + refY="0" + orient="auto" + style="overflow:visible" + id="TriangleOutM"> + <path + d="M 5.77,0 L -2.88,5 L -2.88,-5 L 5.77,0 z " + transform="scale(0.4,0.4)" + style="fill:#5c5c4f;fill-rule:evenodd;stroke-width:1pt;marker-start:none" + id="path3238" /> + </marker> + <linearGradient + x1="165.3" + y1="99.5" + x2="165.3" + y2="115.9" + id="XMLID_3457_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#999;stop-opacity:1" + offset="0" + id="stop8309" /> + <stop + style="stop-color:#b2b2b2;stop-opacity:1" + offset="0.30000001" + id="stop8311" /> + <stop + style="stop-color:#b2b2b2;stop-opacity:1" + offset="1" + id="stop8313" /> + <a:midPointstop + offset="0" + style="stop-color:#999999" /> + <a:midPointstop + offset="0.5" + style="stop-color:#999999" /> + <a:midPointstop + offset="0.3" + style="stop-color:#B2B2B2" /> + <a:midPointstop + offset="0.5" + style="stop-color:#B2B2B2" /> + <a:midPointstop + offset="1" + style="stop-color:#B2B2B2" /> + </linearGradient> + <linearGradient + x1="165.3" + y1="99.5" + x2="165.3" + y2="115.9" + id="lg1997" + xlink:href="#XMLID_3457_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" /> + <linearGradient + x1="175" + y1="99.800003" + x2="175" + y2="112.5" + id="XMLID_3456_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#737373;stop-opacity:1" + offset="0" + id="stop8300" /> + <stop + style="stop-color:#191919;stop-opacity:1" + offset="0.60000002" + id="stop8302" /> + <stop + style="stop-color:#191919;stop-opacity:1" + offset="1" + id="stop8304" /> + <a:midPointstop + offset="0" + style="stop-color:#737373" /> + <a:midPointstop + offset="0.5" + style="stop-color:#737373" /> + <a:midPointstop + offset="0.6" + style="stop-color:#191919" /> + <a:midPointstop + offset="0.5" + style="stop-color:#191919" /> + <a:midPointstop + offset="1" + style="stop-color:#191919" /> + </linearGradient> + <linearGradient + x1="175" + y1="99.800003" + x2="175" + y2="112.5" + id="lg2000" + xlink:href="#XMLID_3456_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" /> + <linearGradient + x1="168.8" + y1="107.1" + x2="164.5" + y2="110" + id="XMLID_3455_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#666;stop-opacity:1" + offset="0" + id="stop8291" /> + <stop + style="stop-color:#191919;stop-opacity:1" + offset="0.69999999" + id="stop8293" /> + <stop + style="stop-color:#191919;stop-opacity:1" + offset="1" + id="stop8295" /> + <a:midPointstop + offset="0" + style="stop-color:#666666" /> + <a:midPointstop + offset="0.5" + style="stop-color:#666666" /> + <a:midPointstop + offset="0.7" + style="stop-color:#191919" /> + <a:midPointstop + offset="0.5" + style="stop-color:#191919" /> + <a:midPointstop + offset="1" + style="stop-color:#191919" /> + </linearGradient> + <linearGradient + x1="168.8" + y1="107.1" + x2="164.5" + y2="110" + id="lg2003" + xlink:href="#XMLID_3455_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" /> + <linearGradient + id="lg63694"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="stop63696" /> + <stop + style="stop-color:white;stop-opacity:0" + offset="1" + id="stop63698" /> + </linearGradient> + <linearGradient + x1="458" + y1="483" + x2="465.20001" + y2="271.39999" + id="lg2006" + xlink:href="#lg63694" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(6.3e-2,0,0,6.3e-2,-1.3,-9.8)" /> + <linearGradient + x1="176.3" + y1="110.1" + x2="158.7" + y2="105" + id="XMLID_3453_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#666;stop-opacity:1" + offset="0" + id="stop8271" /> + <stop + style="stop-color:#737373;stop-opacity:1" + offset="0.2" + id="stop8273" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="1" + id="stop8275" /> + <a:midPointstop + offset="0" + style="stop-color:#666666" /> + <a:midPointstop + offset="0.5" + style="stop-color:#666666" /> + <a:midPointstop + offset="0.2" + style="stop-color:#737373" /> + <a:midPointstop + offset="0.5" + style="stop-color:#737373" /> + <a:midPointstop + offset="1" + style="stop-color:#FFFFFF" /> + </linearGradient> + <linearGradient + x1="176.3" + y1="110.1" + x2="158.7" + y2="105" + id="lg2009" + xlink:href="#XMLID_3453_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" /> + <linearGradient + x1="173.60001" + y1="118.9" + x2="172.8" + y2="128.2" + id="XMLID_3449_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#ecb300;stop-opacity:1" + offset="0" + id="stop8232" /> + <stop + style="stop-color:#fff95e;stop-opacity:1" + offset="0.60000002" + id="stop8234" /> + <stop + style="stop-color:#ecd600;stop-opacity:1" + offset="1" + id="stop8236" /> + <a:midPointstop + offset="0" + style="stop-color:#ECB300" /> + <a:midPointstop + offset="0.5" + style="stop-color:#ECB300" /> + <a:midPointstop + offset="0.6" + style="stop-color:#FFF95E" /> + <a:midPointstop + offset="0.5" + style="stop-color:#FFF95E" /> + <a:midPointstop + offset="1" + style="stop-color:#ECD600" /> + </linearGradient> + <linearGradient + x1="173.60001" + y1="118.9" + x2="172.8" + y2="128.2" + id="lg2016" + xlink:href="#XMLID_3449_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" /> + <radialGradient + cx="284.60001" + cy="172.60001" + r="6.5" + fx="284.60001" + fy="172.60001" + id="XMLID_3448_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.4,0,0,1.4,-237.3,-126.8)"> + <stop + style="stop-color:#ecb300;stop-opacity:1" + offset="0" + id="stop8219" /> + <stop + style="stop-color:#ecb300;stop-opacity:1" + offset="0.30000001" + id="stop8221" /> + <stop + style="stop-color:#c96b00;stop-opacity:1" + offset="0.89999998" + id="stop8223" /> + <stop + style="stop-color:#9a5500;stop-opacity:1" + offset="1" + id="stop8225" /> + <a:midPointstop + offset="0" + style="stop-color:#ECB300" /> + <a:midPointstop + offset="0.5" + style="stop-color:#ECB300" /> + <a:midPointstop + offset="0.3" + style="stop-color:#ECB300" /> + <a:midPointstop + offset="0.5" + style="stop-color:#ECB300" /> + <a:midPointstop + offset="0.9" + style="stop-color:#C96B00" /> + <a:midPointstop + offset="0.5" + style="stop-color:#C96B00" /> + <a:midPointstop + offset="1" + style="stop-color:#9A5500" /> + </radialGradient> + <radialGradient + cx="284.60001" + cy="172.60001" + r="6.5" + fx="284.60001" + fy="172.60001" + id="rg2020" + xlink:href="#XMLID_3448_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.513992,0,0,2.347576,-689.1621,-378.5717)" /> + <linearGradient + x1="158.10001" + y1="123" + x2="164.2" + y2="126.6" + id="XMLID_3447_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#ecd600;stop-opacity:1" + offset="0" + id="stop8204" /> + <stop + style="stop-color:#ffffb3;stop-opacity:1" + offset="0.30000001" + id="stop8206" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="1" + id="stop8208" /> + <a:midPointstop + offset="0" + style="stop-color:#ECD600" /> + <a:midPointstop + offset="0.5" + style="stop-color:#ECD600" /> + <a:midPointstop + offset="0.3" + style="stop-color:#FFFFB3" /> + <a:midPointstop + offset="0.5" + style="stop-color:#FFFFB3" /> + <a:midPointstop + offset="1" + style="stop-color:#FFFFFF" /> + </linearGradient> + <linearGradient + x1="158.10001" + y1="123" + x2="164.2" + y2="126.6" + id="lg2026" + xlink:href="#XMLID_3447_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" /> + <radialGradient + cx="280.89999" + cy="163.7" + r="10.1" + fx="280.89999" + fy="163.7" + id="XMLID_3446_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.4,0,0,1.4,-237.3,-126.8)"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="stop8197" /> + <stop + style="stop-color:#fff95e;stop-opacity:1" + offset="1" + id="stop8199" /> + <a:midPointstop + offset="0" + style="stop-color:#FFFFFF" /> + <a:midPointstop + offset="0.5" + style="stop-color:#FFFFFF" /> + <a:midPointstop + offset="1" + style="stop-color:#FFF95E" /> + </radialGradient> + <radialGradient + cx="280.89999" + cy="163.7" + r="10.1" + fx="280.89999" + fy="163.7" + id="rg2029" + xlink:href="#XMLID_3446_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.7,0,0,1.7,-457.5,-266.8)" /> + <linearGradient + x1="156.5" + y1="122.7" + x2="180.10001" + y2="122.7" + id="XMLID_3445_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#ecb300;stop-opacity:1" + offset="0" + id="stop8184" /> + <stop + style="stop-color:#ffe900;stop-opacity:1" + offset="0.2" + id="stop8186" /> + <stop + style="stop-color:#ffffb3;stop-opacity:1" + offset="0.30000001" + id="stop8188" /> + <stop + style="stop-color:#ffe900;stop-opacity:1" + offset="0.40000001" + id="stop8190" /> + <stop + style="stop-color:#d68100;stop-opacity:1" + offset="1" + id="stop8192" /> + <a:midPointstop + offset="0" + style="stop-color:#ECB300" /> + <a:midPointstop + offset="0.5" + style="stop-color:#ECB300" /> + <a:midPointstop + offset="0.2" + style="stop-color:#FFE900" /> + <a:midPointstop + offset="0.5" + style="stop-color:#FFE900" /> + <a:midPointstop + offset="0.3" + style="stop-color:#FFFFB3" /> + <a:midPointstop + offset="0.5" + style="stop-color:#FFFFB3" /> + <a:midPointstop + offset="0.4" + style="stop-color:#FFE900" /> + <a:midPointstop + offset="0.5" + style="stop-color:#FFE900" /> + <a:midPointstop + offset="1" + style="stop-color:#D68100" /> + </linearGradient> + <linearGradient + x1="156.5" + y1="122.7" + x2="180.10001" + y2="122.7" + id="lg2032" + xlink:href="#XMLID_3445_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" /> + <linearGradient + x1="156.39999" + y1="115.4" + x2="180.10001" + y2="115.4" + id="XMLID_3444_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#ecb300;stop-opacity:1" + offset="0" + id="stop8171" /> + <stop + style="stop-color:#ffe900;stop-opacity:1" + offset="0.2" + id="stop8173" /> + <stop + style="stop-color:#ffffb3;stop-opacity:1" + offset="0.30000001" + id="stop8175" /> + <stop + style="stop-color:#ffe900;stop-opacity:1" + offset="0.40000001" + id="stop8177" /> + <stop + style="stop-color:#d68100;stop-opacity:1" + offset="1" + id="stop8179" /> + <a:midPointstop + offset="0" + style="stop-color:#ECB300" /> + <a:midPointstop + offset="0.5" + style="stop-color:#ECB300" /> + <a:midPointstop + offset="0.2" + style="stop-color:#FFE900" /> + <a:midPointstop + offset="0.5" + style="stop-color:#FFE900" /> + <a:midPointstop + offset="0.3" + style="stop-color:#FFFFB3" /> + <a:midPointstop + offset="0.5" + style="stop-color:#FFFFB3" /> + <a:midPointstop + offset="0.4" + style="stop-color:#FFE900" /> + <a:midPointstop + offset="0.5" + style="stop-color:#FFE900" /> + <a:midPointstop + offset="1" + style="stop-color:#D68100" /> + </linearGradient> + <linearGradient + x1="156.39999" + y1="115.4" + x2="180.10001" + y2="115.4" + id="lg2035" + xlink:href="#XMLID_3444_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" /> + <linearGradient + x1="379.70001" + y1="167.89999" + x2="383.89999" + y2="172.89999" + id="lg4286_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.8,0.2,-0.2,0.8,78.8,38.1)"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="s16159" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="0.1" + id="s16161" /> + <stop + style="stop-color:#737373;stop-opacity:1" + offset="1" + id="s16163" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0.1" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#737373" + offset="1" /> + </linearGradient> + <linearGradient + x1="379.60001" + y1="167.8" + x2="383.79999" + y2="172" + id="lg6416" + xlink:href="#lg4286_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.622156,0.623859,-0.623859,2.62182,-882.9706,-673.7921)" /> + <linearGradient + x1="384.20001" + y1="169.8" + x2="384.79999" + y2="170.39999" + id="lg4285_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.8,0.2,-0.2,0.8,78.8,38.1)"> + <stop + style="stop-color:#737373;stop-opacity:1" + offset="0" + id="s16152" /> + <stop + style="stop-color:#d9d9d9;stop-opacity:1" + offset="1" + id="s16154" /> + <ns:midPointStop + style="stop-color:#737373" + offset="0" /> + <ns:midPointStop + style="stop-color:#737373" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#D9D9D9" + offset="1" /> + </linearGradient> + <linearGradient + x1="384.20001" + y1="169.8" + x2="384.79999" + y2="170.39999" + id="lg6453" + xlink:href="#lg4285_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.6,0.6,-0.6,2.6,-883,-673.8)" /> + <linearGradient + x1="380.5" + y1="172.60001" + x2="382.79999" + y2="173.7" + id="lg4284_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.8,0.2,-0.2,0.8,78.8,38.1)"> + <stop + style="stop-color:gray;stop-opacity:1" + offset="0" + id="s16145" /> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="1" + id="s16147" /> + <ns:midPointStop + style="stop-color:#808080" + offset="0" /> + <ns:midPointStop + style="stop-color:#808080" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#E5E5E5" + offset="1" /> + </linearGradient> + <linearGradient + x1="380.5" + y1="172.60001" + x2="382.79999" + y2="173.7" + id="lg6456" + xlink:href="#lg4284_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.6,0.6,-0.6,2.6,-883,-673.8)" /> + <radialGradient + cx="347.29999" + cy="244.5" + r="5.1999998" + fx="347.29999" + fy="244.5" + id="lg4282_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(3.4,0,0,3.4,-1148,-802)"> + <stop + style="stop-color:#333;stop-opacity:1" + offset="0" + id="s16135" /> + <stop + style="stop-color:#999;stop-opacity:1" + offset="1" + id="s16137" /> + <ns:midPointStop + style="stop-color:#333333" + offset="0" /> + <ns:midPointStop + style="stop-color:#333333" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#999999" + offset="1" /> + </radialGradient> + <linearGradient + x1="310.39999" + y1="397.70001" + x2="310.89999" + y2="399.5" + id="lg4280_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.7,-0.7,0.7,0.7,-153.4,180.6)"> + <stop + style="stop-color:#ffcd00;stop-opacity:1" + offset="0" + id="s16111" /> + <stop + style="stop-color:#ffffb3;stop-opacity:1" + offset="0.60000002" + id="s16113" /> + <stop + style="stop-color:#ffffb3;stop-opacity:1" + offset="1" + id="s16115" /> + <ns:midPointStop + style="stop-color:#FFCD00" + offset="0" /> + <ns:midPointStop + style="stop-color:#FFCD00" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFFFB3" + offset="0.6" /> + <ns:midPointStop + style="stop-color:#FFFFB3" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFFFB3" + offset="1" /> + </linearGradient> + <linearGradient + x1="310.39999" + y1="397.70001" + x2="310.89999" + y2="399.5" + id="lg6467" + xlink:href="#lg4280_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.4,-2.4,2.4,2.4,-1663.6,-195)" /> + <linearGradient + x1="310.89999" + y1="395.79999" + x2="313.29999" + y2="403.10001" + id="lg4279_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.7,-0.7,0.7,0.7,-153.4,180.6)"> + <stop + style="stop-color:#ffffb3;stop-opacity:1" + offset="0" + id="s16100" /> + <stop + style="stop-color:#ffffb3;stop-opacity:1" + offset="0.40000001" + id="s16102" /> + <stop + style="stop-color:#ffcd00;stop-opacity:1" + offset="0.89999998" + id="s16104" /> + <stop + style="stop-color:#ffcd00;stop-opacity:1" + offset="1" + id="s16106" /> + <ns:midPointStop + style="stop-color:#FFFFB3" + offset="0" /> + <ns:midPointStop + style="stop-color:#FFFFB3" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFFFB3" + offset="0.4" /> + <ns:midPointStop + style="stop-color:#FFFFB3" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFCD00" + offset="0.9" /> + <ns:midPointStop + style="stop-color:#FFCD00" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFCD00" + offset="1" /> + </linearGradient> + <linearGradient + x1="310.89999" + y1="395.79999" + x2="313.29999" + y2="403.10001" + id="lg6465" + xlink:href="#lg4279_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.4,-2.4,2.4,2.4,-1663.6,-195)" /> + <linearGradient + x1="307.79999" + y1="395.20001" + x2="313.79999" + y2="413.60001" + id="lg4278_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.7,-0.7,0.7,0.7,-153.4,180.6)"> + <stop + style="stop-color:#ffffb3;stop-opacity:1" + offset="0" + id="s16091" /> + <stop + style="stop-color:#fcd72f;stop-opacity:1" + offset="0.40000001" + id="s16093" /> + <stop + style="stop-color:#ffcd00;stop-opacity:1" + offset="1" + id="s16095" /> + <ns:midPointStop + style="stop-color:#FFFFB3" + offset="0" /> + <ns:midPointStop + style="stop-color:#FFFFB3" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FCD72F" + offset="0.4" /> + <ns:midPointStop + style="stop-color:#FCD72F" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFCD00" + offset="1" /> + </linearGradient> + <linearGradient + x1="306.5" + y1="393" + x2="309" + y2="404" + id="lg6400" + xlink:href="#lg4278_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.4,-2.4,2.4,2.4,-1663.6,-195)" /> + <linearGradient + x1="352.10001" + y1="253.60001" + x2="348.5" + y2="237.8" + id="lg4276_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(3.4,0,0,3.4,-1148,-802)"> + <stop + style="stop-color:#ffff87;stop-opacity:1" + offset="0" + id="s16077" /> + <stop + style="stop-color:#ffad00;stop-opacity:1" + offset="1" + id="s16079" /> + <ns:midPointStop + style="stop-color:#FFFF87" + offset="0" /> + <ns:midPointStop + style="stop-color:#FFFF87" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFAD00" + offset="1" /> + </linearGradient> + <linearGradient + x1="335.60001" + y1="354.79999" + x2="337.89999" + y2="354.79999" + id="lg4275_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9,-0.5,0.5,0.9,-121.7,105.1)"> + <stop + style="stop-color:#d9d9d9;stop-opacity:1" + offset="0" + id="s16057" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="0.80000001" + id="s16059" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="1" + id="s16061" /> + <ns:midPointStop + style="stop-color:#D9D9D9" + offset="0" /> + <ns:midPointStop + style="stop-color:#D9D9D9" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0.8" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="1" /> + </linearGradient> + <linearGradient + x1="335.60001" + y1="354.79999" + x2="337.89999" + y2="354.79999" + id="lg6463" + xlink:href="#lg4275_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.9,-1.7,1.7,2.9,-1557,-448.7)" /> + <linearGradient + x1="337.39999" + y1="353.10001" + x2="339.39999" + y2="357.10001" + id="lg4274_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9,-0.5,0.5,0.9,-121.7,105.1)"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="s16048" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="0.1" + id="s16050" /> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="1" + id="s16052" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0.1" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#CCCCCC" + offset="1" /> + </linearGradient> + <linearGradient + x1="337.39999" + y1="353.10001" + x2="339.39999" + y2="357.10001" + id="lg6461" + xlink:href="#lg4274_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.9,-1.7,1.7,2.9,-1557,-448.7)" /> + <linearGradient + x1="334.39999" + y1="355.5" + x2="335.5" + y2="356.79999" + id="lg4273_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9,-0.5,0.5,0.9,-121.7,105.1)"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="s16041" /> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="1" + id="s16043" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="5.6e-003" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#CCCCCC" + offset="1" /> + </linearGradient> + <linearGradient + x1="334.39999" + y1="355.5" + x2="335.5" + y2="356.79999" + id="lg6381" + xlink:href="#lg4273_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.9,-1.7,1.7,2.9,-1557,-448.7)" /> + <linearGradient + x1="348.39999" + y1="247.39999" + x2="354.10001" + y2="242" + id="lg4271_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(3.4,0,0,3.4,-1148,-802)"> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="0" + id="s16025" /> + <stop + style="stop-color:#9e9e9e;stop-opacity:1" + offset="0.40000001" + id="s16027" /> + <stop + style="stop-color:black;stop-opacity:1" + offset="1" + id="s16029" /> + <ns:midPointStop + style="stop-color:#F2F2F2" + offset="0" /> + <ns:midPointStop + style="stop-color:#F2F2F2" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#000000" + offset="1" /> + </linearGradient> + <linearGradient + x1="351.29999" + y1="257.29999" + x2="346.29999" + y2="235.5" + id="lg4270_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#ffff87;stop-opacity:1" + offset="0" + id="s16007" /> + <stop + style="stop-color:#ffad00;stop-opacity:1" + offset="1" + id="s16009" /> + <ns:midPointStop + style="stop-color:#FFFF87" + offset="0" /> + <ns:midPointStop + style="stop-color:#FFFF87" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFAD00" + offset="1" /> + </linearGradient> + <linearGradient + x1="351.29999" + y1="257.29999" + x2="346.29999" + y2="235.5" + id="lg6459" + xlink:href="#lg4270_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(3.4,0,0,3.4,-1148,-802)" /> + <linearGradient + x1="43.799999" + y1="32.5" + x2="63.299999" + y2="66.400002" + id="XMLID_2708_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="stop75318" /> + <stop + style="stop-color:#fffcea;stop-opacity:1" + offset="1" + id="stop75320" /> + <a:midPointStop + style="stop-color:#FFFFFF" + offset="0" /> + <a:midPointStop + style="stop-color:#FFFFFF" + offset="0.5" /> + <a:midPointStop + style="stop-color:#FFFCEA" + offset="1" /> + </linearGradient> + <linearGradient + x1="43.799999" + y1="32.5" + x2="63.299999" + y2="66.400002" + id="lg1907" + xlink:href="#XMLID_2708_" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-29,-22.6)" /> + <linearGradient + x1="52.5" + y1="40.400002" + x2="58.200001" + y2="64" + id="XMLID_2707_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#ffdea0;stop-opacity:1" + offset="0" + id="stop75305" /> + <stop + style="stop-color:#ffd89e;stop-opacity:1" + offset="0.30000001" + id="stop75307" /> + <stop + style="stop-color:#ffd79e;stop-opacity:1" + offset="0.30000001" + id="stop75309" /> + <stop + style="stop-color:#dbaf6d;stop-opacity:1" + offset="0.69999999" + id="stop75311" /> + <stop + style="stop-color:#6f4c24;stop-opacity:1" + offset="1" + id="stop75313" /> + <a:midPointStop + style="stop-color:#FFDEA0" + offset="0" /> + <a:midPointStop + style="stop-color:#FFDEA0" + offset="0.6" /> + <a:midPointStop + style="stop-color:#FFD79E" + offset="0.3" /> + <a:midPointStop + style="stop-color:#FFD79E" + offset="0.5" /> + <a:midPointStop + style="stop-color:#DBAF6D" + offset="0.7" /> + <a:midPointStop + style="stop-color:#DBAF6D" + offset="0.5" /> + <a:midPointStop + style="stop-color:#6F4C24" + offset="1" /> + </linearGradient> + <linearGradient + x1="52.5" + y1="40.400002" + x2="58.200001" + y2="64" + id="lg1910" + xlink:href="#XMLID_2707_" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-29,-22.6)" /> + <linearGradient + x1="58" + y1="73.199997" + x2="44.5" + y2="19" + id="XMLID_2704_" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-29,-22.6)"> + <stop + style="stop-color:#d4a96c;stop-opacity:1" + offset="0.5" + id="stop75284" /> + <stop + style="stop-color:#dcb273;stop-opacity:1" + offset="0.60000002" + id="stop75286" /> + <stop + style="stop-color:#f0ca87;stop-opacity:1" + offset="0.80000001" + id="stop75288" /> + <stop + style="stop-color:#ffdc96;stop-opacity:1" + offset="0.69999999" + id="stop75290" /> + <stop + style="stop-color:#c18a42;stop-opacity:1" + offset="1" + id="stop75292" /> + <a:midPointStop + style="stop-color:#D4A96C" + offset="0.5" /> + <a:midPointStop + style="stop-color:#D4A96C" + offset="0.6" /> + <a:midPointStop + style="stop-color:#FFDC96" + offset="0.7" /> + <a:midPointStop + style="stop-color:#FFDC96" + offset="0.5" /> + <a:midPointStop + style="stop-color:#C18A42" + offset="1" /> + </linearGradient> + <linearGradient + x1="53.700001" + y1="32" + x2="53.700001" + y2="64.599998" + id="XMLID_2703_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#e5c9b0;stop-opacity:1" + offset="0" + id="stop75268" /> + <stop + style="stop-color:#e5c9b0;stop-opacity:1" + offset="0.40000001" + id="stop75270" /> + <stop + style="stop-color:#c0aa94;stop-opacity:1" + offset="1" + id="stop75272" /> + <a:midPointStop + style="stop-color:#E5C9B0" + offset="0" /> + <a:midPointStop + style="stop-color:#E5C9B0" + offset="0.5" /> + <a:midPointStop + style="stop-color:#E5C9B0" + offset="0.4" /> + <a:midPointStop + style="stop-color:#E5C9B0" + offset="0.5" /> + <a:midPointStop + style="stop-color:#C0AA94" + offset="1" /> + </linearGradient> + <linearGradient + x1="53.700001" + y1="32" + x2="53.700001" + y2="64.599998" + id="lg1916" + xlink:href="#XMLID_2703_" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-29,-22.6)" /> + <linearGradient + x1="224.31" + y1="19.450001" + x2="214.33" + y2="11.46" + id="XMLID_419_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#404040;stop-opacity:1" + offset="0" + id="s1903" /> + <stop + style="stop-color:#6d6d6d;stop-opacity:1" + offset="0.33000001" + id="s1905" /> + <stop + style="stop-color:#e9e9e9;stop-opacity:1" + offset="1" + id="s1907" /> + <a:midPointStop + offset="0" + style="stop-color:#404040" /> + <a:midPointStop + offset="0.5" + style="stop-color:#404040" /> + <a:midPointStop + offset="0.33" + style="stop-color:#6D6D6D" /> + <a:midPointStop + offset="0.5" + style="stop-color:#6D6D6D" /> + <a:midPointStop + offset="1" + style="stop-color:#E9E9E9" /> + </linearGradient> + <linearGradient + x1="221.84" + y1="32.779999" + x2="212.2" + y2="20.27" + id="lg1988" + xlink:href="#XMLID_419_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.33,0,0,1.31,-274.2,-5.2)" /> + <linearGradient + x1="228.35001" + y1="33.279999" + x2="215.42999" + y2="33.279999" + id="lg1900" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="s1902" /> + <stop + style="stop-color:white;stop-opacity:0" + offset="1" + id="s1906" /> + <a:midPointStop + style="stop-color:#575757" + offset="0" /> + <a:midPointStop + style="stop-color:#575757" + offset="0.5" /> + <a:midPointStop + style="stop-color:#6D6D6D" + offset="0.33" /> + <a:midPointStop + style="stop-color:#6D6D6D" + offset="0.5" /> + <a:midPointStop + style="stop-color:#D3D3D3" + offset="1" /> + </linearGradient> + <linearGradient + x1="234.81" + y1="33.279999" + x2="228.27" + y2="33.279999" + id="lg1908" + xlink:href="#lg1900" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.33,0,0,1.31,-274.2,-5.2)" /> + <linearGradient + x1="228.35001" + y1="33.279999" + x2="215.42999" + y2="33.279999" + id="XMLID_416_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#575757;stop-opacity:1" + offset="0" + id="s1874" /> + <stop + style="stop-color:#6d6d6d;stop-opacity:1" + offset="0.33000001" + id="s1876" /> + <stop + style="stop-color:#d3d3d3;stop-opacity:1" + offset="1" + id="s1878" /> + <a:midPointStop + offset="0" + style="stop-color:#575757" /> + <a:midPointStop + offset="0.5" + style="stop-color:#575757" /> + <a:midPointStop + offset="0.33" + style="stop-color:#6D6D6D" /> + <a:midPointStop + offset="0.5" + style="stop-color:#6D6D6D" /> + <a:midPointStop + offset="1" + style="stop-color:#D3D3D3" /> + </linearGradient> + <linearGradient + x1="228.35001" + y1="33.279999" + x2="215.42999" + y2="33.279999" + id="lg1991" + xlink:href="#XMLID_416_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.33,0,0,1.31,-274.2,-5.2)" /> + <radialGradient + cx="603.19" + cy="230.77" + r="1.67" + fx="603.19" + fy="230.77" + id="x5010_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1,0,0,1.1,-54.33,-75.4)"> + <stop + style="stop-color:#c9ffc9;stop-opacity:1" + offset="0" + id="stop29201" /> + <stop + style="stop-color:#23a11f;stop-opacity:1" + offset="1" + id="stop29203" /> + <a:midPointStop + offset="0" + style="stop-color:#C9FFC9" /> + <a:midPointStop + offset="0.5" + style="stop-color:#C9FFC9" /> + <a:midPointStop + offset="1" + style="stop-color:#23A11F" /> + </radialGradient> + <radialGradient + cx="603.19" + cy="230.77" + r="1.67" + fx="603.19" + fy="230.77" + id="radialGradient5711" + xlink:href="#x5010_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.23,0,0,1.23,-709.93,-245.02)" /> + <linearGradient + x1="592.31" + y1="162.60001" + x2="609.32001" + y2="145.59" + id="lg5722" + xlink:href="#x5003_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.12,0,0,1.12,-649.08,-160.62)" /> + <linearGradient + x1="601.48999" + y1="170.16" + x2="613.84003" + y2="170.16" + id="x5002_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#d9d9d9;stop-opacity:1" + offset="0" + id="stop29134" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="0.2" + id="stop29136" /> + <stop + style="stop-color:#999;stop-opacity:1" + offset="1" + id="stop29138" /> + <a:midPointStop + offset="0" + style="stop-color:#D9D9D9" /> + <a:midPointStop + offset="0.5" + style="stop-color:#D9D9D9" /> + <a:midPointStop + offset="0.20" + style="stop-color:#FFFFFF" /> + <a:midPointStop + offset="0.5" + style="stop-color:#FFFFFF" /> + <a:midPointStop + offset="1" + style="stop-color:#999999" /> + </linearGradient> + <linearGradient + x1="601.48999" + y1="170.16" + x2="613.84003" + y2="170.16" + id="lg5725" + xlink:href="#x5002_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.12,0,0,1.12,-649.08,-160.62)" /> + <linearGradient + x1="592.20001" + y1="156.45" + x2="609.98999" + y2="174.23" + id="x5004_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.12,0,0,1.12,-649.08,-160.62)"> + <stop + style="stop-color:#d9d9d9;stop-opacity:1" + offset="0" + id="stop29157" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="1" + id="stop29159" /> + <a:midPointStop + offset="0" + style="stop-color:#D9D9D9" /> + <a:midPointStop + offset="0.5" + style="stop-color:#D9D9D9" /> + <a:midPointStop + offset="1" + style="stop-color:#FFFFFF" /> + </linearGradient> + <linearGradient + x1="592.20001" + y1="156.45" + x2="609.98999" + y2="174.23" + id="lg5728" + xlink:href="#x5004_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.12,0,0,1.12,-649.08,-160.62)" /> + <linearGradient + x1="592.31" + y1="162.60001" + x2="609.32001" + y2="145.59" + id="x5003_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="0" + id="stop29143" /> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="1" + id="stop29145" /> + <a:midPointStop + offset="0" + style="stop-color:#F2F2F2" /> + <a:midPointStop + offset="0.5" + style="stop-color:#F2F2F2" /> + <a:midPointStop + offset="1" + style="stop-color:#E5E5E5" /> + </linearGradient> + <linearGradient + x1="592.31" + y1="162.60001" + x2="609.32001" + y2="145.59" + id="lg5732" + xlink:href="#x5003_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.12,0,0,1.12,-649.08,-160.62)" /> + <linearGradient + x1="592.20001" + y1="156.45" + x2="609.98999" + y2="174.24001" + id="x5000_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.12,0,0,1.12,-649.08,-160.62)"> + <stop + style="stop-color:#d9d9d9;stop-opacity:1" + offset="0" + id="stop29124" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="1" + id="stop29126" /> + <a:midPointStop + offset="0" + style="stop-color:#D9D9D9" /> + <a:midPointStop + offset="0.5" + style="stop-color:#D9D9D9" /> + <a:midPointStop + offset="1" + style="stop-color:#FFFFFF" /> + </linearGradient> + <linearGradient + x1="592.20001" + y1="156.45" + x2="609.98999" + y2="174.24001" + id="lg5735" + xlink:href="#x5000_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.12,0,0,1.12,-649.08,-160.62)" /> + <linearGradient + x1="308.54999" + y1="149.89999" + x2="299.72" + y2="148.83" + id="XMLID_2433_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#d6d6d6;stop-opacity:1" + offset="0" + id="71615" /> + <stop + style="stop-color:#a5a5a5;stop-opacity:1" + offset="1" + id="71617" /> + <a:midPointStop + offset="0" + style="stop-color:#D6D6D6" /> + <a:midPointStop + offset="0.5" + style="stop-color:#D6D6D6" /> + <a:midPointStop + offset="1" + style="stop-color:#A5A5A5" /> + </linearGradient> + <linearGradient + x1="308.54999" + y1="149.89999" + x2="299.72" + y2="148.83" + id="lg1952" + xlink:href="#XMLID_2433_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.03,0,0,1.03,-279.57,-124.36)" /> + <radialGradient + cx="307.39999" + cy="121" + r="23.35" + fx="307.39999" + fy="121" + id="XMLID_2432_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.98,0,0,0.98,2.88,2.75)"> + <stop + style="stop-color:#d2d2d2;stop-opacity:1" + offset="0.19" + id="71592" /> + <stop + style="stop-color:#cfcfcf;stop-opacity:1" + offset="0.44999999" + id="71594" /> + <stop + style="stop-color:#c7c7c7;stop-opacity:1" + offset="0.60000002" + id="71596" /> + <stop + style="stop-color:#b9b9b9;stop-opacity:1" + offset="0.74000001" + id="71598" /> + <stop + style="stop-color:#a4a4a4;stop-opacity:1" + offset="0.86000001" + id="71600" /> + <stop + style="stop-color:#8a8a8a;stop-opacity:1" + offset="0.95999998" + id="71602" /> + <stop + style="stop-color:gray;stop-opacity:1" + offset="1" + id="71604" /> + <a:midPointStop + offset="0.19" + style="stop-color:#D2D2D2" /> + <a:midPointStop + offset="0.8" + style="stop-color:#D2D2D2" /> + <a:midPointStop + offset="1" + style="stop-color:#808080" /> + </radialGradient> + <radialGradient + cx="307.39999" + cy="121" + r="23.35" + fx="307.39999" + fy="121" + id="radialGradient2331" + xlink:href="#XMLID_2432_" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-276.62,-121.54)" /> + <linearGradient + x1="294.13" + y1="127.07" + x2="294.13" + y2="142.2" + id="XMLID_2430_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#b5d8ff;stop-opacity:1" + offset="0" + id="71582" /> + <stop + style="stop-color:black;stop-opacity:1" + offset="1" + id="71584" /> + <a:midPointStop + offset="0" + style="stop-color:#B5D8FF" /> + <a:midPointStop + offset="0.5" + style="stop-color:#B5D8FF" /> + <a:midPointStop + offset="1" + style="stop-color:#000000" /> + </linearGradient> + <linearGradient + x1="294.13" + y1="127.07" + x2="294.13" + y2="142.2" + id="lg2820" + xlink:href="#XMLID_2430_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.03,0,0,1.03,-279.57,-124.36)" /> + <linearGradient + x1="279.10999" + y1="148.03" + x2="309.16" + y2="148.03" + id="XMLID_2429_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#e1e1e1;stop-opacity:1" + offset="0" + id="71564" /> + <stop + style="stop-color:#e1e1e1;stop-opacity:1" + offset="0.25" + id="71566" /> + <stop + style="stop-color:#a5a5a5;stop-opacity:1" + offset="0.44" + id="71568" /> + <stop + style="stop-color:#a5a5a5;stop-opacity:1" + offset="1" + id="71570" /> + <a:midPointStop + offset="0" + style="stop-color:#E1E1E1" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E1E1E1" /> + <a:midPointStop + offset="0.25" + style="stop-color:#E1E1E1" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E1E1E1" /> + <a:midPointStop + offset="0.44" + style="stop-color:#A5A5A5" /> + <a:midPointStop + offset="0.5" + style="stop-color:#A5A5A5" /> + <a:midPointStop + offset="1" + style="stop-color:#A5A5A5" /> + </linearGradient> + <linearGradient + x1="279.10999" + y1="148.03" + x2="309.16" + y2="148.03" + id="lg2818" + xlink:href="#XMLID_2429_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.03,0,0,1.03,-279.57,-124.36)" /> + <radialGradient + cx="622.34302" + cy="14.449" + r="26.496" + fx="622.34302" + fy="14.449" + id="lg3499_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.851,0,0,0.849,69.297,51.658)"> + <stop + style="stop-color:#23468e;stop-opacity:1" + offset="0" + id="stop10972" /> + <stop + style="stop-color:#012859;stop-opacity:1" + offset="1" + id="stop10974" /> + <a:midPointStop + offset="0" + style="stop-color:#23468E" /> + <a:midPointStop + offset="0.5" + style="stop-color:#23468E" /> + <a:midPointStop + offset="1" + style="stop-color:#012859" /> + </radialGradient> + <radialGradient + cx="622.34302" + cy="14.449" + r="26.496" + fx="622.34302" + fy="14.449" + id="rg5791" + xlink:href="#lg3499_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.858,0,0,0.857,-511.7,9.02)" /> + <linearGradient + x1="616.112" + y1="76.247002" + x2="588.14099" + y2="60.742001" + id="lg3497_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#01326e;stop-opacity:1" + offset="0" + id="stop10962" /> + <stop + style="stop-color:#012859;stop-opacity:1" + offset="1" + id="stop10964" /> + <a:midPointStop + offset="0" + style="stop-color:#01326E" /> + <a:midPointStop + offset="0.5" + style="stop-color:#01326E" /> + <a:midPointStop + offset="1" + style="stop-color:#012859" /> + </linearGradient> + <linearGradient + x1="617.698" + y1="82.445999" + x2="585.95203" + y2="54.848999" + id="lg3496_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="0" + id="stop10950" /> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="1" + id="stop10952" /> + <a:midPointStop + offset="0" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="1" + style="stop-color:#CCCCCC" /> + </linearGradient> + <linearGradient + x1="617.698" + y1="82.445999" + x2="585.95203" + y2="54.848999" + id="lg5794" + xlink:href="#lg3496_" + gradientUnits="userSpaceOnUse" /> + <linearGradient + x1="601.39001" + y1="55.341" + x2="588.29199" + y2="71.515999" + id="lg3495_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#d9d9d9;stop-opacity:1" + offset="0" + id="stop10941" /> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="0.52200001" + id="stop10943" /> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="1" + id="stop10945" /> + <a:midPointStop + offset="0" + style="stop-color:#D9D9D9" /> + <a:midPointStop + offset="0.5" + style="stop-color:#D9D9D9" /> + <a:midPointStop + offset="0.522" + style="stop-color:#F2F2F2" /> + <a:midPointStop + offset="0.5" + style="stop-color:#F2F2F2" /> + <a:midPointStop + offset="1" + style="stop-color:#CCCCCC" /> + </linearGradient> + <linearGradient + x1="601.39001" + y1="55.341" + x2="588.29199" + y2="71.515999" + id="lg5771" + xlink:href="#lg3495_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.009,0,0,1.009,-581.615,-43.098)" /> + <linearGradient + x1="611.34601" + y1="55.279999" + x2="590.39001" + y2="81.157997" + id="lg3494_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#d9d9d9;stop-opacity:1" + offset="0" + id="stop10932" /> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="0.52200001" + id="stop10934" /> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="1" + id="stop10936" /> + <a:midPointStop + offset="0" + style="stop-color:#D9D9D9" /> + <a:midPointStop + offset="0.5" + style="stop-color:#D9D9D9" /> + <a:midPointStop + offset="0.522" + style="stop-color:#F2F2F2" /> + <a:midPointStop + offset="0.5" + style="stop-color:#F2F2F2" /> + <a:midPointStop + offset="1" + style="stop-color:#CCCCCC" /> + </linearGradient> + <linearGradient + x1="611.34601" + y1="55.279999" + x2="590.39001" + y2="81.157997" + id="lg5774" + xlink:href="#lg3494_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.009,0,0,1.009,-581.616,-43.098)" /> + <linearGradient + x1="798.72998" + y1="69.839996" + x2="799.04999" + y2="70.709999" + id="g3302_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#005e00;stop-opacity:1" + offset="0" + id="s6504" /> + <stop + style="stop-color:#23a11f;stop-opacity:1" + offset="1" + id="s6506" /> + <a:midPointstop + style="stop-color:#005E00" + offset="0" /> + <a:midPointstop + style="stop-color:#005E00" + offset="0.5" /> + <a:midPointstop + style="stop-color:#23A11F" + offset="1" /> + </linearGradient> + <linearGradient + x1="798.72998" + y1="69.839996" + x2="799.04999" + y2="70.709999" + id="lg5851" + xlink:href="#g3302_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.204,0,0,1.263,-926.036,-60.001)" /> + <linearGradient + x1="779.19" + y1="122.73" + x2="811.69" + y2="149.74001" + id="g3301_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,-0.25,0,1,0,129.19)"> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="0" + id="s6483" /> + <stop + style="stop-color:#eee;stop-opacity:1" + offset="0.17" + id="s6485" /> + <stop + style="stop-color:#e3e3e3;stop-opacity:1" + offset="0.34" + id="s6487" /> + <stop + style="stop-color:#cfcfcf;stop-opacity:1" + offset="0.50999999" + id="s6489" /> + <stop + style="stop-color:#b4b4b4;stop-opacity:1" + offset="0.67000002" + id="s6491" /> + <stop + style="stop-color:#919191;stop-opacity:1" + offset="0.83999997" + id="s6493" /> + <stop + style="stop-color:#666;stop-opacity:1" + offset="1" + id="s6495" /> + <a:midPointstop + style="stop-color:#F2F2F2" + offset="0" /> + <a:midPointstop + style="stop-color:#F2F2F2" + offset="0.71" /> + <a:midPointstop + style="stop-color:#666666" + offset="1" /> + </linearGradient> + <linearGradient + x1="779.19" + y1="122.73" + x2="811.69" + y2="149.74001" + id="lg5855" + xlink:href="#g3301_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.204,-0.316,0,1.263,-926.036,103.123)" /> + <clipPath + id="g3299_"> + <use + id="use6469" + x="0" + y="0" + width="1005.92" + height="376.97" + xlink:href="#g101_" /> + </clipPath> + <radialGradient + cx="1189.9301" + cy="100.05" + r="40.400002" + fx="1189.9301" + fy="100.05" + id="g3300_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.34,-8.46e-2,0,0.34,394.16,137.13)"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="s6472" /> + <stop + style="stop-color:white;stop-opacity:0" + offset="1" + id="s6474" /> + <a:midPointstop + style="stop-color:#FFFFFF" + offset="0" /> + <a:midPointstop + style="stop-color:#FFFFFF" + offset="0.5" /> + <a:midPointstop + style="stop-color:#000000" + offset="1" /> + </radialGradient> + <radialGradient + cx="1199.74" + cy="97.150002" + r="40.400002" + fx="1199.74" + fy="97.150002" + id="rg5860" + xlink:href="#g3300_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.409,-0.107,0,0.429,-451.489,113.149)" /> + <linearGradient + x1="796.38" + y1="67.580002" + x2="781.28003" + y2="58.549999" + id="g3298_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#4c8bca;stop-opacity:1" + offset="0" + id="s6462" /> + <stop + style="stop-color:#b7e9ff;stop-opacity:1" + offset="1" + id="s6464" /> + <a:midPointstop + style="stop-color:#4C8BCA" + offset="0" /> + <a:midPointstop + style="stop-color:#4C8BCA" + offset="0.5" /> + <a:midPointstop + style="stop-color:#B7E9FF" + offset="1" /> + </linearGradient> + <linearGradient + x1="800.97998" + y1="140.72" + x2="777.71997" + y2="121.76" + id="g3297_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,-0.25,0,1,0,129.19)"> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="0" + id="s6448" /> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="1" + id="s6450" /> + <a:midPointstop + style="stop-color:#E5E5E5" + offset="0" /> + <a:midPointstop + style="stop-color:#E5E5E5" + offset="0.5" /> + <a:midPointstop + style="stop-color:#CCCCCC" + offset="1" /> + </linearGradient> + <linearGradient + x1="800.97998" + y1="140.72" + x2="777.71997" + y2="121.76" + id="lg5890" + xlink:href="#g3297_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,-0.25,0,1,0,129.19)" /> + <linearGradient + x1="790.03998" + y1="-16.33" + x2="779.84003" + y2="-3.73" + id="g3296_" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,70.17)"> + <stop + style="stop-color:#d9d9d9;stop-opacity:1" + offset="0" + id="s6439" /> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="0.51999998" + id="s6441" /> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="1" + id="s6443" /> + <a:midPointstop + style="stop-color:#D9D9D9" + offset="0" /> + <a:midPointstop + style="stop-color:#D9D9D9" + offset="0.5" /> + <a:midPointstop + style="stop-color:#F2F2F2" + offset="0.52" /> + <a:midPointstop + style="stop-color:#F2F2F2" + offset="0.5" /> + <a:midPointstop + style="stop-color:#CCCCCC" + offset="1" /> + </linearGradient> + <linearGradient + x1="790.03998" + y1="-16.33" + x2="779.84003" + y2="-3.73" + id="lg5866" + xlink:href="#g3296_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.204,0,0,1.263,-926.036,28.6)" /> + <linearGradient + x1="785.84003" + y1="72.989998" + x2="785.26001" + y2="76.279999" + id="g3293_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="s6412" /> + <stop + style="stop-color:#737373;stop-opacity:1" + offset="1" + id="s6414" /> + <a:midPointstop + style="stop-color:#FFFFFF" + offset="0" /> + <a:midPointstop + style="stop-color:#FFFFFF" + offset="0.5" /> + <a:midPointstop + style="stop-color:#737373" + offset="1" /> + </linearGradient> + <linearGradient + x1="785.84003" + y1="72.989998" + x2="785.26001" + y2="76.279999" + id="lg5871" + xlink:href="#g3293_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.204,0,0,1.263,-926.036,-60.001)" /> + <linearGradient + x1="789.37" + y1="69.879997" + x2="791.03998" + y2="77.120003" + id="g3292_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#999;stop-opacity:1" + offset="0" + id="s6403" /> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="0.28" + id="s6405" /> + <stop + style="stop-color:#666;stop-opacity:1" + offset="1" + id="s6407" /> + <a:midPointstop + style="stop-color:#999999" + offset="0" /> + <a:midPointstop + style="stop-color:#999999" + offset="0.5" /> + <a:midPointstop + style="stop-color:#F2F2F2" + offset="0.28" /> + <a:midPointstop + style="stop-color:#F2F2F2" + offset="0.5" /> + <a:midPointstop + style="stop-color:#666666" + offset="1" /> + </linearGradient> + <linearGradient + x1="789.37" + y1="69.879997" + x2="791.03998" + y2="77.120003" + id="lg5874" + xlink:href="#g3292_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.204,0,0,1.263,-926.036,-60.001)" /> + <linearGradient + x1="786.65997" + y1="136.12" + x2="786.71002" + y2="134.33" + id="g3290_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,-0.25,0,1,0,137.29)"> + <stop + style="stop-color:#d9d9d9;stop-opacity:1" + offset="0" + id="s6380" /> + <stop + style="stop-color:#b2b2b2;stop-opacity:1" + offset="1" + id="s6382" /> + <a:midPointstop + style="stop-color:#D9D9D9" + offset="0" /> + <a:midPointstop + style="stop-color:#D9D9D9" + offset="0.5" /> + <a:midPointstop + style="stop-color:#B2B2B2" + offset="1" /> + </linearGradient> + <linearGradient + x1="786.65997" + y1="136.12" + x2="786.71002" + y2="134.33" + id="lg5878" + xlink:href="#g3290_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.204,-0.316,0,1.263,-926.036,113.351)" /> + <radialGradient + cx="1458.77" + cy="-5.0999999" + r="35.130001" + fx="1458.77" + fy="-5.0999999" + id="g3289_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.42,0,0,0.42,167.09,79.84)"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="s6371" /> + <stop + style="stop-color:#999;stop-opacity:1" + offset="1" + id="s6373" /> + <a:midPointstop + style="stop-color:#FFFFFF" + offset="0" /> + <a:midPointstop + style="stop-color:#FFFFFF" + offset="0.5" /> + <a:midPointstop + style="stop-color:#999999" + offset="1" /> + </radialGradient> + <radialGradient + cx="1458.77" + cy="-5.0999999" + r="35.130001" + fx="1458.77" + fy="-5.0999999" + id="rg5881" + xlink:href="#g3289_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.505,0,0,0.53,-724.957,40.636)" /> + <radialGradient + cx="1612.98" + cy="-4.4699998" + r="36.580002" + fx="1612.98" + fy="-4.4699998" + id="g3288_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.34,0,0,0.36,238.56,86.87)"> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="0" + id="s6362" /> + <stop + style="stop-color:#b2b2b2;stop-opacity:1" + offset="0.63999999" + id="s6364" /> + <stop + style="stop-color:#737373;stop-opacity:1" + offset="1" + id="s6366" /> + <a:midPointstop + style="stop-color:#E5E5E5" + offset="0" /> + <a:midPointstop + style="stop-color:#E5E5E5" + offset="0.5" /> + <a:midPointstop + style="stop-color:#B2B2B2" + offset="0.64" /> + <a:midPointstop + style="stop-color:#B2B2B2" + offset="0.5" /> + <a:midPointstop + style="stop-color:#737373" + offset="1" /> + </radialGradient> + <radialGradient + cx="1612.98" + cy="-4.4699998" + r="36.580002" + fx="1612.98" + fy="-4.4699998" + id="rg5884" + xlink:href="#g3288_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.408,0,0,0.448,-638.943,49.495)" /> + <radialGradient + cx="1470.5" + cy="-10.21" + r="33.290001" + fx="1470.5" + fy="-10.21" + id="g3287_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.42,0,0,0.42,167.09,79.84)"> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="0" + id="s6347" /> + <stop + style="stop-color:#b2b2b2;stop-opacity:1" + offset="0.38999999" + id="s6349" /> + <stop + style="stop-color:#b1b1b1;stop-opacity:1" + offset="0.75" + id="s6351" /> + <stop + style="stop-color:#aaa;stop-opacity:1" + offset="0.88" + id="s6353" /> + <stop + style="stop-color:#9e9e9e;stop-opacity:1" + offset="0.97000003" + id="s6355" /> + <stop + style="stop-color:#999;stop-opacity:1" + offset="1" + id="s6357" /> + <a:midPointstop + style="stop-color:#E5E5E5" + offset="0" /> + <a:midPointstop + style="stop-color:#E5E5E5" + offset="0.5" /> + <a:midPointstop + style="stop-color:#B2B2B2" + offset="0.39" /> + <a:midPointstop + style="stop-color:#B2B2B2" + offset="0.87" /> + <a:midPointstop + style="stop-color:#999999" + offset="1" /> + </radialGradient> + <radialGradient + cx="1470.5" + cy="-10.21" + r="33.290001" + fx="1470.5" + fy="-10.21" + id="rg5887" + xlink:href="#g3287_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.505,0,0,0.53,-724.957,40.636)" /> + <pattern + patternTransform="matrix(0.592927,0,0,0.592927,78,462)" + id="cream-spots" + height="32" + width="32" + patternUnits="userSpaceOnUse"> + <g + transform="translate(-365.3146,-513.505)" + id="g3047"> + id="path2858" /> + <path + inkscape:label="#path2854" + sodipodi:nodetypes="czzzz" + style="fill:#e3dcc0" + id="path3060" + d="M 390.31462,529.50504 C 390.31462,534.47304 386.28262,538.50504 381.31462,538.50504 C 376.34662,538.50504 372.31462,534.47304 372.31462,529.50504 C 372.31462,524.53704 376.34662,520.50504 381.31462,520.50504 C 386.28262,520.50504 390.31462,524.53704 390.31462,529.50504 z " /> +</g> + </pattern> + <pattern + patternTransform="matrix(0.733751,0,0,0.733751,67,367)" + id="dark-cream-spots" + height="32" + width="32" + patternUnits="userSpaceOnUse"> + <g + transform="translate(-408.0946,-513.505)" + id="dark-cream-spot" + inkscape:label="#g3043"> + <path + sodipodi:nodetypes="czzzz" + style="fill:#c8c5ac" + d="M 433.09458,529.50504 C 433.09458,534.47304 429.06258,538.50504 424.09458,538.50504 C 419.12658,538.50504 415.09458,534.47304 415.09458,529.50504 C 415.09458,524.53704 419.12658,520.50504 424.09458,520.50504 C 429.06258,520.50504 433.09458,524.53704 433.09458,529.50504 z " + id="path2953" /> + </g> + </pattern> + <pattern + patternTransform="matrix(0.375,0,0,0.375,379,400)" + id="white-spots" + height="32" + width="32" + patternUnits="userSpaceOnUse"> + <g + transform="translate(-484.3997,-513.505)" + id="white-spot" + inkscape:label="#g3035"> + <path + style="opacity:0.25;fill:white" + id="path3033" + d="M 509.39967,529.50504 C 509.39967,534.47304 505.36767,538.50504 500.39967,538.50504 C 495.43167,538.50504 491.39967,534.47304 491.39967,529.50504 C 491.39967,524.53704 495.43167,520.50504 500.39967,520.50504 C 505.36767,520.50504 509.39967,524.53704 509.39967,529.50504 z " + sodipodi:nodetypes="czzzz" /> + </g> + </pattern> + <pattern + patternTransform="matrix(0.455007,0,0,0.455007,-5e-5,1.9e-5)" + id="black-spots" + height="32" + width="32" + patternUnits="userSpaceOnUse"> + <g + transform="translate(-448.3997,-513.505)" + id="black-spot" + inkscape:label="#g3039"> + <path + sodipodi:nodetypes="czzzz" + d="M 473.39967,529.50504 C 473.39967,534.47304 469.36767,538.50504 464.39967,538.50504 C 459.43167,538.50504 455.39967,534.47304 455.39967,529.50504 C 455.39967,524.53704 459.43167,520.50504 464.39967,520.50504 C 469.36767,520.50504 473.39967,524.53704 473.39967,529.50504 z " + id="path2961" + style="opacity:0.25;fill:black" /> + </g> + </pattern> + <linearGradient + x1="501.0903" + y1="-19.2544" + x2="531.85413" + y2="0.72390002" + id="linearGradient17334" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)"> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0" + id="stop17336" /> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0.51120001" + id="stop17338" /> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0.64609998" + id="stop17340" /> + <stop + style="stop-color:#16336e;stop-opacity:1" + offset="1" + id="stop17342" /> + <a:midPointStop + offset="0" + style="stop-color:#B4DAEA" /> + <a:midPointStop + offset="0.5" + style="stop-color:#B4DAEA" /> + <a:midPointStop + offset="0.5112" + style="stop-color:#B4DAEA" /> + <a:midPointStop + offset="0.5" + style="stop-color:#B4DAEA" /> + <a:midPointStop + offset="0.6461" + style="stop-color:#5387BA" /> + <a:midPointStop + offset="0.5" + style="stop-color:#5387BA" /> + <a:midPointStop + offset="1" + style="stop-color:#16336E" /> + </linearGradient> + <linearGradient + x1="415.73831" + y1="11.854" + x2="418.13361" + y2="18.8104" + id="linearGradient17426" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.8362,0.5206,-1.1904,0.992,147.62,-30.9374)"> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="0" + id="stop17428" /> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="1" + id="stop17430" /> + <a:midPointStop + offset="0" + style="stop-color:#CCCCCC" /> + <a:midPointStop + offset="0.5" + style="stop-color:#CCCCCC" /> + <a:midPointStop + offset="1" + style="stop-color:#F2F2F2" /> + </linearGradient> + <linearGradient + x1="478.21341" + y1="-131.9297" + x2="469.85818" + y2="-140.28481" + id="linearGradient17434" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.5592,0.829,-0.829,0.5592,101.3357,-104.791)"> + <stop + style="stop-color:#f3403f;stop-opacity:1" + offset="0" + id="stop17436" /> + <stop + style="stop-color:#d02a28;stop-opacity:1" + offset="0.37889999" + id="stop17438" /> + <stop + style="stop-color:#b21714;stop-opacity:1" + offset="0.77649999" + id="stop17440" /> + <stop + style="stop-color:#a6100c;stop-opacity:1" + offset="1" + id="stop17442" /> + <a:midPointStop + offset="0" + style="stop-color:#F3403F" /> + <a:midPointStop + offset="0.4213" + style="stop-color:#F3403F" /> + <a:midPointStop + offset="1" + style="stop-color:#A6100C" /> + </linearGradient> + <linearGradient + x1="502.70749" + y1="115.3013" + x2="516.39001" + y2="127.1953" + id="linearGradient17709" + xlink:href="#XMLID_1749_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9703,0.2419,-0.2419,0.9703,11.0227,-35.6159)" /> + <linearGradient + x1="506.09909" + y1="-11.5137" + x2="527.99609" + y2="2.7063999" + id="linearGradient17711" + xlink:href="#XMLID_1752_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" /> + <linearGradient + x1="516.57672" + y1="-15.769" + x2="516.57672" + y2="0.84280002" + id="linearGradient17713" + xlink:href="#XMLID_1753_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" /> + <linearGradient + x1="505.62939" + y1="-14.9526" + x2="527.49402" + y2="-0.7536" + id="linearGradient17715" + xlink:href="#XMLID_1756_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" /> + <linearGradient + x1="500.70749" + y1="-13.2441" + x2="513.46442" + y2="-2.1547" + id="linearGradient17717" + xlink:href="#XMLID_1757_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" /> + <linearGradient + x1="473.7681" + y1="209.17529" + x2="486.98099" + y2="213.2001" + id="linearGradient17721" + xlink:href="#XMLID_2274_" + gradientUnits="userSpaceOnUse" /> + <linearGradient + x1="481.23969" + y1="212.5742" + x2="472.92981" + y2="207.4967" + id="linearGradient17723" + xlink:href="#XMLID_2275_" + gradientUnits="userSpaceOnUse" /> + <linearGradient + x1="500.70749" + y1="-13.2441" + x2="513.46442" + y2="-2.1547" + id="linearGradient17416" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)"> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0" + id="stop17418" /> + <stop + style="stop-color:#96bad6;stop-opacity:1" + offset="1" + id="stop17420" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#96BAD6" + offset="1" /> + </linearGradient> + <defs + id="defs9929"> + <path + d="M 489.21,209.35 L 485.35,203.63 C 483.63,204.25 473.47,208.93 471.5,210.18 C 470.57,210.77 470.17,211.16 469.72,212.48 C 470.93,212.31 471.72,212.49 473.42,213.04 C 473.26,214.77 473.24,215.74 473.57,218.2 C 474.01,216.88 474.41,216.49 475.34,215.9 C 477.33,214.65 487.49,209.97 489.21,209.35 z " + id="XMLID_960_" /> + </defs> + <clipPath + id="clipPath17448"> + <use + id="use17450" + x="0" + y="0" + width="744.09448" + height="600" + xlink:href="#XMLID_960_" /> + </clipPath> + <linearGradient + x1="473.7681" + y1="209.17529" + x2="486.98099" + y2="213.2001" + id="linearGradient17452" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#f3403f;stop-opacity:1" + offset="0" + id="stop17454" /> + <stop + style="stop-color:#d02a28;stop-opacity:1" + offset="0.37889999" + id="stop17456" /> + <stop + style="stop-color:#b21714;stop-opacity:1" + offset="0.77649999" + id="stop17458" /> + <stop + style="stop-color:#a6100c;stop-opacity:1" + offset="1" + id="stop17460" /> + <a:midPointStop + style="stop-color:#F3403F" + offset="0" /> + <a:midPointStop + style="stop-color:#F3403F" + offset="0.4213" /> + <a:midPointStop + style="stop-color:#A6100C" + offset="1" /> + </linearGradient> + <linearGradient + x1="481.23969" + y1="212.5742" + x2="472.92981" + y2="207.4967" + id="linearGradient17463" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#f3403f;stop-opacity:1" + offset="0" + id="stop17465" /> + <stop + style="stop-color:#d02a28;stop-opacity:1" + offset="0.37889999" + id="stop17467" /> + <stop + style="stop-color:#b21714;stop-opacity:1" + offset="0.77649999" + id="stop17469" /> + <stop + style="stop-color:#a6100c;stop-opacity:1" + offset="1" + id="stop17471" /> + <a:midPointStop + style="stop-color:#F3403F" + offset="0" /> + <a:midPointStop + style="stop-color:#F3403F" + offset="0.4213" /> + <a:midPointStop + style="stop-color:#A6100C" + offset="1" /> + </linearGradient> + <linearGradient + x1="481.23969" + y1="212.5742" + x2="472.92981" + y2="207.4967" + id="linearGradient17807" + xlink:href="#XMLID_2275_" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-177.1654,35.43307)" /> + <linearGradient + x1="473.7681" + y1="209.17529" + x2="486.98099" + y2="213.2001" + id="linearGradient17810" + xlink:href="#XMLID_2274_" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-177.1654,35.43307)" /> + <linearGradient + x1="502.70749" + y1="115.3013" + x2="516.39001" + y2="127.1953" + id="linearGradient17812" + xlink:href="#XMLID_1749_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9703,0.2419,-0.2419,0.9703,11.0227,-35.6159)" /> + <linearGradient + x1="506.09909" + y1="-11.5137" + x2="527.99609" + y2="2.7063999" + id="linearGradient17814" + xlink:href="#XMLID_1752_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" /> + <linearGradient + x1="516.57672" + y1="-15.769" + x2="516.57672" + y2="0.84280002" + id="linearGradient17816" + xlink:href="#XMLID_1753_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" /> + <linearGradient + x1="505.62939" + y1="-14.9526" + x2="527.49402" + y2="-0.7536" + id="linearGradient17818" + xlink:href="#XMLID_1756_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" /> + <linearGradient + x1="502.70749" + y1="115.3013" + x2="516.39001" + y2="127.1953" + id="linearGradient17347" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9703,0.2419,-0.2419,0.9703,11.0227,-35.6159)"> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0" + id="stop17349" /> + <stop + style="stop-color:#96bad6;stop-opacity:1" + offset="1" + id="stop17351" /> + <a:midPointStop + offset="0" + style="stop-color:#5387BA" /> + <a:midPointStop + offset="0.5" + style="stop-color:#5387BA" /> + <a:midPointStop + offset="1" + style="stop-color:#96BAD6" /> + </linearGradient> + <linearGradient + x1="516.57672" + y1="-15.769" + x2="516.57672" + y2="0.84280002" + id="linearGradient17379" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)"> + <stop + style="stop-color:#b2b2b2;stop-opacity:1" + offset="0" + id="stop17381" /> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="1" + id="stop17383" /> + <a:midPointStop + offset="0" + style="stop-color:#B2B2B2" /> + <a:midPointStop + offset="0.5" + style="stop-color:#B2B2B2" /> + <a:midPointStop + offset="1" + style="stop-color:#F2F2F2" /> + </linearGradient> + <linearGradient + x1="502.70749" + y1="115.3013" + x2="516.39001" + y2="127.1953" + id="linearGradient17862" + xlink:href="#XMLID_1749_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9703,0.2419,-0.2419,0.9703,-166.1427,-0.18283)" /> + <linearGradient + x1="505.62939" + y1="-14.9526" + x2="527.49402" + y2="-0.7536" + id="linearGradient17864" + xlink:href="#XMLID_1756_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" /> + <defs + id="defs3859"> + <polygon + points="465.54,213.52 481.94,217.46 482.74,216.71 487.46,198.05 471.08,194.07 470.26,194.83 465.54,213.52 " + id="XMLID_343_" /> + </defs> + <linearGradient + x1="471.0806" + y1="201.07761" + x2="481.91711" + y2="210.4977" + id="linearGradient17389" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#6498c1;stop-opacity:1" + offset="0.005618" + id="stop17391" /> + <stop + style="stop-color:#79a9cc;stop-opacity:1" + offset="0.2332" + id="stop17393" /> + <stop + style="stop-color:#a4cde2;stop-opacity:1" + offset="0.74049997" + id="stop17395" /> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="1" + id="stop17397" /> + <a:midPointStop + style="stop-color:#6498C1" + offset="5.618000e-003" /> + <a:midPointStop + style="stop-color:#6498C1" + offset="0.4438" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="1" /> + </linearGradient> + <clipPath + id="clipPath17400"> + <use + id="use17402" + x="0" + y="0" + width="744.09448" + height="600" + xlink:href="#XMLID_343_" /> + </clipPath> + <linearGradient + x1="505.62939" + y1="-14.9526" + x2="527.49402" + y2="-0.7536" + id="linearGradient17404" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)"> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0" + id="stop17406" /> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0.51120001" + id="stop17408" /> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0.64609998" + id="stop17410" /> + <stop + style="stop-color:#16336e;stop-opacity:1" + offset="1" + id="stop17412" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5112" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.6461" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#16336E" + offset="1" /> + </linearGradient> + <linearGradient + x1="506.09909" + y1="-11.5137" + x2="527.99609" + y2="2.7063999" + id="linearGradient17882" + xlink:href="#XMLID_1752_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" /> + <defs + id="defs3826"> + <polygon + points="463.52,216.14 480.56,220.24 481.36,219.5 483.03,202.04 469.05,196.69 468.24,197.45 463.52,216.14 " + id="XMLID_338_" /> + </defs> + <linearGradient + x1="468.2915" + y1="204.7612" + x2="479.39871" + y2="214.4166" + id="linearGradient17357" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0" + id="stop17359" /> + <stop + style="stop-color:#96bad6;stop-opacity:1" + offset="1" + id="stop17361" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#96BAD6" + offset="1" /> + </linearGradient> + <clipPath + id="clipPath17364"> + <use + id="use17366" + x="0" + y="0" + width="744.09448" + height="600" + xlink:href="#XMLID_338_" /> + </clipPath> + <linearGradient + x1="506.09909" + y1="-11.5137" + x2="527.99609" + y2="2.7063999" + id="linearGradient17368" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)"> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0" + id="stop17370" /> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0.51120001" + id="stop17372" /> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0.64609998" + id="stop17374" /> + <stop + style="stop-color:#16336e;stop-opacity:1" + offset="1" + id="stop17376" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5112" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.6461" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#16336E" + offset="1" /> + </linearGradient> + <linearGradient + x1="296.4996" + y1="188.81061" + x2="317.32471" + y2="209.69398" + id="linearGradient2387" + xlink:href="#linearGradient2381" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.90776,0,0,0.90776,24.35648,49.24131)" /> + <linearGradient + x1="296.4996" + y1="188.81061" + x2="317.32471" + y2="209.69398" + id="linearGradient5105" + xlink:href="#linearGradient2381" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.90776,0,0,0.90776,24.35648,49.24131)" /> + <linearGradient + x1="296.4996" + y1="188.81061" + x2="317.32471" + y2="209.69398" + id="linearGradient5145" + xlink:href="#linearGradient2381" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.90776,0,0,0.90776,24.35648,49.24131)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2381" + id="linearGradient2371" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.90776,0,0,0.90776,24.35648,49.24131)" + x1="296.4996" + y1="188.81061" + x2="317.32471" + y2="209.69398" /> + </defs> + <g + transform="matrix(0.437808,-0.437808,0.437808,0.437808,-220.8237,43.55311)" + id="g5089"> + <path + d="M 8.4382985,-6.28125 C 7.8309069,-6.28125 4.125,-0.33238729 4.125,1.96875 L 4.125,28.6875 C 4.125,29.533884 4.7068159,29.8125 5.28125,29.8125 L 30.84375,29.8125 C 31.476092,29.8125 31.968751,29.319842 31.96875,28.6875 L 31.96875,23.46875 L 32.25,23.46875 C 32.74684,23.46875 33.156249,23.059339 33.15625,22.5625 L 33.15625,-5.375 C 33.15625,-5.8718398 32.74684,-6.28125 32.25,-6.28125 L 8.4382985,-6.28125 z " + transform="translate(282.8327,227.1903)" + style="fill:#5c5c4f;stroke:black;stroke-width:3.23021388;stroke-miterlimit:4;stroke-dasharray:none" + id="path5091" /> + <rect + width="27.85074" + height="29.369793" + rx="1.1414107" + ry="1.1414107" + x="286.96509" + y="227.63805" + style="fill:#032c87" + id="rect5093" /> + <path + d="M 288.43262,225.43675 L 313.67442,225.43675 L 313.67442,254.80655 L 287.29827,254.83069 L 288.43262,225.43675 z " + style="fill:white" + id="rect5095" /> + <path + d="M 302.44536,251.73726 C 303.83227,259.59643 301.75225,263.02091 301.75225,263.02091 C 303.99609,261.41329 305.71651,259.54397 306.65747,257.28491 C 307.62455,259.47755 308.49041,261.71357 310.9319,263.27432 C 310.9319,263.27432 309.33686,256.07392 309.22047,251.73726 L 302.44536,251.73726 z " + style="fill:#a70000;fill-opacity:1;stroke-width:2" + id="path5097" /> + <rect + width="25.241802" + height="29.736675" + rx="0.89682275" + ry="0.89682275" + x="290.73544" + y="220.92249" + style="fill:#809cc9" + id="rect5099" /> + <path + d="M 576.47347,725.93939 L 582.84431,726.35441 L 583.25121,755.8725 C 581.35919,754.55465 576.39694,752.1117 574.98889,754.19149 L 574.98889,727.42397 C 574.98889,726.60151 575.65101,725.93939 576.47347,725.93939 z " + transform="matrix(0.499065,-0.866565,0,1,0,0)" + style="fill:#4573b3;fill-opacity:1" + id="rect5101" /> + <path + d="M 293.2599,221.89363 L 313.99908,221.89363 C 314.45009,221.89363 314.81318,222.25673 314.81318,222.70774 C 315.02865,229.0361 295.44494,244.47124 292.44579,240.30491 L 292.44579,222.70774 C 292.44579,222.25673 292.80889,221.89363 293.2599,221.89363 z " + style="opacity:0.65536726;fill:url(#linearGradient2371);fill-opacity:1" + id="path5103" /> + </g> +</svg> Added: trunk/openshift/docs/reference/en-US/master.xml =================================================================== --- trunk/openshift/docs/reference/en-US/master.xml (rev 0) +++ trunk/openshift/docs/reference/en-US/master.xml 2011-11-29 06:32:04 UTC (rev 36716) @@ -0,0 +1,53 @@ +<?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" + +[<!ENTITY Preface SYSTEM "Preface.xml"> +<!ENTITY Introduction SYSTEM "Introduction.xml"> +<!ENTITY Revision_History SYSTEM "Revision_History.xml"> +]> + +<book> + + <bookinfo> + <title>OpenShift Tools Reference Guide</title> + <corpauthor> + <inlinemediaobject> + <imageobject role="fo"> + <imagedata format="PNG" fileref="images/jbosstools_logo.png" /> + </imageobject> + <imageobject role="html"> + <imagedata/> + </imageobject> + </inlinemediaobject> + </corpauthor> + + <author> + <firstname>Isaac</firstname> + <surname>Rooskov</surname> + <email>irooskov(a)redhat.com</email> + </author> + + <copyright> + <year>2011</year> + <holder>JBoss by Red Hat</holder> + </copyright> + <releaseinfo> + Version: 3.3.0.GA + </releaseinfo> + + + + </bookinfo> + + <toc/> +  + &Introduction; + &Revision_History; + +</book>

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r36715 - in trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui: marker and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2011-11-28 21:13:46 -0500 (Mon, 28 Nov 2011) New Revision: 36715 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/JsfUIMessages.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/marker/DisableFaceletHTMLValidatorMarkerResolution.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/marker/DisableFaceletHTMLValidatorResolutionGenerator.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/messages.properties Log: "Disable Facelet HTML Validator" quick fix https://issues.jboss.org/browse/JBIDE-9366 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/JsfUIMessages.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/JsfUIMessages.java 2011-11-29 00:25:23 UTC (rev 36714) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/JsfUIMessages.java 2011-11-29 02:13:46 UTC (rev 36715) @@ -48,8 +48,10 @@ public static String MESSAGES_FILE_RENAME_PARTICIPANT_UPDATE_MESSAGE_BUNDLE_REFERENCES; public static String MESSAGES_FILE_RENAME_PARTICIPANT_FILE_NAME_SHOULD_BE_WITH_THE_SAME_EXTENSION; - public static String DISABLE_FACELET_HTML_VALIDATOR_MARKER_RESOLUTION_FOR_WORKSPACE; - public static String DISABLE_FACELET_HTML_VALIDATOR_MARKER_RESOLUTION_FOR_PROJECT; + public static String DISABLE_FACELET_HTML_VALIDATOR_MARKER_RESOLUTION_TITLE; + public static String DISABLE_FACELET_HTML_VALIDATOR_MARKER_RESOLUTION_MESSAGE; + public static String DISABLE_FACELET_HTML_VALIDATOR_MARKER_RESOLUTION_WORKSPACE_QUESTION; + public static String DISABLE_FACELET_HTML_VALIDATOR_MARKER_RESOLUTION_PROJECT_QUESTION; static { // initialize resource bundle Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/marker/DisableFaceletHTMLValidatorMarkerResolution.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/marker/DisableFaceletHTMLValidatorMarkerResolution.java 2011-11-29 00:25:23 UTC (rev 36714) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/marker/DisableFaceletHTMLValidatorMarkerResolution.java 2011-11-29 02:13:46 UTC (rev 36715) @@ -16,9 +16,13 @@ import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IMarkerResolution2; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PlatformUI; import org.eclipse.wst.validation.IMutableValidator; import org.eclipse.wst.validation.MutableProjectSettings; import org.eclipse.wst.validation.MutableWorkspaceSettings; @@ -33,54 +37,90 @@ IMarkerResolution2 { private static final String MARKER_TYPE = "org.eclipse.jst.jsf.facelet.ui.FaceletValidationMarker"; private IFile file; - private boolean global; + private boolean forProject; private String label; - public DisableFaceletHTMLValidatorMarkerResolution(IFile file, boolean global){ + public DisableFaceletHTMLValidatorMarkerResolution(IFile file, boolean forProject){ this.file = file; - this.global = global; - if(global){ - label = JsfUIMessages.DISABLE_FACELET_HTML_VALIDATOR_MARKER_RESOLUTION_FOR_WORKSPACE; - }else{ - label = NLS.bind(JsfUIMessages.DISABLE_FACELET_HTML_VALIDATOR_MARKER_RESOLUTION_FOR_PROJECT, file.getProject().getName()); - } + this.forProject = forProject; + label = JsfUIMessages.DISABLE_FACELET_HTML_VALIDATOR_MARKER_RESOLUTION_TITLE; } public String getLabel() { return label; } + + public static Shell getShell() { + IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); + if (window == null) { + IWorkbenchWindow[] windows = PlatformUI.getWorkbench().getWorkbenchWindows(); + if (windows.length > 0) { + return windows[0].getShell(); + } + } + else { + return window.getShell(); + } + return null; + } public void run(IMarker marker) { + MessageDialog dialog = null; + if(forProject){ + dialog = new MessageDialog(getShell(), label, null, + NLS.bind(JsfUIMessages.DISABLE_FACELET_HTML_VALIDATOR_MARKER_RESOLUTION_MESSAGE, file.getName())+ + NLS.bind(JsfUIMessages.DISABLE_FACELET_HTML_VALIDATOR_MARKER_RESOLUTION_PROJECT_QUESTION, file.getProject().getName()), + MessageDialog.QUESTION_WITH_CANCEL, + new String[]{"Cancel", "Workspace", file.getProject().getName()}, + 0); + }else{ + dialog = new MessageDialog(getShell(), label, null, + NLS.bind(JsfUIMessages.DISABLE_FACELET_HTML_VALIDATOR_MARKER_RESOLUTION_MESSAGE, file.getName())+ + JsfUIMessages.DISABLE_FACELET_HTML_VALIDATOR_MARKER_RESOLUTION_WORKSPACE_QUESTION, + MessageDialog.QUESTION_WITH_CANCEL, + new String[]{"Cancel", "Ok"}, + 0); + + } + int result = dialog.open(); + if(result == 1){ + disableOnWorkspace(); + }else if(result == 2){ + disableOnProject(); + } + } + + private void disableOnWorkspace(){ IMutableValidator[] validators; - if(global){ - try { - MutableWorkspaceSettings workspaceSettings = ValidationFramework.getDefault().getWorkspaceSettings(); - validators = workspaceSettings.getValidators(); - if(disableValidator(validators, DisableFaceletHTMLValidatorResolutionGenerator.VALIDATOR_ID)){ - ValidationFramework.getDefault().applyChanges(workspaceSettings, true); - try { - file.getProject().getParent().deleteMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE); - } catch (CoreException e) { - JsfUiPlugin.getPluginLog().logError(e); - } - } - } catch (InvocationTargetException e) { - JsfUiPlugin.getPluginLog().logError(e); - } - }else{ - MutableProjectSettings projectSettings = ValidationFramework.getDefault().getProjectSettings(file.getProject()); - validators = projectSettings.getValidators(); + try { + MutableWorkspaceSettings workspaceSettings = ValidationFramework.getDefault().getWorkspaceSettings(); + validators = workspaceSettings.getValidators(); if(disableValidator(validators, DisableFaceletHTMLValidatorResolutionGenerator.VALIDATOR_ID)){ - ValidationFramework.getDefault().applyChanges(projectSettings, true); + ValidationFramework.getDefault().applyChanges(workspaceSettings, true); try { - file.getProject().deleteMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE); + file.getProject().getParent().deleteMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE); } catch (CoreException e) { JsfUiPlugin.getPluginLog().logError(e); } } + } catch (InvocationTargetException e) { + JsfUiPlugin.getPluginLog().logError(e); } } + private void disableOnProject(){ + MutableProjectSettings projectSettings = ValidationFramework.getDefault().getProjectSettings(file.getProject()); + IMutableValidator[] validators = projectSettings.getValidators(); + if(disableValidator(validators, DisableFaceletHTMLValidatorResolutionGenerator.VALIDATOR_ID)){ + ValidationFramework.getDefault().applyChanges(projectSettings, true); + try { + file.getProject().deleteMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE); + } catch (CoreException e) { + JsfUiPlugin.getPluginLog().logError(e); + } + } + } + public static boolean disableValidator(IMutableValidator[] validators, String id){ IMutableValidator validator = findValidator(validators, id); if(validator != null){ Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/marker/DisableFaceletHTMLValidatorResolutionGenerator.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/marker/DisableFaceletHTMLValidatorResolutionGenerator.java 2011-11-29 00:25:23 UTC (rev 36714) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/marker/DisableFaceletHTMLValidatorResolutionGenerator.java 2011-11-29 02:13:46 UTC (rev 36715) @@ -11,7 +11,6 @@ package org.jboss.tools.jsf.ui.marker; import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker; @@ -32,27 +31,27 @@ public static final String VALIDATOR_ID = "org.eclipse.jst.jsf.facelet.ui.FaceletHTMLValidator"; public IMarkerResolution[] getResolutions(IMarker marker) { - ArrayList<IMarkerResolution> resolutions = new ArrayList<IMarkerResolution>(); if(isNeedToCreate(marker)){ + boolean forProject = false; IFile file = (IFile)marker.getResource(); IMutableValidator[] validators; - + MutableProjectSettings projectSettings = ValidationFramework.getDefault().getProjectSettings(file.getProject()); + validators = projectSettings.getValidators(); + if(DisableFaceletHTMLValidatorMarkerResolution.findValidator(validators, VALIDATOR_ID) != null){ + forProject = true; + } try { MutableWorkspaceSettings workspaceSettings = ValidationFramework.getDefault().getWorkspaceSettings(); validators = workspaceSettings.getValidators(); if(DisableFaceletHTMLValidatorMarkerResolution.findValidator(validators, VALIDATOR_ID) != null){ - resolutions.add(new DisableFaceletHTMLValidatorMarkerResolution((IFile)marker.getResource(), true)); + return new IMarkerResolution[] {new DisableFaceletHTMLValidatorMarkerResolution((IFile)marker.getResource(), forProject)}; } } catch (InvocationTargetException e) { JsfUiPlugin.getPluginLog().logError(e); } - MutableProjectSettings projectSettings = ValidationFramework.getDefault().getProjectSettings(file.getProject()); - validators = projectSettings.getValidators(); - if(DisableFaceletHTMLValidatorMarkerResolution.findValidator(validators, VALIDATOR_ID) != null){ - resolutions.add(new DisableFaceletHTMLValidatorMarkerResolution((IFile)marker.getResource(), false)); - } + } - return resolutions.toArray(new IMarkerResolution[] {}); + return new IMarkerResolution[] {}; } private boolean isNeedToCreate(IMarker marker){ Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/messages.properties =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/messages.properties 2011-11-29 00:25:23 UTC (rev 36714) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/messages.properties 2011-11-29 02:13:46 UTC (rev 36715) @@ -36,5 +36,7 @@ SKIP_BUTTON_LABEL=Skip MESSAGES_FILE_RENAME_PARTICIPANT_UPDATE_MESSAGE_BUNDLE_REFERENCES=Update Message Bundle References MESSAGES_FILE_RENAME_PARTICIPANT_FILE_NAME_SHOULD_BE_WITH_THE_SAME_EXTENSION=New file name should be with the same extension -DISABLE_FACELET_HTML_VALIDATOR_MARKER_RESOLUTION_FOR_WORKSPACE=Disable Facelet HTML Validator for Workspace -DISABLE_FACELET_HTML_VALIDATOR_MARKER_RESOLUTION_FOR_PROJECT=Disable Facelet HTML Validator for ''{0}'' project \ No newline at end of file +DISABLE_FACELET_HTML_VALIDATOR_MARKER_RESOLUTION_TITLE=Disable Facelet HTML Validator +DISABLE_FACELET_HTML_VALIDATOR_MARKER_RESOLUTION_MESSAGE=The Facelet HTML Validator has a problem validating file ''{0}''.\nThis might happen, because you are using a new framework or framework specific features that the validator does not yet support.\nIf that''s the case and you do not wish to see these markers and you are ok with no other validation to occur the validator can be disabled.\n\n +DISABLE_FACELET_HTML_VALIDATOR_MARKER_RESOLUTION_WORKSPACE_QUESTION=Do you wish to disable the validator on the Workspace? +DISABLE_FACELET_HTML_VALIDATOR_MARKER_RESOLUTION_PROJECT_QUESTION=Do you wish to disable the validator on the Workspace or only on the project ''{1}''? \ No newline at end of file

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r36714 - trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-11-28 19:25:23 -0500 (Mon, 28 Nov 2011) New Revision: 36714 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFSeverityPreferencesMessages.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFSeverityPreferencesMessages.properties trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFValidationConfigurationBlock.java Log: JBIDE-10190 https://issues.jboss.org/browse/JBIDE-10190 Partially migrated validation for faces-config.xml. Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFSeverityPreferencesMessages.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFSeverityPreferencesMessages.java 2011-11-28 21:28:12 UTC (rev 36713) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFSeverityPreferencesMessages.java 2011-11-29 00:25:23 UTC (rev 36714) @@ -30,6 +30,54 @@ public static String JSFValidationConfigurationBlock_pb_unknownComponent_label; public static String JSFValidationConfigurationBlock_pb_unknownAttribute_label; + //Faces Config + public static String JSFValidationConfigurationBlock_section_faces_config; + ////Context Param + public static String JSFValidationConfigurationBlock_section_context_param; + public static String JSFValidationConfigurationBlock_pb_invalidConfigFiles_label; + ////Application + public static String JSFValidationConfigurationBlock_section_application; + public static String JSFValidationConfigurationBlock_pb_invalidActionListener_label; + public static String JSFValidationConfigurationBlock_pb_invalidNavigationHandler_label; + public static String JSFValidationConfigurationBlock_pb_invalidPropertyResolver_label; + public static String JSFValidationConfigurationBlock_pb_invalidStateManager_label; + public static String JSFValidationConfigurationBlock_pb_invalidVariableResolver_label; + ////Component + public static String JSFValidationConfigurationBlock_section_component; + public static String JSFValidationConfigurationBlock_pb_invalidComponentClass_label; + ////Converter + public static String JSFValidationConfigurationBlock_section_converter; + public static String JSFValidationConfigurationBlock_pb_invalidConverterClass_label; + public static String JSFValidationConfigurationBlock_pb_invalidConverterForClass_label; + ////Factory + public static String JSFValidationConfigurationBlock_section_factory; + public static String JSFValidationConfigurationBlock_pb_invalidApplicationFactory_label; + public static String JSFValidationConfigurationBlock_pb_invalidFacesContextFactory_label; + public static String JSFValidationConfigurationBlock_pb_invalidLifecycleFactory_label; + public static String JSFValidationConfigurationBlock_pb_invalidRenderKitFactory_label; + ////List & Map Entries + public static String JSFValidationConfigurationBlock_section_entries; + public static String JSFValidationConfigurationBlock_pb_invalidKeyClass_label; + public static String JSFValidationConfigurationBlock_pb_invalidValueClass_label; + ////Managed & Referenced Bean + public static String JSFValidationConfigurationBlock_section_bean; + public static String JSFValidationConfigurationBlock_pb_invalidBeanClass_label; + public static String JSFValidationConfigurationBlock_pb_invalidPropertyClass_label; + ////Navigation Rules + public static String JSFValidationConfigurationBlock_section_navigation; + public static String JSFValidationConfigurationBlock_pb_invalidFromViewId_label; + public static String JSFValidationConfigurationBlock_pb_invalidToViewId_label; + ////Phase Listener + public static String JSFValidationConfigurationBlock_section_phase_listener; + public static String JSFValidationConfigurationBlock_pb_invalidPhaseListener_label; + ////Renderers + public static String JSFValidationConfigurationBlock_section_renderers; + public static String JSFValidationConfigurationBlock_pb_invalidRenderKitClass_label; + public static String JSFValidationConfigurationBlock_pb_invalidRendererClass_label; + ////Validation + public static String JSFValidationConfigurationBlock_section_validator; + public static String JSFValidationConfigurationBlock_pb_invalidValidatorClass_label; + static { NLS.initializeMessages(BUNDLE_NAME, JSFSeverityPreferencesMessages.class); } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFSeverityPreferencesMessages.properties =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFSeverityPreferencesMessages.properties 2011-11-28 21:28:12 UTC (rev 36713) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFSeverityPreferencesMessages.properties 2011-11-29 00:25:23 UTC (rev 36714) @@ -18,4 +18,52 @@ JSFValidationConfigurationBlock_pb_unknownAttribute_label=Unknown composite component attribute: JSF_VALIDATION_CONFIGURATION_BLOCK_JSF_VALIDATION_CONFIGURATION_BLOCK=JSFValidationConfigurationBlock -JSF_VALIDATION_PREFERENCE_PAGE_JSF_VALIDATOR=JSF Validation \ No newline at end of file +JSF_VALIDATION_PREFERENCE_PAGE_JSF_VALIDATOR=JSF Validation + +##Faces Config +JSFValidationConfigurationBlock_section_faces_config=Faces Config +####Application +JSFValidationConfigurationBlock_section_context_param=Context Param in web.xml +JSFValidationConfigurationBlock_pb_invalidConfigFiles_label=Invalid config files in web.xml: + +JSFValidationConfigurationBlock_section_application=Application +JSFValidationConfigurationBlock_pb_invalidActionListener_label=Invalid action listener: +JSFValidationConfigurationBlock_pb_invalidNavigationHandler_label=Invalid navigation handler: +JSFValidationConfigurationBlock_pb_invalidPropertyResolver_label=Invalid property resolver: +JSFValidationConfigurationBlock_pb_invalidStateManager_label=Invalid state manager: +JSFValidationConfigurationBlock_pb_invalidVariableResolver_label=Invalid variable resolver: +###Component +JSFValidationConfigurationBlock_section_component=Component +JSFValidationConfigurationBlock_pb_invalidComponentClass_label=Invalid component class: +####Converter +JSFValidationConfigurationBlock_section_converter=Converter +JSFValidationConfigurationBlock_pb_invalidConverterClass_label=Invalid conferter class: +JSFValidationConfigurationBlock_pb_invalidConverterForClass_label=Invalid converter for class: +####Factory +JSFValidationConfigurationBlock_section_factory=Factory +JSFValidationConfigurationBlock_pb_invalidApplicationFactory_label=Invalid application factory: +JSFValidationConfigurationBlock_pb_invalidFacesContextFactory_label=Invalid faces context factory: +JSFValidationConfigurationBlock_pb_invalidLifecycleFactory_label=Invalid lifecycle factory: +JSFValidationConfigurationBlock_pb_invalidRenderKitFactory_label=Invalid render kit factory: +####List & Map +JSFValidationConfigurationBlock_section_entries=List and Map entries +JSFValidationConfigurationBlock_pb_invalidKeyClass_label=Invalid key class: +JSFValidationConfigurationBlock_pb_invalidValueClass_label=Invalid value class: +####Managed Bean +JSFValidationConfigurationBlock_section_bean=Managed Bean +JSFValidationConfigurationBlock_pb_invalidBeanClass_label=Invalid bean class: +JSFValidationConfigurationBlock_pb_invalidPropertyClass_label=Invalid property class: +####Navigation Rules +JSFValidationConfigurationBlock_section_navigation=Navigation Rules +JSFValidationConfigurationBlock_pb_invalidFromViewId_label=Invalid from-view-id: +JSFValidationConfigurationBlock_pb_invalidToViewId_label= Invalid to-view-id: +####Phase Listener +JSFValidationConfigurationBlock_section_phase_listener=Phase Listener +JSFValidationConfigurationBlock_pb_invalidPhaseListener_label=Invalid phase listener: +####Renderers +JSFValidationConfigurationBlock_section_renderers=Renderers +JSFValidationConfigurationBlock_pb_invalidRenderKitClass_label=Invalid render kit class: +JSFValidationConfigurationBlock_pb_invalidRendererClass_label=Invalid renderer class: +####Validator +JSFValidationConfigurationBlock_section_validator=Validator +JSFValidationConfigurationBlock_pb_invalidValidatorClass_label=Invalid validator class: Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFValidationConfigurationBlock.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFValidationConfigurationBlock.java 2011-11-28 21:28:12 UTC (rev 36713) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/preferences/JSFValidationConfigurationBlock.java 2011-11-29 00:25:23 UTC (rev 36714) @@ -30,27 +30,142 @@ private static final String SETTINGS_SECTION_NAME = JSFSeverityPreferencesMessages.JSF_VALIDATION_CONFIGURATION_BLOCK_JSF_VALIDATION_CONFIGURATION_BLOCK; private static SectionDescription SECTION_COMPOSITE_COMPONENTS = new SectionDescription( - JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_section_composite_components, - new String[][]{ - {JSFSeverityPreferences.UNKNOWN_COMPOSITE_COMPONENT_NAME, JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_pb_unknownComponent_label}, - {JSFSeverityPreferences.UNKNOWN_COMPOSITE_COMPONENT_ATTRIBUTE, JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_pb_unknownAttribute_label}, - }, - JSFModelPlugin.PLUGIN_ID - ); + JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_section_composite_components, + new String[][]{ + {JSFSeverityPreferences.UNKNOWN_COMPOSITE_COMPONENT_NAME, JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_pb_unknownComponent_label}, + {JSFSeverityPreferences.UNKNOWN_COMPOSITE_COMPONENT_ATTRIBUTE, JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_pb_unknownAttribute_label}, + }, + JSFModelPlugin.PLUGIN_ID + ); - private static SectionDescription[] ALL_SECTIONS = new SectionDescription[] { - SECTION_COMPOSITE_COMPONENTS - }; + //Faces Config + + private static SectionDescription SECTION_APPLICATION = new SectionDescription( + JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_section_application, + new String[][]{ + {JSFSeverityPreferences.INVALID_ACTION_LISTENER, JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_pb_invalidActionListener_label}, + {JSFSeverityPreferences.INVALID_NAVIGATION_HANDLER, JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_pb_invalidNavigationHandler_label}, + {JSFSeverityPreferences.INVALID_PROPERTY_RESOLVER, JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_pb_invalidPropertyResolver_label}, + {JSFSeverityPreferences.INVALID_STATE_MANAGER, JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_pb_invalidStateManager_label}, + {JSFSeverityPreferences.INVALID_VARIABLE_RESOLVER, JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_pb_invalidVariableResolver_label}, + {JSFSeverityPreferences.INVALID_VIEW_HANDLER, JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_pb_invalidActionListener_label}, + }, + JSFModelPlugin.PLUGIN_ID + ); + private static SectionDescription SECTION_COMPONENT = new SectionDescription( + JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_section_component, + new String[][]{ + {JSFSeverityPreferences.INVALID_COMPONENT_CLASS, JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_pb_invalidComponentClass_label}, + }, + JSFModelPlugin.PLUGIN_ID + ); + private static SectionDescription SECTION_CONVERTER = new SectionDescription( + JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_section_converter, + new String[][]{ + {JSFSeverityPreferences.INVALID_CONVERTER_CLASS, JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_pb_invalidConverterClass_label}, + {JSFSeverityPreferences.INVALID_CONVERTER_FOR_CLASS, JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_pb_invalidConverterForClass_label}, + }, + JSFModelPlugin.PLUGIN_ID + ); + private static SectionDescription SECTION_FACTORY = new SectionDescription( + JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_section_factory, + new String[][]{ + {JSFSeverityPreferences.INVALID_APPLICATION_FACTORY, JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_pb_invalidApplicationFactory_label}, + {JSFSeverityPreferences.INVALID_FACES_CONTEXT_FACTORY, JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_pb_invalidFacesContextFactory_label}, + {JSFSeverityPreferences.INVALID_LIFECYCLE_FACTORY, JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_pb_invalidLifecycleFactory_label}, + {JSFSeverityPreferences.INVALID_RENDER_KIT_FACTORY, JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_pb_invalidRenderKitFactory_label}, + }, + JSFModelPlugin.PLUGIN_ID + ); + private static SectionDescription SECTION_ENTRIES = new SectionDescription( + JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_section_entries, + new String[][]{ + {JSFSeverityPreferences.INVALID_KEY_CLASS, JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_pb_invalidKeyClass_label}, + {JSFSeverityPreferences.INVALID_VALUE_CLASS, JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_pb_invalidValueClass_label}, + }, + JSFModelPlugin.PLUGIN_ID + ); + private static SectionDescription SECTION_BEANS = new SectionDescription( + JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_section_bean, + new String[][]{ + {JSFSeverityPreferences.INVALID_BEAN_CLASS, JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_pb_invalidBeanClass_label}, + {JSFSeverityPreferences.INVALID_PROPERTY_CLASS, JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_pb_invalidPropertyClass_label}, + }, + JSFModelPlugin.PLUGIN_ID + ); + private static SectionDescription SECTION_PHASE_LISTENER = new SectionDescription( + JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_section_phase_listener, + new String[][]{ + {JSFSeverityPreferences.INVALID_PHASE_LISTENER, JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_pb_invalidPhaseListener_label}, + }, + JSFModelPlugin.PLUGIN_ID + ); + private static SectionDescription SECTION_RENDERERS = new SectionDescription( + JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_section_renderers, + new String[][]{ + {JSFSeverityPreferences.INVALID_RENDER_KIT_CLASS, JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_pb_invalidRenderKitClass_label}, + {JSFSeverityPreferences.INVALID_RENDERER_CLASS, JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_pb_invalidRendererClass_label}, + }, + JSFModelPlugin.PLUGIN_ID + ); + private static SectionDescription SECTION_VALIDATOR = new SectionDescription( + JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_section_validator, + new String[][]{ + {JSFSeverityPreferences.INVALID_VALIDATOR_CLASS, JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_pb_invalidValidatorClass_label}, + }, + JSFModelPlugin.PLUGIN_ID + ); - private static Key[] getKeys() { - ArrayList<Key> keys = new ArrayList<Key>(); - for (SectionDescription s: ALL_SECTIONS) { - s.collectKeys(keys); - } - keys.add(MAX_NUMBER_OF_PROBLEMS_KEY); - keys.add(WRONG_BUILDER_ORDER_KEY); - return keys.toArray(new Key[0]); + private static SectionDescription SECTION_NAVIGATION = new SectionDescription( + JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_section_navigation, + new String[][]{ + {JSFSeverityPreferences.INVALID_FROM_VIEW_ID, JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_pb_invalidFromViewId_label}, + {JSFSeverityPreferences.INVALID_TO_VIEW_ID, JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_pb_invalidToViewId_label}, + }, + JSFModelPlugin.PLUGIN_ID + ); + private static SectionDescription SECTION_WEB_XML = new SectionDescription( + JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_section_context_param, + new String[][]{ + {JSFSeverityPreferences.INVALID_CONFIG_FILES, JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_pb_invalidConfigFiles_label}, + }, + JSFModelPlugin.PLUGIN_ID + ); + + + private static SectionDescription SECTION_FACES_CONFIG = new SectionDescription( + JSFSeverityPreferencesMessages.JSFValidationConfigurationBlock_section_faces_config, + new SectionDescription[]{ + SECTION_WEB_XML, + SECTION_APPLICATION, + SECTION_COMPONENT, + SECTION_CONVERTER, + SECTION_FACTORY, + SECTION_ENTRIES, + SECTION_BEANS, + SECTION_PHASE_LISTENER, + SECTION_RENDERERS, + SECTION_NAVIGATION, + SECTION_VALIDATOR, + }, + new String[0][], + JSFModelPlugin.PLUGIN_ID + ); + + private static SectionDescription[] ALL_SECTIONS = new SectionDescription[] { + SECTION_COMPOSITE_COMPONENTS, + SECTION_FACES_CONFIG + }; + + private static Key[] getKeys() { + ArrayList<Key> keys = new ArrayList<Key>(); + for (SectionDescription s: ALL_SECTIONS) { + s.collectKeys(keys); } + keys.add(MAX_NUMBER_OF_PROBLEMS_KEY); + keys.add(WRONG_BUILDER_ORDER_KEY); + return keys.toArray(new Key[0]); + } private static final Key MAX_NUMBER_OF_PROBLEMS_KEY = getKey(JSFModelPlugin.PLUGIN_ID, SeverityPreferences.MAX_NUMBER_OF_MARKERS_PREFERENCE_NAME);

13 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r36713 - in trunk/ws/plugins: org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: bfitzpat Date: 2011-11-28 16:28:12 -0500 (Mon, 28 Nov 2011) New Revision: 36713 Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/RestEasyLibUtils.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossRSGenerateWizardPage.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSAnnotatedClassWizardPage.java Log: JBIDE-10199 - Updates to JAX-RS jar detection and how the jar detection is handled in the wizards - see the jira for details Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/RestEasyLibUtils.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/RestEasyLibUtils.java 2011-11-28 21:26:19 UTC (rev 36712) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/RestEasyLibUtils.java 2011-11-28 21:28:12 UTC (rev 36713) @@ -21,13 +21,13 @@ */ package org.jboss.tools.ws.creation.core.utils; -import java.io.File; -import java.io.FilenameFilter; - import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.JavaCore; +import org.jboss.tools.common.util.EclipseJavaUtil; import org.jboss.tools.ws.core.utils.StatusUtils; import org.jboss.tools.ws.creation.core.messages.JBossWSCreationCoreMessages; @@ -37,12 +37,6 @@ */ public class RestEasyLibUtils { - private static final String REST_EASY = "RestEasy"; //$NON-NLS-1$ - private static final String JAXRS_API_POSTFIX = ".jar"; //$NON-NLS-1$ - private static final String LIB = "lib"; //$NON-NLS-1$ - private static final String MODULES = "modules"; //$NON-NLS-1$ - - /** * Simple check to see if the JBoss WS runtime associated with a project * actually includes the RESTEasy jars. If so, returns Status.OK_STATUS. @@ -52,97 +46,28 @@ * @return */ public static IStatus doesRuntimeSupportRestEasy ( IProject project ) { + try { - String path = - JBossWSCreationUtils.getJBossWSRuntimeLocation(project); - File runtime = new File(path); - if (runtime.exists()) { - File findJar = findLibDir(runtime); - if (findJar == null) { - File parent = runtime.getParentFile(); - if (parent.exists() && parent.isDirectory()) { - File[] restEasyDir = parent.listFiles(new FilenameFilter() { - public boolean accept(File dir, String name) { - if (name.equalsIgnoreCase(REST_EASY)) { - return true; - } - return false; - } - }); - if (restEasyDir != null && restEasyDir.length > 0) { - findJar = findLibDir(restEasyDir[0]); - } + IJavaProject javaProject = JavaCore.create(project); + if (javaProject != null) { + String[] classesToValidate = + { "javax.ws.rs.GET", //$NON-NLS-1$ + "javax.ws.rs.Path", //$NON-NLS-1$ + "javax.ws.rs.core.Application"}; //$NON-NLS-1$ + for (int i = 0; i < classesToValidate.length; i++) { + String classToTest = classesToValidate[i]; + IType rtnType1 = EclipseJavaUtil.findType( + javaProject, classToTest); + if (rtnType1 == null) { + return StatusUtils.warningStatus( + JBossWSCreationCoreMessages.AddRestEasyJarsCommand_RestEasy_JARS_Not_Found); } } - if (findJar == null) { - // if it's still null, resteasy's not installed - return StatusUtils.errorStatus(JBossWSCreationCoreMessages.AddRestEasyJarsCommand_RestEasy_JARS_Not_Found); - } } - } catch (CoreException ce) { - return StatusUtils.errorStatus(JBossWSCreationCoreMessages.RestEasyLibUtils_Error_UnableToFindRuntimeForProject); + } catch (Exception e) { + return StatusUtils.warningStatus(JBossWSCreationCoreMessages.RestEasyLibUtils_Error_UnableToFindRuntimeForProject); } return Status.OK_STATUS; } - /* - * Finds the RESTEasy lib in the runtime path - * @param in - * @return - */ - private static File findLibDir ( File in ) { - File[] children = - in.listFiles(new FilenameFilter() { - public boolean accept(File dir, String name) { - if (dir.isDirectory() && name.equals(LIB)) { - return true; - } - else if (dir.isDirectory() && name.equals(MODULES)) { - return true; - } - return false; - } - }); - if (children != null ) { - for (int i = 0; i < children.length; i++) { - File libDir = (File) children[i]; - if (libDir.exists() && libDir.isDirectory()) { - File temp = recursiveRESearch(libDir); - if (temp != null) - return libDir; - } - } - } - return null; - } - - - /* - * Recursive file search - * @param input (file) - * @return RestEasy jar indicating RE is installed - */ - private static File recursiveRESearch(File input) { - if( input.isDirectory() == true ){ - for(int i=0; i<input.list().length; i++){ - File temp = new File( input + "\\" + input.list()[i]); //$NON-NLS-1$ - File temp2 = recursiveRESearch(temp); - if (temp2 != null) - return temp2; - } - } - else{ - if (input.getName().length() > 0) { - String name = input.getName().toUpperCase(); - boolean starts = name.startsWith(REST_EASY.toUpperCase()); - boolean ends = name.endsWith(JAXRS_API_POSTFIX.toUpperCase()); - if (starts && ends) { - return input; - } - } - } - - return null; - } - } Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossRSGenerateWizardPage.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossRSGenerateWizardPage.java 2011-11-28 21:26:19 UTC (rev 36712) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossRSGenerateWizardPage.java 2011-11-28 21:28:12 UTC (rev 36713) @@ -333,6 +333,7 @@ model.setWebProjectName(projects.getText()); } + setErrorMessage(null); // no project selected if (((JBossRSGenerateWizard) this.getWizard()).getProject() == null) { setErrorMessage(JBossWSUIMessages.Error_JBossWS_GenerateWizard_NoProjectSelected); @@ -351,8 +352,8 @@ IStatus reInstalledStatus = RestEasyLibUtils.doesRuntimeSupportRestEasy(((JBossRSGenerateWizard) this.getWizard()).getProject()); if (reInstalledStatus.getSeverity() != IStatus.OK){ - setErrorMessage(JBossWSUIMessages.JBossRSGenerateWizardPage_Error_RestEasyJarsNotFoundInRuntime); - return false; + setMessage(JBossWSUIMessages.JBossRSGenerateWizardPage_Error_RestEasyJarsNotFoundInRuntime, DialogPage.WARNING); + return true; } // no source folder in web project Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSAnnotatedClassWizardPage.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSAnnotatedClassWizardPage.java 2011-11-28 21:26:19 UTC (rev 36712) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/wizards/JBossWSAnnotatedClassWizardPage.java 2011-11-28 21:28:12 UTC (rev 36713) @@ -614,6 +614,7 @@ model.setWebProjectName(projects.getText()); } + setErrorMessage(null); // no project selected if (((JBossWSAnnotatedClassWizard) this.getWizard()).getProject() == null) { setErrorMessage(JBossWSUIMessages.Error_JBossWS_GenerateWizard_NoProjectSelected); @@ -623,15 +624,17 @@ // project not a dynamic web project IFile web = ((JBossWSAnnotatedClassWizard) this.getWizard()).getWebFile(); if (web == null || !web.exists()) { - setErrorMessage(JBossWSUIMessages.Error_JBossWS_GenerateWizard_NotDynamicWebProject); - return false; + if (updateWebXML.getSelection()) { + setErrorMessage(JBossWSUIMessages.Error_JBossWS_GenerateWizard_NotDynamicWebProject); + return false; + } } IStatus reInstalledStatus = RestEasyLibUtils.doesRuntimeSupportRestEasy(((JBossWSAnnotatedClassWizard) this.getWizard()).getProject()); if (reInstalledStatus.getSeverity() != IStatus.OK){ - setErrorMessage(JBossWSUIMessages.JBossRSGenerateWizardPage_Error_RestEasyJarsNotFoundInRuntime); - return false; + setMessage(JBossWSUIMessages.JBossRSGenerateWizardPage_Error_RestEasyJarsNotFoundInRuntime, DialogPage.WARNING); + return true; } // no source folder in web project

13 years, 1 month

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 November 2011