Author: sflanigan Date: 2009-07-27 04:01:32 -0400 (Mon, 27 Jul 2009) New Revision: 16812 Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/Messages.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/messages.properties Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/RichFacesTemplatesActivator.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/AbstractRichFacesTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnGroupTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataDefinitionListTemplate.java 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/RichFacesInplaceSelectTemplate.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/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesProgressBarTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSeparatorTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToggleControlTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTogglePanelTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesVirtualEarthTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/seam/test/unit/SeamTextTest.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/seam/text/xpl/SeamTextLexer.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/seam/text/xpl/SeamTextParser.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/SeamTemplatesActivator.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/AbstractELCompletionEngine.java Log: https://jira.jboss.org/jira/browse/JBIDE-3557 Externalize English strings Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/Messages.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/Messages.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/Messages.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -0,0 +1,18 @@ +package org.jboss.tools.jsf.vpe.richfaces; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.jsf.vpe.richfaces.messages"; //$NON-NLS-1$ + public static String RichFacesOrderingList_DownLabel; + public static String RichFacesOrderingList_FirstLabel; + public static String RichFacesOrderingList_LastLabel; + public static String RichFacesOrderingList_UpLabel; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/RichFacesTemplatesActivator.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/RichFacesTemplatesActivator.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/RichFacesTemplatesActivator.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -26,7 +26,7 @@ public class RichFacesTemplatesActivator extends BaseUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.jsf.vpe.richfaces"; + public static final String PLUGIN_ID = "org.jboss.tools.jsf.vpe.richfaces"; //$NON-NLS-1$ // The shared instance private static RichFacesTemplatesActivator plugin; @@ -68,9 +68,9 @@ Bundle bundle = Platform.getBundle(PLUGIN_ID); URL url = null; try { - url = bundle == null ? null : FileLocator.resolve(bundle.getEntry("/resources")); + url = bundle == null ? null : FileLocator.resolve(bundle.getEntry("/resources")); //$NON-NLS-1$ } catch (IOException e) { - url = bundle.getEntry("/resources"); + url = bundle.getEntry("/resources"); //$NON-NLS-1$ } return (url == null) ? null : url.getPath(); } Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/messages.properties =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/messages.properties (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/messages.properties 2009-07-27 08:01:32 UTC (rev 16812) @@ -0,0 +1,4 @@ +RichFacesOrderingList_DownLabel=Down +RichFacesOrderingList_FirstLabel=First +RichFacesOrderingList_LastLabel=Last +RichFacesOrderingList_UpLabel=Up Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/AbstractRichFacesTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/AbstractRichFacesTemplate.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/AbstractRichFacesTemplate.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -39,7 +39,7 @@ * @return value of attribute */ public String getAttribute(String nameAttr, Node sourceNode) { - String returnValue = ""; + String returnValue = ""; //$NON-NLS-1$ NamedNodeMap sourceAttrbutes = sourceNode.getAttributes(); for (int i = 0; i < sourceAttrbutes.getLength(); i++) { @@ -61,7 +61,7 @@ */ public boolean isEmptyAttribute(String nameAttr, Node sourceNode) { - return getAttribute(nameAttr, sourceNode).equalsIgnoreCase(""); + return getAttribute(nameAttr, sourceNode).equalsIgnoreCase(""); //$NON-NLS-1$ } @@ -73,17 +73,17 @@ * @return the string */ public String parseStyle(Node sourceNode) { - String style = getAttribute("style", sourceNode); - String str=""; - StringTokenizer st = new StringTokenizer(style,";:"); + String style = getAttribute("style", sourceNode); //$NON-NLS-1$ + String str=""; //$NON-NLS-1$ + StringTokenizer st = new StringTokenizer(style,";:"); //$NON-NLS-1$ while(st.hasMoreTokens()) { String token = st.nextToken(); - if(token.trim().equalsIgnoreCase("width") || token.trim().equalsIgnoreCase("height")) { + if(token.trim().equalsIgnoreCase("width") || token.trim().equalsIgnoreCase("height")) { //$NON-NLS-1$ //$NON-NLS-2$ st.nextToken(); continue; } - str+=token + ":" + st.nextToken() + "; "; + str+=token + ":" + st.nextToken() + "; "; //$NON-NLS-1$ //$NON-NLS-2$ } return str; @@ -98,13 +98,13 @@ */ public String parseStyleWidth(Node sourceNode) { - String style = getAttribute("style", sourceNode); - String widthValue = ""; - StringTokenizer st = new StringTokenizer(style, ":;"); + String style = getAttribute("style", sourceNode); //$NON-NLS-1$ + String widthValue = ""; //$NON-NLS-1$ + StringTokenizer st = new StringTokenizer(style, ":;"); //$NON-NLS-1$ while (st.hasMoreTokens()) { String str = st.nextToken(); - if (str.trim().equalsIgnoreCase("width")) { + if (str.trim().equalsIgnoreCase("width")) { //$NON-NLS-1$ widthValue = st.nextToken(); } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnGroupTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnGroupTemplate.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesColumnGroupTemplate.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -44,22 +44,22 @@ @Override protected String getHeaderClass() { - return "dr-table-header rich-table-header"; + return "dr-table-header rich-table-header"; //$NON-NLS-1$ } @Override protected String getHeaderContinueClass() { - return "dr-table-header-continue rich-table-header-continue"; + return "dr-table-header-continue rich-table-header-continue"; //$NON-NLS-1$ } @Override protected String getFooterClass() { - return "dr-table-footer rich-table-footer"; + return "dr-table-footer rich-table-footer"; //$NON-NLS-1$ } @Override protected String getFooterContinueClass() { - return "dr-table-footer-continue rich-table-footer-continue"; + return "dr-table-footer-continue rich-table-footer-continue"; //$NON-NLS-1$ } @Override Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataDefinitionListTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataDefinitionListTemplate.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataDefinitionListTemplate.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -41,10 +41,10 @@ * */ private static final String DEFAULT_DD_CLASS = "columnClass"; //$NON-NLS-1$ - private static final String FACET_URI = "http://java.sun.com/jsf/core"; - private static final String FACET_NAME_ATTR = "name"; - private static final String FACET_NAME_ATTR_VALUE = "term"; - private static final String STYLE_RESOURCES_PATH = "/dataDefinitionList/dataDefinitionList.css"; + private static final String FACET_URI = "http://java.sun.com/jsf/core"; //$NON-NLS-1$ + private static final String FACET_NAME_ATTR = "name"; //$NON-NLS-1$ + private static final String FACET_NAME_ATTR_VALUE = "term"; //$NON-NLS-1$ + private static final String STYLE_RESOURCES_PATH = "/dataDefinitionList/dataDefinitionList.css"; //$NON-NLS-1$ /** * Creates a node of the visual tree on the node of the source tree. This @@ -64,7 +64,7 @@ ComponentUtil.setCSSLink( pageContext, STYLE_RESOURCES_PATH, - "dataDefinitionList"); + "dataDefinitionList"); //$NON-NLS-1$ VpeCreationData creationData = new VpeCreationData(listElement); creationData.addChildrenInfo(new VpeChildrenInfo(null)); @@ -77,7 +77,7 @@ RichFaces.ATTR_STYLE, HTML.ATTR_STYLE, null, null); ComponentUtil.correctAttribute((Element)sourceNode, listElement, - RichFaces.ATTR_STYLE_CLASS, HTML.ATTR_CLASS, null, "listClass"); + RichFaces.ATTR_STYLE_CLASS, HTML.ATTR_CLASS, null, "listClass"); //$NON-NLS-1$ Element facetElement = null; List<Element> dataDefinitionElements = new ArrayList<Element>(); @@ -185,7 +185,7 @@ RichFaces.ATTR_HEADER_CLASS, HTML.ATTR_CLASS, null, - "headerClass"); + "headerClass"); //$NON-NLS-1$ parentList.appendChild(dt); VpeChildrenInfo child = new VpeChildrenInfo(dt); child.addSourceChild(facetElement); 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 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesEditorTemplate.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -156,8 +156,8 @@ } nsIDOMElement outerTD = visualDocument.createElement(HTML.TAG_TD); nsIDOMElement div = visualDocument.createElement(HTML.TAG_DIV); { - div.setAttribute(HTML.ATTR_CLASS, "mceIframeContainer"); - div.setAttribute(HTML.ATTR_STYLE, "height: 100%;"); + div.setAttribute(HTML.ATTR_CLASS, "mceIframeContainer"); //$NON-NLS-1$ + div.setAttribute(HTML.ATTR_STYLE, "height: 100%;"); //$NON-NLS-1$ } nsIDOMElement table = visualDocument.createElement(HTML.TAG_TABLE); { table.setAttribute(HTML.ATTR_BORDER, "0"); //$NON-NLS-1$ Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceSelectTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceSelectTemplate.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesInplaceSelectTemplate.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -173,7 +173,7 @@ + Constants.WHITE_SPACE + HTML.ATTR_WIDTH + Constants.COLON +this.sourceListWidth + Constants.SEMICOLON; - System.out.println(" dropDownListSizesStyle = " + System.out.println(" dropDownListSizesStyle = " //$NON-NLS-1$ + dropDownListSizesStyle); table.setAttribute(HTML.ATTR_STYLE, dropDownListSizesStyle); 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 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesOrderingList.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -8,6 +8,7 @@ import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil; import org.jboss.tools.jsf.vpe.richfaces.HtmlComponentUtil; +import org.jboss.tools.jsf.vpe.richfaces.Messages; import org.jboss.tools.jsf.vpe.richfaces.RichFacesTemplatesActivator; import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces; import org.jboss.tools.vpe.editor.context.VpePageContext; @@ -30,97 +31,97 @@ private static final String COLUMN = ':' + RichFaces.TAG_COLUMN; private static final String COLUMNS = ':' + RichFaces.TAG_COLUMNS; - private static final String DEFAULT_LIST_HEIGHT = "150px"; - private static final String DEFAULT_LIST_WIDTH = "300px"; + private static final String DEFAULT_LIST_HEIGHT = "150px"; //$NON-NLS-1$ + private static final String DEFAULT_LIST_WIDTH = "300px"; //$NON-NLS-1$ - private static final String DEFAULT_HEIGHT = "200px"; - private static final String DEFAULT_WIDTH = "300px"; + private static final String DEFAULT_HEIGHT = "200px"; //$NON-NLS-1$ + private static final String DEFAULT_WIDTH = "300px"; //$NON-NLS-1$ - private static final String CAPTION_FACET = "caption"; - private static final String TOP_CONTROL_FACET = "topControl"; - private static final String UP_CONTROL_FACET = "upControl"; - private static final String DOWN_CONTROL_FACET = "downControl"; - private static final String BOTTOM_CONTROL_FACET = "bottomControl"; + private static final String CAPTION_FACET = "caption"; //$NON-NLS-1$ + private static final String TOP_CONTROL_FACET = "topControl"; //$NON-NLS-1$ + private static final String UP_CONTROL_FACET = "upControl"; //$NON-NLS-1$ + private static final String DOWN_CONTROL_FACET = "downControl"; //$NON-NLS-1$ + private static final String BOTTOM_CONTROL_FACET = "bottomControl"; //$NON-NLS-1$ - private static final String HEADER = "header"; - private static final String HEADER_CLASS = "headerClass"; - private static final String FOOTER = "footer"; - private static final String FOOTER_CLASS = "footerClass"; - private static final String CAPTION_CLASS = "captionClass"; - private static final String CAPTION_STYLE = "captionStyle"; - private static final String SPACE = " "; + private static final String HEADER = "header"; //$NON-NLS-1$ + private static final String HEADER_CLASS = "headerClass"; //$NON-NLS-1$ + private static final String FOOTER = "footer"; //$NON-NLS-1$ + private static final String FOOTER_CLASS = "footerClass"; //$NON-NLS-1$ + private static final String CAPTION_CLASS = "captionClass"; //$NON-NLS-1$ + private static final String CAPTION_STYLE = "captionStyle"; //$NON-NLS-1$ + private static final String SPACE = " "; //$NON-NLS-1$ - private static final String STYLE_FOR_LOW_SCROLL = "overflow: scroll; width: 100%; height: 17px;"; - private static final String STYLE_FOR_RIGHT_SCROLL = "overflow: scroll; width: 17px; height: 100%;"; + private static final String STYLE_FOR_LOW_SCROLL = "overflow: scroll; width: 100%; height: 17px;"; //$NON-NLS-1$ + private static final String STYLE_FOR_RIGHT_SCROLL = "overflow: scroll; width: 17px; height: 100%;"; //$NON-NLS-1$ private static final int NUM_ROW = 1; - private static final String TOP_CONTROL_IMG = "orderingList/top.gif"; - private static final String UP_CONTROL_IMG = "orderingList/up.gif"; - private static final String DOWN_CONTROL_IMG = "orderingList/down.gif"; - private static final String BOTTOM_CONTROL_IMG = "orderingList/bottom.gif"; + 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$ + private static final String BOTTOM_CONTROL_IMG = "orderingList/bottom.gif"; //$NON-NLS-1$ - private static final String BUTTON_BG = "orderingList/button_bg.gif"; - private static final String HEADER_CELL_BG = "orderingList/table_header_cell_bg.gif"; + private static final String BUTTON_BG = "orderingList/button_bg.gif"; //$NON-NLS-1$ + private static final String HEADER_CELL_BG = "orderingList/table_header_cell_bg.gif"; //$NON-NLS-1$ - private static final String WIDTH = "width"; - private static final String HEIGHT = "height"; - private static final String LIST_WIDTH = "listWidth"; - private static final String LIST_HEIGHT = "listHeight"; + private static final String WIDTH = "width"; //$NON-NLS-1$ + private static final String HEIGHT = "height"; //$NON-NLS-1$ + private static final String LIST_WIDTH = "listWidth"; //$NON-NLS-1$ + private static final String LIST_HEIGHT = "listHeight"; //$NON-NLS-1$ - private static final String TOP_CONTROL_LABEL = "topControlLabel"; - private static final String UP_CONTROL_LABEL = "upControlLabel"; - private static final String DOWN_CONTROL_LABEL = "downControlLabel"; - private static final String BOTTOM_CONTROL_LABEL = "bottomControlLabel"; + private static final String TOP_CONTROL_LABEL = "topControlLabel"; //$NON-NLS-1$ + private static final String UP_CONTROL_LABEL = "upControlLabel"; //$NON-NLS-1$ + private static final String DOWN_CONTROL_LABEL = "downControlLabel"; //$NON-NLS-1$ + private static final String BOTTOM_CONTROL_LABEL = "bottomControlLabel"; //$NON-NLS-1$ - private static final String TOP_CONTROL_LABEL_DEFAULT = "First"; - private static final String UP_CONTROL_LABEL_DEFAULT = "Up"; - private static final String DOWN_CONTROL_LABEL_DEFAULT = "Down"; - private static final String BOTTOM_CONTROL_LABEL_DEFAULT = "Last"; + private static final String TOP_CONTROL_LABEL_DEFAULT = Messages.RichFacesOrderingList_FirstLabel; + private static final String UP_CONTROL_LABEL_DEFAULT = Messages.RichFacesOrderingList_UpLabel; + private static final String DOWN_CONTROL_LABEL_DEFAULT = Messages.RichFacesOrderingList_DownLabel; + private static final String BOTTOM_CONTROL_LABEL_DEFAULT = Messages.RichFacesOrderingList_LastLabel; - private static final String CAPTION_LABEL = "captionLabel"; + private static final String CAPTION_LABEL = "captionLabel"; //$NON-NLS-1$ - private static final String CONTROLS_TYPE = "controlsType"; - private static final String CONTROLS_VERTICAL_ALIGN = "controlsVerticalAlign"; - private static final String CONTROLS_HORIZONTAL_ALIGN = "controlsHorizontalAlign"; - private static final String SHOW_BUTTON_LABELS = "showButtonLabels"; - private static final String FAST_ORDER_CONTROL_VISIBLE = "fastOrderControlsVisible"; - private static final String ORDER_CONTROL_VISIBLE = "orderControlsVisible"; + private static final String CONTROLS_TYPE = "controlsType"; //$NON-NLS-1$ + private static final String CONTROLS_VERTICAL_ALIGN = "controlsVerticalAlign"; //$NON-NLS-1$ + private static final String CONTROLS_HORIZONTAL_ALIGN = "controlsHorizontalAlign"; //$NON-NLS-1$ + private static final String SHOW_BUTTON_LABELS = "showButtonLabels"; //$NON-NLS-1$ + private static final String FAST_ORDER_CONTROL_VISIBLE = "fastOrderControlsVisible"; //$NON-NLS-1$ + private static final String ORDER_CONTROL_VISIBLE = "orderControlsVisible"; //$NON-NLS-1$ - private static final String LIST_CLASS = "listClass"; - private static final String CONTROLS_CLASS = "controlsClass"; - private static final String TOP_CONTROL_CLASS = "topControlClass"; - private static final String UP_CONTROL_CLASS = "upControlClass"; - private static final String DOWN_CONTROL_CLASS = "downControlClass"; - private static final String BOTTOM_CONTROL_CLASS = "bottomControlClass"; - private static final String ROW_CLASSES = "rowClasses"; + private static final String LIST_CLASS = "listClass"; //$NON-NLS-1$ + private static final String CONTROLS_CLASS = "controlsClass"; //$NON-NLS-1$ + private static final String TOP_CONTROL_CLASS = "topControlClass"; //$NON-NLS-1$ + private static final String UP_CONTROL_CLASS = "upControlClass"; //$NON-NLS-1$ + private static final String DOWN_CONTROL_CLASS = "downControlClass"; //$NON-NLS-1$ + private static final String BOTTOM_CONTROL_CLASS = "bottomControlClass"; //$NON-NLS-1$ + private static final String ROW_CLASSES = "rowClasses"; //$NON-NLS-1$ - private static final String CSS_CAPTION_CLASS = "rich-ordering-list-caption"; + private static final String CSS_CAPTION_CLASS = "rich-ordering-list-caption"; //$NON-NLS-1$ - private static final String CSS_CONTROLS_CLASS = "rich-ordering-controls"; - private static final String CSS_TOP_CONTROL_CLASS = "rich-ordering-control-top"; - private static final String CSS_BUTTON_LAYOUT_CLASS = "rich-ordering-list-button-layout"; - private static final String CSS_UP_CONTROL_CLASS = "rich-ordering-control-up"; - private static final String CSS_DOWN_CONTROL_CLASS = "rich-ordering-control-down"; - private static final String CSS_BOTTOM_CONTROL_CLASS = "rich-ordering-control-bottom"; - private static final String CSS_BUTTON_CLASS = "rich-ordering-list-button"; - private static final String CSS_BUTTON_SELECTION_CLASS = "rich-ordering-list-button-selection"; - private static final String CSS_BUTTON_CONTENT_CLASS = "rich-ordering-list-button-content"; - private static final String CSS_BUTTON_VALIGN_CLASS = "rich-ordering-list-button-valign"; + private static final String CSS_CONTROLS_CLASS = "rich-ordering-controls"; //$NON-NLS-1$ + private static final String CSS_TOP_CONTROL_CLASS = "rich-ordering-control-top"; //$NON-NLS-1$ + private static final String CSS_BUTTON_LAYOUT_CLASS = "rich-ordering-list-button-layout"; //$NON-NLS-1$ + private static final String CSS_UP_CONTROL_CLASS = "rich-ordering-control-up"; //$NON-NLS-1$ + private static final String CSS_DOWN_CONTROL_CLASS = "rich-ordering-control-down"; //$NON-NLS-1$ + private static final String CSS_BOTTOM_CONTROL_CLASS = "rich-ordering-control-bottom"; //$NON-NLS-1$ + private static final String CSS_BUTTON_CLASS = "rich-ordering-list-button"; //$NON-NLS-1$ + private static final String CSS_BUTTON_SELECTION_CLASS = "rich-ordering-list-button-selection"; //$NON-NLS-1$ + private static final String CSS_BUTTON_CONTENT_CLASS = "rich-ordering-list-button-content"; //$NON-NLS-1$ + private static final String CSS_BUTTON_VALIGN_CLASS = "rich-ordering-list-button-valign"; //$NON-NLS-1$ - private static final String CSS_HEADER_CLASS = "rich-ordering-list-header"; - private static final String CSS_TABLE_HEADER_CLASS = "rich-ordering-list-table-header"; - private static final String CSS_TABLE_HEADER_CELL_CLASS = "rich-ordering-list-table-header-cell"; - private static final String CSS_FOOTER_CLASS = "rich-ordering-list-footer"; - private static final String CSS_TABLE_FOOTER_CLASS = "rich-ordering-list-table-footer"; - private static final String CSS_TABLE_FOOTER_CELL_CLASS = "rich-ordering-list-table-footer-cell"; + private static final String CSS_HEADER_CLASS = "rich-ordering-list-header"; //$NON-NLS-1$ + private static final String CSS_TABLE_HEADER_CLASS = "rich-ordering-list-table-header"; //$NON-NLS-1$ + private static final String CSS_TABLE_HEADER_CELL_CLASS = "rich-ordering-list-table-header-cell"; //$NON-NLS-1$ + private static final String CSS_FOOTER_CLASS = "rich-ordering-list-footer"; //$NON-NLS-1$ + private static final String CSS_TABLE_FOOTER_CLASS = "rich-ordering-list-table-footer"; //$NON-NLS-1$ + private static final String CSS_TABLE_FOOTER_CELL_CLASS = "rich-ordering-list-table-footer-cell"; //$NON-NLS-1$ - private static final String CSS_LIST_BODY_CLASS = "rich-ordering-list-body"; - private static final String CSS_LIST_OUTPUT_CLASS = "rich-ordering-list-output"; - private static final String CSS_LIST_CONTENT_CLASS = "rich-ordering-list-content"; - private static final String CSS_LIST_ITEMS_CLASS = "rich-ordering-list-items"; - private static final String CSS_LIST_ROW_CLASS = "rich-ordering-list-row"; - private static final String CSS_LIST_CELL_CLASS = "rich-ordering-list-cell"; + private static final String CSS_LIST_BODY_CLASS = "rich-ordering-list-body"; //$NON-NLS-1$ + private static final String CSS_LIST_OUTPUT_CLASS = "rich-ordering-list-output"; //$NON-NLS-1$ + private static final String CSS_LIST_CONTENT_CLASS = "rich-ordering-list-content"; //$NON-NLS-1$ + private static final String CSS_LIST_ITEMS_CLASS = "rich-ordering-list-items"; //$NON-NLS-1$ + private static final String CSS_LIST_ROW_CLASS = "rich-ordering-list-row"; //$NON-NLS-1$ + private static final String CSS_LIST_CELL_CLASS = "rich-ordering-list-cell"; //$NON-NLS-1$ /* * (non-Javadoc) @@ -145,8 +146,8 @@ // --------------------- COMMON TABLE ------------------------ - ComponentUtil.setCSSLink(pageContext, "orderingList/orderingList.css", - "richFacesOrderingList"); + ComponentUtil.setCSSLink(pageContext, "orderingList/orderingList.css", //$NON-NLS-1$ + "richFacesOrderingList"); //$NON-NLS-1$ nsIDOMElement tableCommon = visualDocument .createElement(HtmlComponentUtil.HTML_TAG_TABLE); @@ -168,13 +169,13 @@ .createElement(HtmlComponentUtil.HTML_TAG_DIV); captionRow_TD_DIV.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, CSS_CAPTION_CLASS); captionRow_TD_DIV.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, - "width: " + (listWidth == null ? DEFAULT_LIST_WIDTH : listWidth) + "px;" - +"height: " + (listHeight == null ? DEFAULT_LIST_WIDTH : listHeight) + "px;"); + "width: " + (listWidth == null ? DEFAULT_LIST_WIDTH : listWidth) + "px;" //$NON-NLS-1$ //$NON-NLS-2$ + +"height: " + (listHeight == null ? DEFAULT_LIST_WIDTH : listHeight) + "px;"); //$NON-NLS-1$ //$NON-NLS-2$ Element captionFacet = ComponentUtil.getFacet(sourceElement, CAPTION_FACET); if (null != captionFacet) { // Creating table caption with facet content - nsIDOMElement fecetDiv = encodeFacetsToDiv(pageContext, captionFacet, false, CSS_CAPTION_CLASS, "", creationData, visualDocument); + nsIDOMElement fecetDiv = encodeFacetsToDiv(pageContext, captionFacet, false, CSS_CAPTION_CLASS, "", creationData, visualDocument); //$NON-NLS-1$ captionRow_TD_DIV.appendChild(fecetDiv); } else { captionRow_TD_DIV.appendChild(visualDocument.createTextNode(captionLabel)); @@ -192,25 +193,25 @@ nsIDOMElement tableListTD; nsIDOMElement buttonsTD; - if ("left".equalsIgnoreCase(controlsHorizontalAlign)) { + if ("left".equalsIgnoreCase(controlsHorizontalAlign)) { //$NON-NLS-1$ buttonsTD = dataRow_leftTD; tableListTD = dataRow_rightTD; - buttonsTD.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, "width: 1%;"); + buttonsTD.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, "width: 1%;"); //$NON-NLS-1$ } else { tableListTD = dataRow_leftTD; buttonsTD = dataRow_rightTD; } // ---------------------buttons------------------------ - if (!"none".equalsIgnoreCase(controlsType)) { + if (!"none".equalsIgnoreCase(controlsType)) { //$NON-NLS-1$ nsIDOMElement controlsDiv = createControlsDiv(pageContext, creationData, visualDocument, sourceElement); buttonsTD.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, CSS_BUTTON_VALIGN_CLASS); - buttonsTD.setAttribute(HtmlComponentUtil.HTML_ALIGN_ATTR, "center"); + buttonsTD.setAttribute(HtmlComponentUtil.HTML_ALIGN_ATTR, "center"); //$NON-NLS-1$ - if ((null != controlsVerticalAlign) && ("".equals(controlsVerticalAlign))){ - buttonsTD.setAttribute(HtmlComponentUtil.HTML_ATTR_VALIGN, ("center" - .equalsIgnoreCase(controlsVerticalAlign) ? "middle" + if ((null != controlsVerticalAlign) && ("".equals(controlsVerticalAlign))){ //$NON-NLS-1$ + buttonsTD.setAttribute(HtmlComponentUtil.HTML_ATTR_VALIGN, ("center" //$NON-NLS-1$ + .equalsIgnoreCase(controlsVerticalAlign) ? "middle" //$NON-NLS-1$ : controlsVerticalAlign)); } @@ -250,7 +251,7 @@ nsIDOMElement tr2 = visualDocument .createElement(HtmlComponentUtil.HTML_TAG_TR); - listOutputDiv.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, "overflow:hidden;width:100%;"); + listOutputDiv.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, "overflow:hidden;width:100%;"); //$NON-NLS-1$ listTable.appendChild(tr1); listTable.appendChild(tr2); listOutputDiv.appendChild(listTable); @@ -324,7 +325,7 @@ nsIDOMElement buttonsDiv = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_DIV); buttonsDiv.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - CSS_CONTROLS_CLASS + " " + controlsClass + " " + CSS_CONTROLS_CLASS + " " + controlsClass + " " //$NON-NLS-1$ //$NON-NLS-2$ + CSS_BUTTON_LAYOUT_CLASS); Element top_control_facet = ComponentUtil.getFacet(sourceElement, TOP_CONTROL_FACET); @@ -395,11 +396,11 @@ nsIDOMElement img = visualDocument .createElement(HtmlComponentUtil.HTML_TAG_IMG); - div1.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, "dr-buttons-border" + " " + cssStyleName + " " + customStyleClass); + div1.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, "dr-buttons-border" + " " + cssStyleName + " " + customStyleClass); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ div2.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, CSS_BUTTON_CLASS); String resourceFolder = RichFacesTemplatesActivator.getPluginResourcePath(); - String divStyle = "width: 100%;background-image: url(file://" + resourceFolder + BUTTON_BG + ");"; + String divStyle = "width: 100%;background-image: url(file://" + resourceFolder + BUTTON_BG + ");"; //$NON-NLS-1$ //$NON-NLS-2$ div2.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, divStyle); div1.appendChild(div2); @@ -415,8 +416,8 @@ a.appendChild(div3); // Creating button with image and label ComponentUtil.setImg(img, imgName); - img.setAttribute(HTML.ATTR_WIDTH, "15"); - img.setAttribute(HTML.ATTR_HEIGHT, "15"); + img.setAttribute(HTML.ATTR_WIDTH, "15"); //$NON-NLS-1$ + img.setAttribute(HTML.ATTR_HEIGHT, "15"); //$NON-NLS-1$ div3.appendChild(img); if (showButtonLabels) { div3.appendChild(visualDocument.createTextNode(btnName)); @@ -470,7 +471,7 @@ nsIDOMElement tr = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_TR); thead.appendChild(tr); String styleClass = ComponentUtil.encodeStyleClass(null, - CSS_HEADER_CLASS + " " + CSS_TABLE_HEADER_CLASS, null, + CSS_HEADER_CLASS + " " + CSS_TABLE_HEADER_CLASS, null, //$NON-NLS-1$ headerClass); if (styleClass != null) { tr.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, @@ -528,23 +529,23 @@ // following line commented by yradtsevich because the variable rowClasses was not used //String rowClasses = sourceElement.getAttribute(ROW_CLASSES); - String divStyle = HtmlComponentUtil.HTML_WIDTH_ATTR + " : " - + (listWidth == null ? DEFAULT_LIST_WIDTH : listWidth) + ";" - + HtmlComponentUtil.HTML_HEIGHT_ATTR + " : " - + (listHeight == null ? DEFAULT_LIST_HEIGHT : listHeight) + ";"; + String divStyle = HtmlComponentUtil.HTML_WIDTH_ATTR + " : " //$NON-NLS-1$ + + (listWidth == null ? DEFAULT_LIST_WIDTH : listWidth) + ";" //$NON-NLS-1$ + + HtmlComponentUtil.HTML_HEIGHT_ATTR + " : " //$NON-NLS-1$ + + (listHeight == null ? DEFAULT_LIST_HEIGHT : listHeight) + ";"; //$NON-NLS-1$ contentDiv.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, divStyle); contentDiv.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - CSS_LIST_OUTPUT_CLASS + " " + CSS_LIST_CONTENT_CLASS); + CSS_LIST_OUTPUT_CLASS + " " + CSS_LIST_CONTENT_CLASS); //$NON-NLS-1$ contentTable.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - CSS_LIST_ITEMS_CLASS + " " + (null == listClass ? "" : listClass)); + CSS_LIST_ITEMS_CLASS + " " + (null == listClass ? "" : listClass)); //$NON-NLS-1$ //$NON-NLS-2$ - contentTable.setAttribute(HtmlComponentUtil.HTML_CELLSPACING_ATTR, "1"); + contentTable.setAttribute(HtmlComponentUtil.HTML_CELLSPACING_ATTR, "1"); //$NON-NLS-1$ VisualDomUtil.copyAttributes(sourceElement, contentTable); contentTable.removeAttribute(HtmlComponentUtil.HTML_ATR_HEIGHT); - contentTable.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, "width: 100%;"); + contentTable.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, "width: 100%;"); //$NON-NLS-1$ // ---------- FINALIZING and children encoding ----------- contentTable.appendChild(thead); @@ -584,8 +585,8 @@ .createElement(HtmlComponentUtil.HTML_TAG_TBODY); boolean isColumnGroup = facetBody.getNodeName() - .endsWith(":columnGroup"); - boolean isSubTable = facetBody.getNodeName().endsWith(":subTable"); + .endsWith(":columnGroup"); //$NON-NLS-1$ + boolean isSubTable = facetBody.getNodeName().endsWith(":subTable"); //$NON-NLS-1$ if (isColumnGroup) { RichFacesColumnGroupTemplate.DEFAULT_INSTANCE.encode(pageContext, creationData, facetBody, visualDocument, tbody); @@ -612,12 +613,12 @@ tr.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, CSS_BUTTON_CLASS); td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - CSS_BUTTON_CONTENT_CLASS + " " + cssStyleName + " " + CSS_BUTTON_CONTENT_CLASS + " " + cssStyleName + " " //$NON-NLS-1$ //$NON-NLS-2$ + customStyleClass); fecetDiv.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - CSS_BUTTON_CLASS + " " + CSS_BUTTON_CONTENT_CLASS + " " - + cssStyleName + " " + customStyleClass); + CSS_BUTTON_CLASS + " " + CSS_BUTTON_CONTENT_CLASS + " " //$NON-NLS-1$ //$NON-NLS-2$ + + cssStyleName + " " + customStyleClass); //$NON-NLS-1$ } } @@ -655,8 +656,8 @@ String skinFirstRowClass, String skinCellClass, String facetBodyClass, String element) { boolean isColumnGroup = facetBody.getNodeName() - .endsWith(":columnGroup"); - boolean isSubTable = facetBody.getNodeName().endsWith(":subTable"); + .endsWith(":columnGroup"); //$NON-NLS-1$ + boolean isSubTable = facetBody.getNodeName().endsWith(":subTable"); //$NON-NLS-1$ if (isColumnGroup) { RichFacesColumnGroupTemplate.DEFAULT_INSTANCE.encode(pageContext, creationData, facetBody, visualDocument, parentTheadOrTfood); @@ -715,18 +716,18 @@ ArrayList<Element> headersOrFooters, String skinCellClass, String headerClass, String facetName, String element) { for (Element column : headersOrFooters) { - String classAttribute = facetName + "Class"; + String classAttribute = facetName + "Class"; //$NON-NLS-1$ String columnHeaderClass = column.getAttribute(classAttribute); nsIDOMElement td = visualDocument.createElement(element); parentTr.appendChild(td); - td.setAttribute(HtmlComponentUtil.HTML_ATTR_BACKGROUND, "file:///" + td.setAttribute(HtmlComponentUtil.HTML_ATTR_BACKGROUND, "file:///" //$NON-NLS-1$ + ComponentUtil.getAbsoluteResourcePath(HEADER_CELL_BG).replace('\\', '/')); String styleClass = ComponentUtil.encodeStyleClass(null, skinCellClass, headerClass, columnHeaderClass); td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, styleClass); - td.setAttribute("scop", "col"); + td.setAttribute("scop", "col"); //$NON-NLS-1$ //$NON-NLS-2$ String colspan = column .getAttribute(HtmlComponentUtil.HTML_TABLE_COLSPAN); @@ -771,7 +772,7 @@ int count = 0; // check for exact value in component try { - count = Integer.parseInt(sourceElement.getAttribute("columns")); + count = Integer.parseInt(sourceElement.getAttribute("columns")); //$NON-NLS-1$ } catch (NumberFormatException e) { // calculate max html columns count for all columns/rows children. count = calculateRowColumns(sourceElement, columns); @@ -790,7 +791,7 @@ for (Element column : columns) { if (ComponentUtil.isRendered(column)) { String nodeName = column.getNodeName(); - if (nodeName.endsWith(":columnGroup")) { + if (nodeName.endsWith(":columnGroup")) { //$NON-NLS-1$ // Store max calculated value of previous rows. count = Math.max(currentLength, count); // Calculate number of columns in row. @@ -804,7 +805,7 @@ } else if (nodeName.equals(sourceElement.getPrefix() + COLUMN) || nodeName.equals(sourceElement.getPrefix() + COLUMNS)) { - String breakBeforeStr = column.getAttribute("breakBefore"); + String breakBeforeStr = column.getAttribute("breakBefore"); //$NON-NLS-1$ boolean breakBefore = Boolean.getBoolean(breakBeforeStr); // For new row, save length of previous. 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 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPickListTemplate.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -239,8 +239,8 @@ final nsIDOMElement itemsTableTBody = visualDocument.createElement(HTML.TAG_TBODY); itemsTable.setAttribute(HTML.ATTR_CLASS, RICH_PICKLIST_INTERNAL_TAB_CSS_CLASS); - itemsTable.setAttribute(HTML.ATTR_CELLPADDING, "0"); - itemsTable.setAttribute(HTML.ATTR_CELLPADDING, "0"); + itemsTable.setAttribute(HTML.ATTR_CELLPADDING, "0"); //$NON-NLS-1$ + itemsTable.setAttribute(HTML.ATTR_CELLPADDING, "0"); //$NON-NLS-1$ final VpeChildrenInfo childrensInfo = new VpeChildrenInfo(itemsTableTBody); creationData.addChildrenInfo(childrensInfo); for (Element selectItem : selectItems) { Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesProgressBarTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesProgressBarTemplate.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesProgressBarTemplate.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -39,31 +39,31 @@ public class RichFacesProgressBarTemplate extends AbstractRichFacesTemplate { /** The Constant DEFAULT_HEIGHT. */ - private static final String DEFAULT_HEIGHT = " height:13px;"; + private static final String DEFAULT_HEIGHT = " height:13px;"; //$NON-NLS-1$ /** The Constant CSS_EXTENSION. */ - private static final String CSS_EXTENSION = "progressBar"; + private static final String CSS_EXTENSION = "progressBar"; //$NON-NLS-1$ /** The Constant CSS_STYLE. */ - private static final String CSS_STYLE = "/progressBar.css"; + private static final String CSS_STYLE = "/progressBar.css"; //$NON-NLS-1$ /** The Constant FACET. */ - private static final String FACET = "facet"; + private static final String FACET = "facet"; //$NON-NLS-1$ /** The Constant OUTPUT_TEXT. */ - private static final String OUTPUT_TEXT = "outputText"; + private static final String OUTPUT_TEXT = "outputText"; //$NON-NLS-1$ /** The Constant PROGRESS_DIV_STYLE_CLASSES. */ - private static final String PROGRESS_DIV_STYLE_CLASSES = "rich-progress-bar-block rich-progress-bar-width rich-progress-bar-shell"; + private static final String PROGRESS_DIV_STYLE_CLASSES = "rich-progress-bar-block rich-progress-bar-width rich-progress-bar-shell"; //$NON-NLS-1$ /** The Constant TEXT_ALIGN_LEFT. */ - private static final String TEXT_ALIGN_LEFT = "; text-align:left;"; + private static final String TEXT_ALIGN_LEFT = "; text-align:left;"; //$NON-NLS-1$ /** The Constant UPLOADED_DIV. */ - private static final String UPLOADED_DIV = "rich-progress-bar-height rich-progress-bar-uploaded null"; + private static final String UPLOADED_DIV = "rich-progress-bar-height rich-progress-bar-uploaded null"; //$NON-NLS-1$ /** The percentage. */ - private String percentage = "60%"; + private String percentage = "60%"; //$NON-NLS-1$ /** The style. */ private String style; @@ -98,7 +98,7 @@ String clazz = PROGRESS_DIV_STYLE_CLASSES; if (ComponentUtil.isNotBlank(this.styleClass)) { - clazz = clazz + " " + this.styleClass; + clazz = clazz + " " + this.styleClass; //$NON-NLS-1$ } progressDiv.setAttribute(HTML.ATTR_CLASS, clazz); progressDiv.setAttribute(HTML.ATTR_STYLE, this.style + TEXT_ALIGN_LEFT); @@ -106,7 +106,7 @@ final NodeList list = sourceNode.getChildNodes(); for(int i = 0 ; i < list.getLength() ; i ++ ){ - if(list.item(i).getNodeName().equalsIgnoreCase("h:outputText")){ + if(list.item(i).getNodeName().equalsIgnoreCase("h:outputText")){ //$NON-NLS-1$ elements.add(list.item(i)); } } @@ -114,13 +114,13 @@ if(ComponentUtil.isNotBlank(this.sourceLabel) || elements.size() > 0){ final nsIDOMElement labelDiv = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_DIV); // labelDiv.setAttribute(HTML.ATTR_CLASS, "rich-progress-bar-width rich-progress-bar-remained rich-progress-bar-padding"); - labelDiv.setAttribute(HTML.ATTR_STYLE,this.style+"; font-weight: bold; position: relative; text-align: center; "); + labelDiv.setAttribute(HTML.ATTR_STYLE,this.style+"; font-weight: bold; position: relative; text-align: center; "); //$NON-NLS-1$ uploadDiv.appendChild(labelDiv); if (elements.size() > 0) { final StringBuffer sb = new StringBuffer(); for (Node n : elements) { - sb.append(ComponentUtil.getAttribute((Element)n, "value")); + sb.append(ComponentUtil.getAttribute((Element)n, "value")); //$NON-NLS-1$ } labelDiv.appendChild(visualDocument.createTextNode(sb.toString())); } else { @@ -198,7 +198,7 @@ private void prepareData(Element source) { this.styleClass = ComponentUtil.getAttribute(source, RichFaces.ATTR_STYLE_CLASS); this.style = ComponentUtil.getAttribute(source, HTML.ATTR_STYLE); - this.sourceLabel = ComponentUtil.getAttribute(source, "label"); + this.sourceLabel = ComponentUtil.getAttribute(source, "label"); //$NON-NLS-1$ if (ComponentUtil.isBlank(this.style)) { this.style = DEFAULT_HEIGHT; } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSeparatorTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSeparatorTemplate.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSeparatorTemplate.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -27,32 +27,32 @@ */ public class RichFacesSeparatorTemplate extends VpeAbstractTemplate { - final static String STYLE_PATH = "separator/separator.css"; + final static String STYLE_PATH = "separator/separator.css"; //$NON-NLS-1$ - final static String LINE_SOLID = "solid"; + final static String LINE_SOLID = "solid"; //$NON-NLS-1$ - final static String LINE_DOUBLE = "double"; + final static String LINE_DOUBLE = "double"; //$NON-NLS-1$ - final static String LINE_DOTTED = "dotted"; + final static String LINE_DOTTED = "dotted"; //$NON-NLS-1$ - final static String LINE_DASHED = "dashed"; + final static String LINE_DASHED = "dashed"; //$NON-NLS-1$ - final static String LINE_BEVELED = "beveled"; + final static String LINE_BEVELED = "beveled"; //$NON-NLS-1$ - final static String PIXEL_PREFIX = "px"; + final static String PIXEL_PREFIX = "px"; //$NON-NLS-1$ - final static String PERCENT_PREFIX = "%"; + final static String PERCENT_PREFIX = "%"; //$NON-NLS-1$ final static String[] LINE_TYPES = { LINE_SOLID, LINE_DOUBLE, LINE_DOTTED, LINE_DASHED, LINE_BEVELED }; - final static String LINE_TYPE_ATTR = "lineType"; + final static String LINE_TYPE_ATTR = "lineType"; //$NON-NLS-1$ - final static String DEFAULT_HEIGHT = "6px"; + final static String DEFAULT_HEIGHT = "6px"; //$NON-NLS-1$ - final static String DEFAULT_ALIGN = "left"; + final static String DEFAULT_ALIGN = "left"; //$NON-NLS-1$ - final static String DEFAULT_WIDTH = "100%"; + final static String DEFAULT_WIDTH = "100%"; //$NON-NLS-1$ /** * Creates a node of the visual tree on the node of the source tree. This @@ -68,7 +68,7 @@ * @return The information on the created node of the visual tree. */ public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { - ComponentUtil.setCSSLink(pageContext, STYLE_PATH, "richFacesSeparator"); + ComponentUtil.setCSSLink(pageContext, STYLE_PATH, "richFacesSeparator"); //$NON-NLS-1$ Element sourceElement = (Element) sourceNode; /* Create new html element table */ nsIDOMElement separator = visualDocument @@ -86,24 +86,24 @@ separator.setAttribute(HtmlComponentUtil.HTML_ALIGN_ATTR, (align == null ? DEFAULT_ALIGN : align)); separator.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - "td-parentdiv"); - String lineClass = sourceElement.getAttribute("styleClass"); + "td-parentdiv"); //$NON-NLS-1$ + String lineClass = sourceElement.getAttribute("styleClass"); //$NON-NLS-1$ /* Apply class for separator */ String lineType = sourceElement.getAttribute(LINE_TYPE_ATTR); - String style = sourceElement.getAttribute("style"); + String style = sourceElement.getAttribute("style"); //$NON-NLS-1$ if (lineType == null || lineType.equalsIgnoreCase(LINE_BEVELED)) { line.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - "dr-table-header rich-table-header-continue" - + (lineClass == null ? "" : lineClass)); + "dr-table-header rich-table-header-continue" //$NON-NLS-1$ + + (lineClass == null ? "" : lineClass)); //$NON-NLS-1$ style = setBeveledStyle(width, height, ComponentUtil .getHeaderBackgoundImgStyle() - + ";" + (style == null ? "" : style)); + + ";" + (style == null ? "" : style)); //$NON-NLS-1$ //$NON-NLS-2$ } else { line.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - (lineClass == null ? "" : lineClass)); + (lineClass == null ? "" : lineClass)); //$NON-NLS-1$ style = setStyle(lineType, width, height, style); line.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, - "separator-color"); + "separator-color"); //$NON-NLS-1$ } line.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, style); separator.appendChild(line); @@ -133,7 +133,7 @@ if (lineType != null && lineType.equalsIgnoreCase(LINE_BEVELED)) { newStyle = setBeveledStyle(width, height, ComponentUtil .getHeaderBackgoundImgStyle() - + ";" + (style == null ? "" : style)); + + ";" + (style == null ? "" : style)); //$NON-NLS-1$ //$NON-NLS-2$ } else { newStyle = setStyle(lineType, (width == null ? DEFAULT_WIDTH : addPrefixSize(width)), @@ -150,7 +150,7 @@ } else { newStyle = setStyle(lineType, (width == null ? DEFAULT_WIDTH : addPrefixSize(width)), - (height == null ? DEFAULT_HEIGHT : height), ""); + (height == null ? DEFAULT_HEIGHT : height), ""); //$NON-NLS-1$ } line.setAttribute(name, newStyle); @@ -188,7 +188,7 @@ if (lineType.equalsIgnoreCase(LINE_BEVELED)) { newStyle = setBeveledStyle(width, value, ComponentUtil .getHeaderBackgoundImgStyle() - + ";" + (style == null ? "" : style)); + + ";" + (style == null ? "" : style)); //$NON-NLS-1$ //$NON-NLS-2$ } else { newStyle = setStyle( lineType, @@ -204,7 +204,7 @@ if (lineType.equalsIgnoreCase(LINE_BEVELED)) { newStyle = setBeveledStyle(value, height, ComponentUtil .getHeaderBackgoundImgStyle() - + ";" + (style == null ? "" : style)); + + ";" + (style == null ? "" : style)); //$NON-NLS-1$ //$NON-NLS-2$ } else { newStyle = setStyle(lineType, (value == null ? DEFAULT_WIDTH : addPrefixSize(value)), @@ -219,7 +219,7 @@ if (value.equalsIgnoreCase(LINE_BEVELED)) { newStyle = setBeveledStyle(width, height, ComponentUtil .getHeaderBackgoundImgStyle() - + ";" + (style == null ? "" : style)); + + ";" + (style == null ? "" : style)); //$NON-NLS-1$ //$NON-NLS-2$ } else { newStyle = setStyle(value, (width == null ? DEFAULT_WIDTH : addPrefixSize(width)), @@ -233,7 +233,7 @@ if (lineType.equalsIgnoreCase(LINE_BEVELED)) { newStyle = setBeveledStyle(width, value, ComponentUtil .getHeaderBackgoundImgStyle() - + ";" + (value == null ? "" : value)); + + ";" + (value == null ? "" : value)); //$NON-NLS-1$ //$NON-NLS-2$ } else { newStyle = setStyle(lineType, (width == null ? DEFAULT_WIDTH : addPrefixSize(width)), @@ -325,10 +325,10 @@ private String setStyle(String lineType, String width, String height, String style) { StringBuffer newStyle = new StringBuffer(); - newStyle.append(HtmlComponentUtil.CSS_BORDER_STYLE + ":" + (lineType == null ? LINE_SOLID : lineType) + ";"); - newStyle.append(HtmlComponentUtil.CSS_BORDER_WIDTH + ":" + (height == null ? DEFAULT_HEIGHT : height) + " 0px 0px;"); - newStyle.append(HtmlComponentUtil.HTML_ATR_WIDTH + ":" + (width == null ? DEFAULT_WIDTH : width) + ";"); - newStyle.append((style == null ? "" : style)); + newStyle.append(HtmlComponentUtil.CSS_BORDER_STYLE + ":" + (lineType == null ? LINE_SOLID : lineType) + ";"); //$NON-NLS-1$ //$NON-NLS-2$ + newStyle.append(HtmlComponentUtil.CSS_BORDER_WIDTH + ":" + (height == null ? DEFAULT_HEIGHT : height) + " 0px 0px;"); //$NON-NLS-1$ //$NON-NLS-2$ + newStyle.append(HtmlComponentUtil.HTML_ATR_WIDTH + ":" + (width == null ? DEFAULT_WIDTH : width) + ";"); //$NON-NLS-1$ //$NON-NLS-2$ + newStyle.append((style == null ? "" : style)); //$NON-NLS-1$ return newStyle.toString(); } @@ -342,9 +342,9 @@ */ private String setBeveledStyle(String width, String height, String style) { StringBuffer newStyle = new StringBuffer(); - newStyle.append(HtmlComponentUtil.HTML_ATR_HEIGHT + ":" + (height == null ? DEFAULT_HEIGHT : height) + ";"); - newStyle.append(HtmlComponentUtil.HTML_ATR_WIDTH + ":" + (width == null ? DEFAULT_WIDTH : width) + ";"); - newStyle.append((style == null ? "" : style)); + newStyle.append(HtmlComponentUtil.HTML_ATR_HEIGHT + ":" + (height == null ? DEFAULT_HEIGHT : height) + ";"); //$NON-NLS-1$ //$NON-NLS-2$ + newStyle.append(HtmlComponentUtil.HTML_ATR_WIDTH + ":" + (width == null ? DEFAULT_WIDTH : width) + ";"); //$NON-NLS-1$ //$NON-NLS-2$ + newStyle.append((style == null ? "" : style)); //$NON-NLS-1$ return newStyle.toString(); } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToggleControlTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToggleControlTemplate.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesToggleControlTemplate.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -42,30 +42,30 @@ Element sourceElement = (Element)sourceNode; - nsIDOMElement span = visualDocument.createElement("span"); + nsIDOMElement span = visualDocument.createElement("span"); //$NON-NLS-1$ storedSwitchSpan = span; VpeCreationData creationData = new VpeCreationData(span); - String forIds = sourceElement.getAttribute("for"); - String value = sourceElement.getAttribute("value"); - String switchToState = sourceElement.getAttribute("switchToState"); + String forIds = sourceElement.getAttribute("for"); //$NON-NLS-1$ + String value = sourceElement.getAttribute("value"); //$NON-NLS-1$ + String switchToState = sourceElement.getAttribute("switchToState"); //$NON-NLS-1$ ComponentUtil.correctAttribute(sourceElement, span, - "styleClass", - HtmlComponentUtil.HTML_CLASS_ATTR, "", ""); + "styleClass", //$NON-NLS-1$ + HtmlComponentUtil.HTML_CLASS_ATTR, "", ""); //$NON-NLS-1$ //$NON-NLS-2$ ComponentUtil.correctAttribute(sourceElement, span, - "style", - HtmlComponentUtil.HTML_STYLE_ATTR, "color:blue;text-decoration:underline;", "color:blue;text-decoration:underline;"); + "style", //$NON-NLS-1$ + HtmlComponentUtil.HTML_STYLE_ATTR, "color:blue;text-decoration:underline;", "color:blue;text-decoration:underline;"); //$NON-NLS-1$ //$NON-NLS-2$ - span.setAttribute("vpe-user-toggle-id", (switchToState == null ? "" : switchToState.trim())); + span.setAttribute("vpe-user-toggle-id", (switchToState == null ? "" : switchToState.trim())); //$NON-NLS-1$ //$NON-NLS-2$ List<Node> children = ComponentUtil.getChildren(sourceElement); VpeChildrenInfo bodyInfo = new VpeChildrenInfo(span); //string shoudn't be null, if then it's crash application if(value==null){ - value=""; + value=""; //$NON-NLS-1$ } nsIDOMNode valueText = visualDocument.createTextNode(value); span.appendChild(valueText); @@ -90,9 +90,9 @@ super.validate(pageContext, sourceNode, visualDocument, data); if (storedSwitchSpan == null) return; - String value = storedSwitchSpan.getAttribute("vpe-user-toggle-id"); - applyAttributeValueOnChildren("vpe-user-toggle-id", value, ComponentUtil.getChildren(storedSwitchSpan)); - applyAttributeValueOnChildren("vpe-user-toggle-lookup-parent", "true", ComponentUtil.getChildren(storedSwitchSpan)); + String value = storedSwitchSpan.getAttribute("vpe-user-toggle-id"); //$NON-NLS-1$ + applyAttributeValueOnChildren("vpe-user-toggle-id", value, ComponentUtil.getChildren(storedSwitchSpan)); //$NON-NLS-1$ + applyAttributeValueOnChildren("vpe-user-toggle-lookup-parent", "true", ComponentUtil.getChildren(storedSwitchSpan)); //$NON-NLS-1$ //$NON-NLS-2$ } private void applyAttributeValueOnChildren(String attrName, String attrValue, List<nsIDOMNode> children) { @@ -113,10 +113,10 @@ Element sourceElement = (Element)(sourceNode instanceof Element ? sourceNode : sourceNode.getParentNode()); - String forIds = sourceElement.getAttribute("for"); + String forIds = sourceElement.getAttribute("for"); //$NON-NLS-1$ if (forIds == null) return; - StringTokenizer st = new StringTokenizer(forIds.trim(), ",", false); + StringTokenizer st = new StringTokenizer(forIds.trim(), ",", false); //$NON-NLS-1$ while (st.hasMoreElements()) { String id = st.nextToken().trim(); if (null == id) continue; @@ -149,8 +149,8 @@ if(child instanceof Element) { Element childElement = (Element)child; - if (childElement.getNodeName().endsWith(":togglePanel") && - id.equals(childElement.getAttribute("id")) ) { + if (childElement.getNodeName().endsWith(":togglePanel") && //$NON-NLS-1$ + id.equals(childElement.getAttribute("id")) ) { //$NON-NLS-1$ list.add(childElement); } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTogglePanelTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTogglePanelTemplate.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesTogglePanelTemplate.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -39,7 +39,7 @@ Element sourceElement = (Element)sourceNode; - nsIDOMElement div = visualDocument.createElement("div"); + nsIDOMElement div = visualDocument.createElement("div"); //$NON-NLS-1$ VpeCreationData creationData = new VpeCreationData(div); @@ -73,9 +73,9 @@ for (int i = 0; children != null && i < children.getLength(); i++) { Node child = children.item(i); - if (child instanceof Element && child.getNodeName().endsWith(":facet")) { + if (child instanceof Element && child.getNodeName().endsWith(":facet")) { //$NON-NLS-1$ Element facet = (Element)child; - String name = ((Element)facet).getAttribute("name"); + String name = ((Element)facet).getAttribute("name"); //$NON-NLS-1$ if (name != null) { states.put(name, facet); } @@ -85,11 +85,11 @@ } private String getInitialState(Element sourceElement) { - String initialState = sourceElement.getAttribute("initialState"); + String initialState = sourceElement.getAttribute("initialState"); //$NON-NLS-1$ - String stateOrder = sourceElement.getAttribute("stateOrder"); + String stateOrder = sourceElement.getAttribute("stateOrder"); //$NON-NLS-1$ if(stateOrder!=null) { - StringTokenizer st = new StringTokenizer(stateOrder.trim(), ",", false); + StringTokenizer st = new StringTokenizer(stateOrder.trim(), ",", false); //$NON-NLS-1$ String firstState = null; while(st.hasMoreElements()) { String state = st.nextToken().trim(); @@ -116,7 +116,7 @@ private String getActiveState(Element sourceElement) { String activeStateStr; - String stateOrder = sourceElement.getAttribute("stateOrder"); + String stateOrder = sourceElement.getAttribute("stateOrder"); //$NON-NLS-1$ if(null == stateOrder) return null; activeStateStr = (String)toggleMap.get(sourceElement); @@ -129,11 +129,11 @@ } private String getNextState(Element sourceElement, String toggleId) { - String stateOrder = sourceElement.getAttribute("stateOrder"); + String stateOrder = sourceElement.getAttribute("stateOrder"); //$NON-NLS-1$ if(null == stateOrder) return null; String activeState = getActiveState(sourceElement); - StringTokenizer st = new StringTokenizer(stateOrder.trim(), ",", false); + StringTokenizer st = new StringTokenizer(stateOrder.trim(), ",", false); //$NON-NLS-1$ String firstState = null; while (st.hasMoreElements()) { String state = st.nextToken(); Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesVirtualEarthTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesVirtualEarthTemplate.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesVirtualEarthTemplate.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -29,15 +29,15 @@ */ public class RichFacesVirtualEarthTemplate extends VpeAbstractTemplate { - private static String EARTH_AERIAL = "/virtualEarth/earth_aerial.png"; - private static String EARTH_HYBRID = "/virtualEarth/earth_hybrid.png"; - private static String EARTH_ROAD = "/virtualEarth/earth_road.png"; + private static String EARTH_AERIAL = "/virtualEarth/earth_aerial.png"; //$NON-NLS-1$ + private static String EARTH_HYBRID = "/virtualEarth/earth_hybrid.png"; //$NON-NLS-1$ + private static String EARTH_ROAD = "/virtualEarth/earth_road.png"; //$NON-NLS-1$ - private static String MAP_STYLE_ATTRIBUTE_NAME = "mapStyle"; + private static String MAP_STYLE_ATTRIBUTE_NAME = "mapStyle"; //$NON-NLS-1$ - private static String MAP_STYLE_VALUES[] = { "road", "aerial", "hybrid" }; + private static String MAP_STYLE_VALUES[] = { "road", "aerial", "hybrid" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - private static String STYLE_CLASS_ATTR_NAME = "styleClass"; + private static String STYLE_CLASS_ATTR_NAME = "styleClass"; //$NON-NLS-1$ public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { @@ -82,7 +82,7 @@ .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); if (name.equalsIgnoreCase(MAP_STYLE_ATTRIBUTE_NAME)) { - if (value.trim().equalsIgnoreCase("") + if (value.trim().equalsIgnoreCase("") //$NON-NLS-1$ || !searchInMapStyleValues(value)) { ComponentUtil.setImg(img, EARTH_ROAD); return; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/seam/test/unit/SeamTextTest.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/seam/test/unit/SeamTextTest.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/seam/test/unit/SeamTextTest.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -24,7 +24,7 @@ public class SeamTextTest { public static void main(String[] args) throws Exception { - Reader r = new InputStreamReader( SeamTextTest.class.getResourceAsStream("SeamTextTest.txt") ); + Reader r = new InputStreamReader( SeamTextTest.class.getResourceAsStream("SeamTextTest.txt") ); //$NON-NLS-1$ SeamTextLexer lexer = new SeamTextLexer(r); SeamTextParser parser = new SeamTextParser(lexer); parser.startRule(); Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/seam/text/xpl/SeamTextLexer.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/seam/text/xpl/SeamTextLexer.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/seam/text/xpl/SeamTextLexer.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -26,6 +26,7 @@ import antlr.collections.impl.BitSet; import antlr.SemanticException; +@SuppressWarnings("nls") public class SeamTextLexer extends antlr.CharScanner implements SeamTextParserTokenTypes, TokenStream { public SeamTextLexer(InputStream in) { Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/seam/text/xpl/SeamTextParser.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/seam/text/xpl/SeamTextParser.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/seam/text/xpl/SeamTextParser.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -16,6 +16,7 @@ import antlr.ParserSharedInputState; import antlr.collections.impl.BitSet; +@SuppressWarnings("nls") public class SeamTextParser extends antlr.LLkParser implements SeamTextParserTokenTypes { Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/SeamTemplatesActivator.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/SeamTemplatesActivator.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/SeamTemplatesActivator.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -22,7 +22,7 @@ public class SeamTemplatesActivator extends BaseUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.jsf.vpe.seam"; + public static final String PLUGIN_ID = "org.jboss.tools.jsf.vpe.seam"; //$NON-NLS-1$ // The shared instance private static SeamTemplatesActivator plugin; Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/AbstractELCompletionEngine.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/AbstractELCompletionEngine.java 2009-07-27 07:43:39 UTC (rev 16811) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/AbstractELCompletionEngine.java 2009-07-27 08:01:32 UTC (rev 16812) @@ -600,7 +600,7 @@ String filter = expr.getMemberName(); boolean bSurroundWithQuotes = false; if(filter == null) { - filter = ""; + filter = ""; //$NON-NLS-1$ bSurroundWithQuotes = true; } else { if((filter.startsWith("'") || filter.startsWith("\"")) //$NON-NLS-1$ //$NON-NLS-2$