diff options
| author | rsrinivasan | 2008-04-24 00:22:54 +0000 |
|---|---|---|
| committer | rsrinivasan | 2008-04-24 00:22:54 +0000 |
| commit | 888a18e6822309c48ee510bc1f6592607fe8a7a6 (patch) | |
| tree | 2c99019ce15621c2571902a00f776cd7bccf5ea3 | |
| parent | 76f4149a89abc7ca527a65ace346056728eee7da (diff) | |
| download | webtools.jsf-888a18e6822309c48ee510bc1f6592607fe8a7a6.tar.gz webtools.jsf-888a18e6822309c48ee510bc1f6592607fe8a7a6.tar.xz webtools.jsf-888a18e6822309c48ee510bc1f6592607fe8a7a6.zip | |
186549 - Complete Externalization of Strings (Part 1)
35 files changed, 220 insertions, 208 deletions
diff --git a/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/src/org/eclipse/jst/jsf/apache/trinidad/tagsupport/TrinidadTagSupportActivator.java b/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/src/org/eclipse/jst/jsf/apache/trinidad/tagsupport/TrinidadTagSupportActivator.java index 2553631f2..c5739895d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/src/org/eclipse/jst/jsf/apache/trinidad/tagsupport/TrinidadTagSupportActivator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/src/org/eclipse/jst/jsf/apache/trinidad/tagsupport/TrinidadTagSupportActivator.java @@ -24,7 +24,7 @@ public class TrinidadTagSupportActivator extends AbstractUIPlugin { /** * the plugin id */ - public static final String PLUGIN_ID = "org.eclipse.jst.jsf.apache.trinidad.tagsupport"; + public static final String PLUGIN_ID = "org.eclipse.jst.jsf.apache.trinidad.tagsupport"; //$NON-NLS-1$ // The shared instance private static TrinidadTagSupportActivator plugin; diff --git a/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/src/org/eclipse/jst/jsf/apache/trinidad/tagsupport/converter/operations/AbstractLabelAndHelpOperation.java b/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/src/org/eclipse/jst/jsf/apache/trinidad/tagsupport/converter/operations/AbstractLabelAndHelpOperation.java index 5b3fb6541..4232cc356 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/src/org/eclipse/jst/jsf/apache/trinidad/tagsupport/converter/operations/AbstractLabelAndHelpOperation.java +++ b/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/src/org/eclipse/jst/jsf/apache/trinidad/tagsupport/converter/operations/AbstractLabelAndHelpOperation.java @@ -66,9 +66,9 @@ public abstract class AbstractLabelAndHelpOperation extends AbstractTrinidadTran } else { outerElement = createElement("table"); //$NON-NLS-1$ //append table-specific attributes - appendAttribute(outerElement, "cellpadding", "0"); //$NON-NLS-1$ - appendAttribute(outerElement, "cellspacing", "0"); //$NON-NLS-1$ - appendAttribute(outerElement, "border", "0"); //$NON-NLS-1$ + appendAttribute(outerElement, "cellpadding", "0"); //$NON-NLS-1$ //$NON-NLS-2$ + appendAttribute(outerElement, "cellspacing", "0"); //$NON-NLS-1$ //$NON-NLS-2$ + appendAttribute(outerElement, "border", "0"); //$NON-NLS-1$ //$NON-NLS-2$ } //append common attributes diff --git a/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/src/org/eclipse/jst/jsf/apache/trinidad/tagsupport/converter/operations/OutputFormattedOperation.java b/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/src/org/eclipse/jst/jsf/apache/trinidad/tagsupport/converter/operations/OutputFormattedOperation.java index 43da8ec4c..780ec1132 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/src/org/eclipse/jst/jsf/apache/trinidad/tagsupport/converter/operations/OutputFormattedOperation.java +++ b/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/src/org/eclipse/jst/jsf/apache/trinidad/tagsupport/converter/operations/OutputFormattedOperation.java @@ -90,9 +90,9 @@ public class OutputFormattedOperation extends AbstractTrinidadTransformOperation String value = srcElement.getAttribute("value"); //$NON-NLS-1$ if (value != null && value.length() > 0) { StringBuffer wrappedValue = new StringBuffer(); - wrappedValue.append("<?xml version=\"1.0\"?><value>"); + wrappedValue.append("<?xml version=\"1.0\"?><value>"); //$NON-NLS-1$ wrappedValue.append(value); - wrappedValue.append("</value>"); + wrappedValue.append("</value>"); //$NON-NLS-1$ InputStream inputStream = new ByteArrayInputStream(wrappedValue.toString().getBytes()); Element valueElement = getValueDocumentElement(inputStream); if (valueElement != null) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/src/org/eclipse/jst/jsf/apache/trinidad/tagsupport/converter/operations/PanelTabbedOperation.java b/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/src/org/eclipse/jst/jsf/apache/trinidad/tagsupport/converter/operations/PanelTabbedOperation.java index d6f56d050..e6641df81 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/src/org/eclipse/jst/jsf/apache/trinidad/tagsupport/converter/operations/PanelTabbedOperation.java +++ b/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/src/org/eclipse/jst/jsf/apache/trinidad/tagsupport/converter/operations/PanelTabbedOperation.java @@ -133,7 +133,7 @@ public class PanelTabbedOperation extends AbstractTrinidadTransformOperation { appendAttribute(tableElement, "border", "0"); //$NON-NLS-1$ //$NON-NLS-2$ appendAttribute(tableElement, "width", "100%"); //$NON-NLS-1$ //$NON-NLS-2$ appendAttribute(tableElement, "summary", ""); //$NON-NLS-1$ //$NON-NLS-2$ - Element trElement = appendChildElement("tr", tableElement); + Element trElement = appendChildElement("tr", tableElement); //$NON-NLS-1$ //append first separator appendSeparatorTD(trElement, SEP_POS_START); diff --git a/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/src/org/eclipse/jst/jsf/apache/trinidad/tagsupport/converter/operations/SelectShuttleOperation.java b/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/src/org/eclipse/jst/jsf/apache/trinidad/tagsupport/converter/operations/SelectShuttleOperation.java index e3e986331..218d10a33 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/src/org/eclipse/jst/jsf/apache/trinidad/tagsupport/converter/operations/SelectShuttleOperation.java +++ b/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/src/org/eclipse/jst/jsf/apache/trinidad/tagsupport/converter/operations/SelectShuttleOperation.java @@ -31,12 +31,13 @@ import org.w3c.dom.Element; */ public class SelectShuttleOperation extends AbstractTrinidadTransformOperation { - private static final String STYLE_HEADER = "font-family:Arial,Helvetica,Geneva,sans-serif;font-size:9pt;color:#669966;font-weight:bold;padding:0px 0px 0px 18px;"; - private static final String STYLE_REQUIRED = "color:#669966;font-family:Courier,sans-serif;"; - private static final String STYLE_LISTCOLUMN = "font-family:Arial,Helvetica,Geneva,sans-serif;font-size:10pt;font-weight:normal;"; - private static final String STYLE_SELECT = "font-family:Arial,Helvetica,Geneva,sans-serif;font-size:10pt;font-weight:normal;color:#000000;"; - private static final String STYLE_DESCRIPTION = "font-family:Arial,Helvetica,Geneva,sans-serif;font-size:10pt;font-weight:normal;color:#000000;"; - private static final String STYLE_LINK = "font-family:Arial,Helvetica,Geneva,sans-serif;font-size:10pt;font-weight:normal;color:#003333;"; + private static final String STYLE_HEADER = "font-family:Arial,Helvetica,Geneva,sans-serif;font-size:9pt;color:#669966;font-weight:bold;padding:0px 0px 0px 18px;"; //$NON-NLS-1$ + private static final String STYLE_REQUIRED = "color:#669966;font-family:Courier,sans-serif;"; //$NON-NLS-1$ + private static final String STYLE_LISTCOLUMN = "font-family:Arial,Helvetica,Geneva,sans-serif;font-size:10pt;font-weight:normal;"; //$NON-NLS-1$ + private static final String STYLE_SELECT = "font-family:Arial,Helvetica,Geneva,sans-serif;font-size:10pt;font-weight:normal;color:#000000;"; //$NON-NLS-1$ + private static final String STYLE_DESCRIPTION = "font-family:Arial,Helvetica,Geneva,sans-serif;font-size:10pt;font-weight:normal;color:#000000;"; //$NON-NLS-1$ + private static final String STYLE_LINK = "font-family:Arial,Helvetica,Geneva,sans-serif;font-size:10pt;font-weight:normal;color:#003333;"; //$NON-NLS-1$ + private static final String DEFAULT_SIZE = "10"; //$NON-NLS-1$ private static final String[] LINKS_MOVE = new String[]{ Messages.SelectShuttleOperation_LinkMove, @@ -205,9 +206,9 @@ public class SelectShuttleOperation extends AbstractTrinidadTransformOperation { //build footer structure String footerFacetName; if (isLeadingColumn) { - footerFacetName = "leadingFooter"; + footerFacetName = "leadingFooter"; //$NON-NLS-1$ } else { - footerFacetName = "trailingFooter"; + footerFacetName = "trailingFooter"; //$NON-NLS-1$ } Element footerFacet = getChildFacetByName(srcElement, footerFacetName); //$NON-NLS-1$ if (footerFacet != null) { @@ -238,8 +239,8 @@ public class SelectShuttleOperation extends AbstractTrinidadTransformOperation { } private String getSizeString(Element srcElement) { - String size = "10"; - String sizeAttr = srcElement.getAttribute("size"); + String size = DEFAULT_SIZE; + String sizeAttr = srcElement.getAttribute("size"); //$NON-NLS-1$ if (sizeAttr != null && sizeAttr.length() > 0) { try { int iSize = Integer.parseInt(sizeAttr); diff --git a/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/src/org/eclipse/jst/jsf/apache/trinidad/tagsupport/el/TrinidadDecorativeVariableResolver.java b/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/src/org/eclipse/jst/jsf/apache/trinidad/tagsupport/el/TrinidadDecorativeVariableResolver.java index b3c51cb7e..0dc74063c 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/src/org/eclipse/jst/jsf/apache/trinidad/tagsupport/el/TrinidadDecorativeVariableResolver.java +++ b/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/src/org/eclipse/jst/jsf/apache/trinidad/tagsupport/el/TrinidadDecorativeVariableResolver.java @@ -25,11 +25,11 @@ public class TrinidadDecorativeVariableResolver extends { private final static JSFSymbolFactory _symbolFactory = new JSFSymbolFactory(); - public final static String PAGE_FLOW_SCOPE_VARIABLE_NAME = "pageFlowScope"; - public final static String PROCESS_SCOPE_VARIABLE_NAME = "processScope"; + public final static String PAGE_FLOW_SCOPE_VARIABLE_NAME = "pageFlowScope"; //$NON-NLS-1$ + public final static String PROCESS_SCOPE_VARIABLE_NAME = "processScope"; //$NON-NLS-1$ - public final static String REQUEST_CONTEXT_VARIABLE_NAME = "requestContext"; - public final static String REQUEST_CONTEXT_CLASS_NAME = "org.apache.myfaces.trinidad.context.RequestContext"; + public final static String REQUEST_CONTEXT_VARIABLE_NAME = "requestContext"; //$NON-NLS-1$ + public final static String REQUEST_CONTEXT_CLASS_NAME = "org.apache.myfaces.trinidad.context.RequestContext"; //$NON-NLS-1$ @Override public ISymbol[] getAllVariables(final DTFacesContext facesContext, diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/JSFCommonRuntimePlugin.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/JSFCommonRuntimePlugin.java index d17c6f596..39c511cee 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/JSFCommonRuntimePlugin.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/JSFCommonRuntimePlugin.java @@ -14,7 +14,7 @@ public class JSFCommonRuntimePlugin extends Plugin { /** * The plug-in ID */ - public static final String PLUGIN_ID = "CommonComponentPlugin"; + public static final String PLUGIN_ID = "CommonComponentPlugin"; //$NON-NLS-1$ // The shared instance private static JSFCommonRuntimePlugin plugin; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/RenderNode.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/RenderNode.java index 1096f9d4e..95bff7ac9 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/RenderNode.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/RenderNode.java @@ -60,14 +60,14 @@ public class RenderNode extends JSFMonitorMessage } public String toString() { - String toString = "Root node: "+_renderedNodeName+", attributes: ["; + String toString = "Root node: "+_renderedNodeName+", attributes: ["; //$NON-NLS-1$ //$NON-NLS-2$ for (Iterator it = _renderedAttributes.iterator(); it.hasNext();) { final RenderAttribute attribute = (RenderAttribute) it.next(); - toString+=attribute.getName() + "=" + attribute.getValue(); + toString+=attribute.getName() + "=" + attribute.getValue(); //$NON-NLS-1$ - toString+=it.hasNext() ? ", " : "]"; + toString+=it.hasNext() ? ", " : "]"; //$NON-NLS-1$ //$NON-NLS-2$ } return toString; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/ViewObject.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/ViewObject.java index 63fa2b4d0..1fe2cab4d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/ViewObject.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/ViewObject.java @@ -361,7 +361,7 @@ public abstract class ViewObject implements Serializable /* IAdaptable? */ if (decorator == null || associatedType == null) { - throw new IllegalArgumentException("Arguments must not be null"); + throw new IllegalArgumentException("Arguments must not be null"); //$NON-NLS-1$ } final List decoratorsByType = (List) getDecoratorMap().get( @@ -385,18 +385,18 @@ public abstract class ViewObject implements Serializable /* IAdaptable? */ if (adapterType == null || adapter == null) { - throw new IllegalArgumentException("Arguments must not be null"); + throw new IllegalArgumentException("Arguments must not be null"); //$NON-NLS-1$ } if (!adapterType.isInstance(adapter)) { - throw new IllegalArgumentException("adapter: " + adapter - + " must be cast compatible to class: " + adapterType); + throw new IllegalArgumentException("adapter: " + adapter //$NON-NLS-1$ + + " must be cast compatible to class: " + adapterType); //$NON-NLS-1$ } else if (adapterType.isInstance(_owner)) { - throw new IllegalArgumentException("this: " + _owner - + " must not already be an instance of class: " + throw new IllegalArgumentException("this: " + _owner //$NON-NLS-1$ + + " must not already be an instance of class: " //$NON-NLS-1$ + adapterType); } getAdapterMap().put(adapterType, adapter); @@ -411,7 +411,7 @@ public abstract class ViewObject implements Serializable /* IAdaptable? */ if (decorator == null) { - throw new IllegalArgumentException("Arguments must not be null"); + throw new IllegalArgumentException("Arguments must not be null"); //$NON-NLS-1$ } final Class associationType = decorator.getClass(); addDecorator(decorator, associationType); @@ -427,7 +427,7 @@ public abstract class ViewObject implements Serializable /* IAdaptable? */ if (decorator == null || associatedType == null) { - throw new IllegalArgumentException("Arguments must not be null"); + throw new IllegalArgumentException("Arguments must not be null"); //$NON-NLS-1$ } List decoratorsByType = (List) getDecoratorMap().get(associatedType); @@ -500,7 +500,7 @@ public abstract class ViewObject implements Serializable /* IAdaptable? */ { if (isProtected()) { - throw new UnsupportedOperationException("Object "+this.toString()+ " is locked for modification"); + throw new UnsupportedOperationException("Object "+this.toString()+ " is locked for modification"); //$NON-NLS-1$ //$NON-NLS-2$ } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentFactory.java index caf4716c5..f9aa677eb 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentFactory.java @@ -68,44 +68,44 @@ public class ComponentFactory /** * Base class name for UIInput's */ - public final static String BASE_CLASS_UIINPUT = "javax.faces.component.UIInput"; + public final static String BASE_CLASS_UIINPUT = "javax.faces.component.UIInput"; //$NON-NLS-1$ /** * Base class name for UIOutput's */ - public final static String BASE_CLASS_UIOUTPUT = "javax.faces.component.UIOutput"; + public final static String BASE_CLASS_UIOUTPUT = "javax.faces.component.UIOutput"; //$NON-NLS-1$ /** * Base class name for UICommand's */ - public final static String BASE_CLASS_UICOMMAND = "javax.faces.component.UICommand"; + public final static String BASE_CLASS_UICOMMAND = "javax.faces.component.UICommand"; //$NON-NLS-1$ /** * Base class name for UIData's */ - public final static String BASE_CLASS_UIDATA = "javax.faces.component.UIData"; + public final static String BASE_CLASS_UIDATA = "javax.faces.component.UIData"; //$NON-NLS-1$ /** * Base class name for UIForm's */ - public final static String BASE_CLASS_UIFORM = "javax.faces.component.UIForm"; + public final static String BASE_CLASS_UIFORM = "javax.faces.component.UIForm"; //$NON-NLS-1$ /** * Interface name for ValueHolder's */ - public final static String INTERFACE_VALUEHOLDER = "javax.faces.component.ValueHolder"; + public final static String INTERFACE_VALUEHOLDER = "javax.faces.component.ValueHolder"; //$NON-NLS-1$ /** * Interface name for EditableValueHolder's */ - public final static String INTERFACE_EDITABLEVALUEHOLDER = "javax.faces.component.EditableValueHolder"; + public final static String INTERFACE_EDITABLEVALUEHOLDER = "javax.faces.component.EditableValueHolder"; //$NON-NLS-1$ /** * Interface name for ActionSource's */ - public final static String INTERFACE_ACTIONSOURCE = "javax.faces.component.ActionSource"; + public final static String INTERFACE_ACTIONSOURCE = "javax.faces.component.ActionSource"; //$NON-NLS-1$ /** * Interface name for ActionSource2's */ - public final static String INTERFACE_ACTIONSOURCE2 = "javax.faces.component.ActionSource2"; + public final static String INTERFACE_ACTIONSOURCE2 = "javax.faces.component.ActionSource2"; //$NON-NLS-1$ /** * Interface name for NamingContainer's */ - public final static String INTERFACE_NAMINGCONTAINER = "javax.faces.component.NamingContainer"; + public final static String INTERFACE_NAMINGCONTAINER = "javax.faces.component.NamingContainer"; //$NON-NLS-1$ /** * @param id @@ -128,9 +128,9 @@ public class ComponentFactory */ public static void maybeDefaultRendered(final Map attributes) { - if (!(attributes.get("rendered") instanceof Boolean)) + if (!(attributes.get("rendered") instanceof Boolean)) //$NON-NLS-1$ { - attributes.put("rendered", Boolean.TRUE); + attributes.put("rendered", Boolean.TRUE); //$NON-NLS-1$ } } @@ -270,17 +270,17 @@ public class ComponentFactory private static void maybeDefaultSubmitted(Map attributes) { - if (!(attributes.get("submitted") instanceof Boolean)) + if (!(attributes.get("submitted") instanceof Boolean)) //$NON-NLS-1$ { - attributes.put("submitted", Boolean.FALSE); + attributes.put("submitted", Boolean.FALSE); //$NON-NLS-1$ } } private static void maybeDefaultPrependId(Map attributes) { - if (!(attributes.get("prependId") instanceof Boolean)) + if (!(attributes.get("prependId") instanceof Boolean)) //$NON-NLS-1$ { - attributes.put("prependId", Boolean.FALSE); + attributes.put("prependId", Boolean.FALSE); //$NON-NLS-1$ } } @@ -341,49 +341,49 @@ public class ComponentFactory private static void maybeDefaultFirst(Map attributes) { - if (!(attributes.get("first") instanceof Integer)) + if (!(attributes.get("first") instanceof Integer)) //$NON-NLS-1$ { - attributes.put("first", ZERO); + attributes.put("first", ZERO); //$NON-NLS-1$ } } private static void maybeDefaultRowCount(Map attributes) { - if (!(attributes.get("rowCount") instanceof Integer)) + if (!(attributes.get("rowCount") instanceof Integer)) //$NON-NLS-1$ { - attributes.put("rowCount", MINUS_ONE); + attributes.put("rowCount", MINUS_ONE); //$NON-NLS-1$ } } private static void maybeDefaultRowAvailable(Map attributes) { - if (! (attributes.get("rowAvailable") instanceof Boolean)) + if (! (attributes.get("rowAvailable") instanceof Boolean)) //$NON-NLS-1$ { - attributes.put("rowAvailable", Boolean.FALSE); + attributes.put("rowAvailable", Boolean.FALSE); //$NON-NLS-1$ } } private static void maybeDefaultRowIndex(Map attributes) { - if (! (attributes.get("rowIndex") instanceof Integer)) + if (! (attributes.get("rowIndex") instanceof Integer)) //$NON-NLS-1$ { - attributes.put("rowIndex", MINUS_ONE); + attributes.put("rowIndex", MINUS_ONE); //$NON-NLS-1$ } } private static void maybeDefaultRows(Map attributes) { - if (! (attributes.get("rows") instanceof Integer)) + if (! (attributes.get("rows") instanceof Integer)) //$NON-NLS-1$ { - attributes.put("rows", ZERO); + attributes.put("rows", ZERO); //$NON-NLS-1$ } } private static void maybeDefaultVar(Map attributes) { - if (! (attributes.get("var") instanceof String)) + if (! (attributes.get("var") instanceof String)) //$NON-NLS-1$ { - attributes.put("var", "** default variable **"); + attributes.put("var", "** default variable **"); //$NON-NLS-1$ //$NON-NLS-2$ } } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentInfo.java index 9626be031..d194f2f12 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentInfo.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentInfo.java @@ -94,8 +94,8 @@ public class ComponentInfo extends ViewObject implements Serializable, protected ComponentInfo(final ComponentInfo parent, final ComponentTypeInfo componentTypeInfo, final Map attributes) { - this(getStringProperty("id", attributes, false), parent, - componentTypeInfo, getBooleanProperty("rendered", attributes)); + this(getStringProperty("id", attributes, false), parent, //$NON-NLS-1$ + componentTypeInfo, getBooleanProperty("rendered", attributes)); //$NON-NLS-1$ } /** @@ -117,7 +117,7 @@ public class ComponentInfo extends ViewObject implements Serializable, if (mandatory && value == null) { throw new IllegalArgumentException(key - + " is a mandatory attribute"); + + " is a mandatory attribute"); //$NON-NLS-1$ } return (String) value; } @@ -139,7 +139,7 @@ public class ComponentInfo extends ViewObject implements Serializable, if (value == null) { - throw new IllegalArgumentException(key + "is mandatory"); + throw new IllegalArgumentException(key + "is mandatory"); //$NON-NLS-1$ } return value.booleanValue(); @@ -158,7 +158,7 @@ public class ComponentInfo extends ViewObject implements Serializable, if (value == null) { - throw new IllegalArgumentException(key + " is mandatory"); + throw new IllegalArgumentException(key + " is mandatory"); //$NON-NLS-1$ } return value.intValue(); @@ -232,7 +232,7 @@ public class ComponentInfo extends ViewObject implements Serializable, if (childComponent == this) { throw new IllegalArgumentException( - "A component cannot be its own child"); + "A component cannot be its own child"); //$NON-NLS-1$ } _data.addChild(childComponent); // we need to reset the child's parent to me @@ -315,11 +315,11 @@ public class ComponentInfo extends ViewObject implements Serializable, public String toString() { final String parentId = getParent() != null ? getParent().getId() - : "null"; - String toString = getMostSpecificComponentName() + ": id=" - + _data.getId() + ", parentId: " + parentId + ", family=" - + getComponentTypeInfo().getComponentFamily() + ", render=" - + getComponentTypeInfo().getRenderFamily() + ", rendered=" + : "null"; //$NON-NLS-1$ + String toString = getMostSpecificComponentName() + ": id=" //$NON-NLS-1$ + + _data.getId() + ", parentId: " + parentId + ", family=" //$NON-NLS-1$ //$NON-NLS-2$ + + getComponentTypeInfo().getComponentFamily() + ", render=" //$NON-NLS-1$ + + getComponentTypeInfo().getRenderFamily() + ", rendered=" //$NON-NLS-1$ + isRendered(); // use bean introspection to dump child properties @@ -333,7 +333,7 @@ public class ComponentInfo extends ViewObject implements Serializable, private String dumpProperties() { - String properties = ""; + String properties = ""; //$NON-NLS-1$ try { final BeanInfo beanInfo = Introspector.getBeanInfo(this.getClass(), @@ -347,13 +347,13 @@ public class ComponentInfo extends ViewObject implements Serializable, final String name = desc.getName(); final Object valueObj = desc.getValue(name); final String value = valueObj != null ? valueObj.toString() - : "null"; - properties += ", " + name + "=" + value; + : "null"; //$NON-NLS-1$ + properties += ", " + name + "=" + value; //$NON-NLS-1$ //$NON-NLS-2$ } } catch (final IntrospectionException e) { - return "Error introspecting bean: " + e.getLocalizedMessage(); + return "Error introspecting bean: " + e.getLocalizedMessage(); //$NON-NLS-1$ } return properties; @@ -364,7 +364,7 @@ public class ComponentInfo extends ViewObject implements Serializable, */ protected String getMostSpecificComponentName() { - return "UIComponent"; + return "UIComponent"; //$NON-NLS-1$ } /** @@ -682,7 +682,7 @@ public class ComponentInfo extends ViewObject implements Serializable, if (Thread.holdsLock(this)) { throw new IllegalStateException( - "Must not already own this lock"); + "Must not already own this lock"); //$NON-NLS-1$ } // must always acquire component lock first to prevent deadlock @@ -713,7 +713,7 @@ public class ComponentInfo extends ViewObject implements Serializable, if (Thread.holdsLock(this)) { throw new IllegalStateException( - "Must not already own this lock"); + "Must not already own this lock"); //$NON-NLS-1$ } // must always acquire component lock first to prevent deadlock @@ -785,9 +785,9 @@ public class ComponentInfo extends ViewObject implements Serializable, { // TODO: need logging System.err - .println("Name collision in properties. Trying to add [" + .println("Name collision in properties. Trying to add [" //$NON-NLS-1$ + desc.toString() - + " when already have " + + " when already have " //$NON-NLS-1$ + toMe.get(desc.getName())); } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentTypeInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentTypeInfo.java index a50c4213a..84b828746 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentTypeInfo.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentTypeInfo.java @@ -90,7 +90,7 @@ public class ComponentTypeInfo extends ClassTypeInfo public String toString() { - return "Component Type Info: type = " + _componentType + " family=" + _componentFamily - + " renderer=" + _renderFamily + ", "+super.toString(); + return "Component Type Info: type = " + _componentType + " family=" + _componentFamily //$NON-NLS-1$ //$NON-NLS-2$ + + " renderer=" + _renderFamily + ", "+super.toString(); //$NON-NLS-1$ //$NON-NLS-2$ } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UICommandInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UICommandInfo.java index 38fe0b60c..5269d6c13 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UICommandInfo.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UICommandInfo.java @@ -63,10 +63,10 @@ public class UICommandInfo extends ComponentInfo implements IActionSource2Info { protected UICommandInfo(final ComponentInfo parent, final ComponentTypeInfo componentTypeInfo, Map attributes) { - this(getStringProperty("id", attributes, true), + this(getStringProperty("id", attributes, true), //$NON-NLS-1$ parent, componentTypeInfo, - getBooleanProperty("rendered", attributes), - getActionSourceInfo("$actionSourceInfo", attributes) + getBooleanProperty("rendered", attributes), //$NON-NLS-1$ + getActionSourceInfo("$actionSourceInfo", attributes) //$NON-NLS-1$ ); } @@ -102,6 +102,6 @@ public class UICommandInfo extends ComponentInfo implements IActionSource2Info { protected String getMostSpecificComponentName() { - return "UICommand"; + return "UICommand"; //$NON-NLS-1$ } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIDataInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIDataInfo.java index 76be08ca4..8ed820f0b 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIDataInfo.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIDataInfo.java @@ -17,11 +17,11 @@ public class UIDataInfo extends ComponentInfo implements INamingContainerInfo /** * the standard name for the footer facet */ - public final static String FACET_NAME_FOOTER = "footer"; + public final static String FACET_NAME_FOOTER = "footer"; //$NON-NLS-1$ /** * the standard name for the header facet. */ - public final static String FACET_NAME_HEADER = "header"; + public final static String FACET_NAME_HEADER = "header"; //$NON-NLS-1$ /** * serialization id */ @@ -93,20 +93,20 @@ public class UIDataInfo extends ComponentInfo implements INamingContainerInfo public UIDataInfo(final ComponentInfo parent, final ComponentTypeInfo componentTypeInfo, Map attributes) { - this(getStringProperty("id", attributes, true), parent, + this(getStringProperty("id", attributes, true), parent, //$NON-NLS-1$ componentTypeInfo, - getBooleanProperty("rendered", attributes), - getDataModelInfo("$dataModel", attributes), - getIntegerProperty("first", attributes), - getComponentProperty("footer", attributes), - getComponentProperty("header", attributes), - getIntegerProperty("rowCount", attributes), - getBooleanProperty("rowAvailable", attributes), - attributes.get("rowData"), - getIntegerProperty("rowIndex", attributes), - getIntegerProperty("rows", attributes), - attributes.get("value"), - getStringProperty("var", attributes, true)); + getBooleanProperty("rendered", attributes), //$NON-NLS-1$ + getDataModelInfo("$dataModel", attributes), //$NON-NLS-1$ + getIntegerProperty("first", attributes), //$NON-NLS-1$ + getComponentProperty("footer", attributes), //$NON-NLS-1$ + getComponentProperty("header", attributes), //$NON-NLS-1$ + getIntegerProperty("rowCount", attributes), //$NON-NLS-1$ + getBooleanProperty("rowAvailable", attributes), //$NON-NLS-1$ + attributes.get("rowData"), //$NON-NLS-1$ + getIntegerProperty("rowIndex", attributes), //$NON-NLS-1$ + getIntegerProperty("rows", attributes), //$NON-NLS-1$ + attributes.get("value"), //$NON-NLS-1$ + getStringProperty("var", attributes, true)); //$NON-NLS-1$ } private static DataModelInfo getDataModelInfo(String key, Map attributes) @@ -204,6 +204,6 @@ public class UIDataInfo extends ComponentInfo implements INamingContainerInfo protected String getMostSpecificComponentName() { - return "UIData"; + return "UIData"; //$NON-NLS-1$ } }
\ No newline at end of file diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIFormInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIFormInfo.java index 5f0d7c4cc..353b3470f 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIFormInfo.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIFormInfo.java @@ -43,12 +43,12 @@ public class UIFormInfo extends ComponentInfo implements INamingContainerInfo protected UIFormInfo(final ComponentInfo parent, ComponentTypeInfo componentTypeInfo, Map attributes) { - this(getStringProperty("id", attributes, true), + this(getStringProperty("id", attributes, true), //$NON-NLS-1$ parent, componentTypeInfo, - getBooleanProperty("rendered", attributes), - getBooleanProperty("prependId", attributes), - getBooleanProperty("submitted", attributes)); + getBooleanProperty("rendered", attributes), //$NON-NLS-1$ + getBooleanProperty("prependId", attributes), //$NON-NLS-1$ + getBooleanProperty("submitted", attributes)); //$NON-NLS-1$ } /** @@ -71,6 +71,6 @@ public class UIFormInfo extends ComponentInfo implements INamingContainerInfo protected String getMostSpecificComponentName() { - return "UIForm"; + return "UIForm"; //$NON-NLS-1$ } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIInputInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIInputInfo.java index f46a12ac9..4618f76f6 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIInputInfo.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIInputInfo.java @@ -90,9 +90,9 @@ public class UIInputInfo extends UIOutputInfo implements protected UIInputInfo(final ComponentInfo parent, final ComponentTypeInfo typeInfo, Map attributes) { - this(getStringProperty("id", attributes, true), parent, typeInfo, - getEditableValueHolderInfo("$editableValueHolderInfo", - attributes), getBooleanProperty("rendered", attributes)); + this(getStringProperty("id", attributes, true), parent, typeInfo, //$NON-NLS-1$ + getEditableValueHolderInfo("$editableValueHolderInfo", //$NON-NLS-1$ + attributes), getBooleanProperty("rendered", attributes)); //$NON-NLS-1$ } private static IEditableValueHolderInfo getEditableValueHolderInfo( @@ -110,7 +110,7 @@ public class UIInputInfo extends UIOutputInfo implements // @Override protected String getMostSpecificComponentName() { - return "UIInput"; + return "UIInput"; //$NON-NLS-1$ } public final boolean isValid() diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIOutputInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIOutputInfo.java index 509f6e1a1..f4d43e907 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIOutputInfo.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIOutputInfo.java @@ -61,11 +61,11 @@ public class UIOutputInfo extends ComponentInfo implements IValueHolderInfo { protected UIOutputInfo(final ComponentInfo parent, final ComponentTypeInfo typeInfo, final Map attributes) { - this(getStringProperty("id", attributes, true), + this(getStringProperty("id", attributes, true), //$NON-NLS-1$ parent, typeInfo, - getValueHolderInfo("$valueHolderInfo", attributes), - getBooleanProperty("rendered", attributes)); + getValueHolderInfo("$valueHolderInfo", attributes), //$NON-NLS-1$ + getBooleanProperty("rendered", attributes)); //$NON-NLS-1$ } /** @@ -81,7 +81,7 @@ public class UIOutputInfo extends ComponentInfo implements IValueHolderInfo { // @Override protected String getMostSpecificComponentName() { - return "UIOutput"; + return "UIOutput"; //$NON-NLS-1$ } public final ConverterDecorator getConverter() { diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ConverterTypeInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ConverterTypeInfo.java index a613210b7..7ac14ea8d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ConverterTypeInfo.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ConverterTypeInfo.java @@ -32,7 +32,7 @@ public class ConverterTypeInfo extends ClassTypeInfo if (className == null && converterId == null) { throw new IllegalArgumentException( - "converterClass and converterId must not both be null. For unknown validator use the UNKNOWN constant"); + "converterClass and converterId must not both be null. For unknown validator use the UNKNOWN constant"); //$NON-NLS-1$ } _converterId = converterId; @@ -56,7 +56,7 @@ public class ConverterTypeInfo extends ClassTypeInfo if (className == null && converterId == null) { throw new IllegalArgumentException( - "converterClass and converterId must not both be null. For unknown validator use the UNKNOWN constant"); + "converterClass and converterId must not both be null. For unknown validator use the UNKNOWN constant"); //$NON-NLS-1$ } _converterId = converterId; @@ -93,6 +93,6 @@ public class ConverterTypeInfo extends ClassTypeInfo public String toString() { - return "Converter Type Info: type = " + _converterId + ", "+super.toString(); + return "Converter Type Info: type = " + _converterId + ", "+super.toString(); //$NON-NLS-1$ //$NON-NLS-2$ } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ValidatorTypeInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ValidatorTypeInfo.java index 3bfe90bb9..bb3e9ceeb 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ValidatorTypeInfo.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ValidatorTypeInfo.java @@ -30,7 +30,7 @@ public class ValidatorTypeInfo extends ClassTypeInfo if (validatorClass == null && validatorId == null) { - throw new IllegalArgumentException("validatorClass and validatorId must not both be null. For unknown validator use the UNKNOWN constant"); + throw new IllegalArgumentException("validatorClass and validatorId must not both be null. For unknown validator use the UNKNOWN constant"); //$NON-NLS-1$ } _validatorId = validatorId; } @@ -52,7 +52,7 @@ public class ValidatorTypeInfo extends ClassTypeInfo if (validatorClass == null && validatorId == null) { - throw new IllegalArgumentException("validatorClass and validatorId must not both be null. For unknown validator use the UNKNOWN constant"); + throw new IllegalArgumentException("validatorClass and validatorId must not both be null. For unknown validator use the UNKNOWN constant"); //$NON-NLS-1$ } _validatorId = validatorId; } @@ -87,7 +87,7 @@ public class ValidatorTypeInfo extends ClassTypeInfo public String toString() { - return "Validator Type Info: type = " + _validatorId + ", "+super.toString(); + return "Validator Type Info: type = " + _validatorId + ", "+super.toString(); //$NON-NLS-1$ //$NON-NLS-2$ } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/types/ClassTypeInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/types/ClassTypeInfo.java index e4d6bf7eb..978503967 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/types/ClassTypeInfo.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/types/ClassTypeInfo.java @@ -99,7 +99,7 @@ public abstract class ClassTypeInfo extends TypeInfo implements IClassTypeInfo public String toString() { - String supers = "["; + String supers = "["; //$NON-NLS-1$ for (int i = 0; i < _superClasses.length; i++) { @@ -107,7 +107,7 @@ public abstract class ClassTypeInfo extends TypeInfo implements IClassTypeInfo if (i < _superClasses.length-1) { - supers += ","; + supers += ","; //$NON-NLS-1$ } } @@ -117,11 +117,11 @@ public abstract class ClassTypeInfo extends TypeInfo implements IClassTypeInfo if (i < _interfaces.length-1) { - supers += ","; + supers += ","; //$NON-NLS-1$ } } - supers +="]"; + supers +="]"; //$NON-NLS-1$ - return "class= "+getClassName()+ ", supers="+ supers; + return "class= "+getClassName()+ ", supers="+ supers; //$NON-NLS-1$ //$NON-NLS-2$ } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IHandlerTagElement.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IHandlerTagElement.java index 4b21316a4..1c35683b5 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IHandlerTagElement.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IHandlerTagElement.java @@ -31,7 +31,7 @@ public interface IHandlerTagElement extends IJSFTagElement private final static int HANDLER_TYPE_ATTRIBUTE = 3; private final static String[] strValues = - {"facet", "actionLister", "valueChangeListener"}; + {"facet", "actionListener", "valueChangeListener"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ private final int _intValue; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IJSFTagElement.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IJSFTagElement.java index 5263b9123..6cc7830a6 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IJSFTagElement.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IJSFTagElement.java @@ -29,7 +29,7 @@ public interface IJSFTagElement extends ITagElement //private final static int TYPE_UNKNOWN = 4; private final static String[] strValues = - {"component", "converter", "validator", "handler"}; + {"component", "converter", "validator", "handler"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ private final int _intValue; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/IFileFolderConstants.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/IFileFolderConstants.java index 30e1ace3a..e74e90a91 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/IFileFolderConstants.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/IFileFolderConstants.java @@ -20,76 +20,76 @@ public interface IFileFolderConstants { /** * the dot character */ - public static final String DOT = "."; + public static final String DOT = "."; //$NON-NLS-1$ /** * the path separator */ - public static final String PATH_SEPARATOR = "/"; + public static final String PATH_SEPARATOR = "/"; //$NON-NLS-1$ /** file extensions */ /** * class file extension */ - public static final String EXT_CLASS = "class"; + public static final String EXT_CLASS = "class"; //$NON-NLS-1$ /** * jar file extension */ - public static final String EXT_JAR = "jar"; + public static final String EXT_JAR = "jar"; //$NON-NLS-1$ /** * java file extension */ - public static final String EXT_JAVA = "java"; + public static final String EXT_JAVA = "java"; //$NON-NLS-1$ /** * jsp file extension */ - public static final String EXT_JSP = "jsp"; + public static final String EXT_JSP = "jsp"; //$NON-NLS-1$ /** * properties file extension */ - public static final String EXT_PROPERTIES = "properties"; + public static final String EXT_PROPERTIES = "properties"; //$NON-NLS-1$ /** * taglib file extension */ - public static final String EXT_TAGLIB = "tld"; + public static final String EXT_TAGLIB = "tld"; //$NON-NLS-1$ /** * standard web.xml file name */ - public static final String FILE_WEB_XML = "web.xml"; + public static final String FILE_WEB_XML = "web.xml"; //$NON-NLS-1$ /** folders */ /** * classes folder name */ - public static final String FOLDER_CLASS = "classes"; + public static final String FOLDER_CLASS = "classes"; //$NON-NLS-1$ /** * icons folder name */ - public static final String FOLDER_ICONS = "icons"; + public static final String FOLDER_ICONS = "icons"; //$NON-NLS-1$ /** * the meta-inf folder name */ - public static final String FOLDER_METAINF = "META-INF"; + public static final String FOLDER_METAINF = "META-INF"; //$NON-NLS-1$ /** * the src folder name */ - public static final String FOLDER_SOURCE = "src"; + public static final String FOLDER_SOURCE = "src"; //$NON-NLS-1$ /** * the web-inf folder name */ - public static final String FOLDER_WEBINF = "WEB-INF"; + public static final String FOLDER_WEBINF = "WEB-INF"; //$NON-NLS-1$ /** the webroot folder depth relative to the project */ public static final int WEBROOT_FOLDER_DEPTH = 2; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/JSFUICommonPlugin.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/JSFUICommonPlugin.java index 39fb7f29d..b4a1f0075 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/JSFUICommonPlugin.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/JSFUICommonPlugin.java @@ -39,28 +39,28 @@ import org.osgi.framework.Version; */ public class JSFUICommonPlugin extends AbstractUIPlugin { // Properties contains general properties and defaults to preferences. - private static final String PROPERTIES = "default.properties"; + private static final String PROPERTIES = "default.properties"; //$NON-NLS-1$ // preferences will // contain this string // in the key. - private static final String P_CONSOLE_LOGGING = "console.logging.on"; + private static final String P_CONSOLE_LOGGING = "console.logging.on"; //$NON-NLS-1$ - private static final String P_CONSOLE_LOG_LEVEL = "console.logging.max.level"; + private static final String P_CONSOLE_LOG_LEVEL = "console.logging.max.level"; //$NON-NLS-1$ - private static final String P_ECLIPSE_LOGGING = "eclipse.logging.on"; + private static final String P_ECLIPSE_LOGGING = "eclipse.logging.on"; //$NON-NLS-1$ - private static final String P_ECLIPSE_LOG_LEVEL = "eclipse.logging.max.level"; + private static final String P_ECLIPSE_LOG_LEVEL = "eclipse.logging.max.level"; //$NON-NLS-1$ - private static final String P_FILE_LOGGING = "file.logging.on"; + private static final String P_FILE_LOGGING = "file.logging.on"; //$NON-NLS-1$ - private static final String P_FILE_LOG_LEVEL = "file.logging.max.level"; + private static final String P_FILE_LOG_LEVEL = "file.logging.max.level"; //$NON-NLS-1$ - private static final String P_FILE_PATH = "file.logging.path"; + private static final String P_FILE_PATH = "file.logging.path"; //$NON-NLS-1$ - private static final String P_FILE_CLEAR = "file.logging.startup.clear"; + private static final String P_FILE_CLEAR = "file.logging.startup.clear"; //$NON-NLS-1$ - private static final String P_FILE_ROLLOVER_FREQUENCY = "file.logging.rollover.frequency"; + private static final String P_FILE_ROLLOVER_FREQUENCY = "file.logging.rollover.frequency"; //$NON-NLS-1$ private static final int DEBUG_LEVEL = 0; @@ -122,19 +122,19 @@ public class JSFUICommonPlugin extends AbstractUIPlugin { if (isThreeDot() == false) { throw new CoreException(new Status(IStatus.ERROR, getBundle() .getSymbolicName(), IStatus.OK, - "Requires eclipse version 3.x", null)); + "Requires eclipse version 3.x", null)); //$NON-NLS-1$ } try { // get resource bundle. _resourceBundle = ResourceBundle - .getBundle("org.eclipse.jst.jsf.common.ui.CommonResources"); + .getBundle("org.eclipse.jst.jsf.common.ui.CommonResources"); //$NON-NLS-1$ _alerts = new Alerts(this, _resourceBundle); // get properties. _properties = new Properties(); InputStream input = null; - _pluginBase = getBundle().getEntry("/"); + _pluginBase = getBundle().getEntry("/"); //$NON-NLS-1$ try { input = (new URL(_pluginBase, PROPERTIES)).openStream(); _properties.load(input); @@ -162,8 +162,8 @@ public class JSFUICommonPlugin extends AbstractUIPlugin { if (_log != null) { _log .error( - "log.msg", - "Problems starting plug-in Web Application Development Common.", + "log.msg", //$NON-NLS-1$ + "Problems starting plug-in Web Application Development Common.", //$NON-NLS-1$ ee); } @@ -172,7 +172,7 @@ public class JSFUICommonPlugin extends AbstractUIPlugin { IStatus.ERROR, getBundle().getSymbolicName(), IStatus.OK, - "Problems starting plug-in Web Application Development Common", + "Problems starting plug-in Web Application Development Common", //$NON-NLS-1$ ee)); } } @@ -284,13 +284,13 @@ public class JSFUICommonPlugin extends AbstractUIPlugin { if (image == null) { try { ImageDescriptor id = ImageDescriptor.createFromURL(new URL( - _pluginBase, "icons/" + name)); + _pluginBase, "icons/" + name)); //$NON-NLS-1$ images.put(name, id); image = images.get(name); } catch (MalformedURLException ee) { // log.CommonPlugin.image.error=Image {0} not found. - _log.error("log.msg", "log.CommonPlugin.image.error", name, ee); + _log.error("log.msg", "log.CommonPlugin.image.error", name, ee); //$NON-NLS-1$ //$NON-NLS-2$ } } return image; @@ -318,11 +318,11 @@ public class JSFUICommonPlugin extends AbstractUIPlugin { if (id == null) { try { id = ImageDescriptor.createFromURL(new URL(_pluginBase, - "icons/" + name)); + "icons/" + name)); //$NON-NLS-1$ images.put(name, id); } catch (MalformedURLException ee) { // log.CommonPlugin.image.error=Image {0} not found. - _log.error("log.msg", "log.CommonPlugin.image.error", name, ee); + _log.error("log.msg", "log.CommonPlugin.image.error", name, ee); //$NON-NLS-1$ //$NON-NLS-2$ } } return id; @@ -370,22 +370,22 @@ public class JSFUICommonPlugin extends AbstractUIPlugin { store.setDefault(P_CONSOLE_LOGGING, _properties.getProperty( P_CONSOLE_LOGGING, Boolean.TRUE.toString())); store.setDefault(P_CONSOLE_LOG_LEVEL, strToIntLogLevel(_properties - .getProperty(P_CONSOLE_LOG_LEVEL, "ERROR"))); + .getProperty(P_CONSOLE_LOG_LEVEL, "ERROR"))); //$NON-NLS-1$ store.setDefault(P_ECLIPSE_LOGGING, _properties.getProperty( P_ECLIPSE_LOGGING, Boolean.TRUE.toString())); store.setDefault(P_ECLIPSE_LOG_LEVEL, strToIntLogLevel(_properties - .getProperty(P_ECLIPSE_LOG_LEVEL, "ERROR"))); + .getProperty(P_ECLIPSE_LOG_LEVEL, "ERROR"))); //$NON-NLS-1$ store.setDefault(P_FILE_LOGGING, _properties.getProperty( P_FILE_LOGGING, Boolean.FALSE.toString())); store.setDefault(P_FILE_LOG_LEVEL, strToIntLogLevel(_properties - .getProperty(P_FILE_LOG_LEVEL, "ERROR"))); - store.setDefault(P_FILE_PATH, _properties.getProperty(P_FILE_PATH, "")); + .getProperty(P_FILE_LOG_LEVEL, "ERROR"))); //$NON-NLS-1$ + store.setDefault(P_FILE_PATH, _properties.getProperty(P_FILE_PATH, "")); //$NON-NLS-1$ store.setDefault(P_FILE_CLEAR, _properties.getProperty(P_FILE_CLEAR, Boolean.TRUE.toString())); store.setDefault(P_FILE_ROLLOVER_FREQUENCY, _properties.getProperty( - P_FILE_ROLLOVER_FREQUENCY, "DAILY")); + P_FILE_ROLLOVER_FREQUENCY, "DAILY")); //$NON-NLS-1$ } /** @@ -400,16 +400,16 @@ public class JSFUICommonPlugin extends AbstractUIPlugin { if (str == null) { return ERROR_LEVEL; } - if (str.equalsIgnoreCase("DEBUG")) { + if (str.equalsIgnoreCase("DEBUG")) { //$NON-NLS-1$ return DEBUG_LEVEL; } - if (str.equalsIgnoreCase("INFO")) { + if (str.equalsIgnoreCase("INFO")) { //$NON-NLS-1$ return INFO_LEVEL; } - if (str.equalsIgnoreCase("WARN")) { + if (str.equalsIgnoreCase("WARN")) { //$NON-NLS-1$ return WARN_LEVEL; } - if (str.equalsIgnoreCase("FATAL")) { + if (str.equalsIgnoreCase("FATAL")) { //$NON-NLS-1$ return FATAL_LEVEL; } return ERROR_LEVEL; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/AbstractClassButtonDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/AbstractClassButtonDialogField.java index d7e3cb71c..165846a6b 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/AbstractClassButtonDialogField.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/AbstractClassButtonDialogField.java @@ -87,10 +87,10 @@ import org.eclipse.ui.forms.events.HyperlinkEvent; try { if (_project == null || !_project.hasNature(JavaCore.NATURE_ID)) { ResourceBundle rb = ResourceBundle - .getBundle("org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldResources"); + .getBundle("org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldResources"); //$NON-NLS-1$ Alerts alerts = new Alerts(JSFUICommonPlugin.getDefault(), rb); - alerts.error("ClassButtonDialogField.Alert.Title", - "ClassButtonDialogField.Alert.Msg"); + alerts.error("ClassButtonDialogField.Alert.Title", //$NON-NLS-1$ + "ClassButtonDialogField.Alert.Msg"); //$NON-NLS-1$ return; } } catch (CoreException e) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ColorButtonDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ColorButtonDialogField.java index c4d2246d0..822841455 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ColorButtonDialogField.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ColorButtonDialogField.java @@ -175,7 +175,7 @@ public class ColorButtonDialogField extends StyleComboDialogField { if (_button == null) { assertCompositeNotNull(parent); if (toolkit != null) { - _button = toolkit.createButton(parent, "", SWT.PUSH); + _button = toolkit.createButton(parent, "", SWT.PUSH); //$NON-NLS-1$ } else { _button = new Button(parent, SWT.PUSH); } diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/SourceFolderButtonDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/SourceFolderButtonDialogField.java index 1cef18121..420a95093 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/SourceFolderButtonDialogField.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/SourceFolderButtonDialogField.java @@ -66,10 +66,10 @@ public class SourceFolderButtonDialogField extends StringButtonDialogField { _project = project; setLabelText(DialogFieldResources.getInstance().getString( - "SourceFolderButtonDialogField.container.label")); + "SourceFolderButtonDialogField.container.label")); //$NON-NLS-1$ setButtonLabel(DialogFieldResources.getInstance().getString( - "SourceFolderButtonDialogField.container.button")); + "SourceFolderButtonDialogField.container.button")); //$NON-NLS-1$ setStringButtonAdapter(new IStringButtonAdapter() { public void changeControlPressed(DialogField field) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringButtonDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringButtonDialogField.java index 4ff9eda62..eebc9e5c4 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringButtonDialogField.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringButtonDialogField.java @@ -40,7 +40,7 @@ public class StringButtonDialogField extends StringDialogField { public StringButtonDialogField(IStringButtonAdapter adapter) { _stringButtonAdapter = adapter; _browseButtonLabel = JSFUICommonPlugin - .getResourceString("DialogField.Browse"); + .getResourceString("DialogField.Browse"); //$NON-NLS-1$ _buttonEnabled = true; } diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringDialogField.java index c00f3c64f..bf334a54c 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringDialogField.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringDialogField.java @@ -159,9 +159,9 @@ public class StringDialogField extends DialogFieldBase implements if (toolkit != null) { if (_numRows <= 1) { - _textControl = toolkit.createText(parent, ""); + _textControl = toolkit.createText(parent, ""); //$NON-NLS-1$ } else { - _textControl = toolkit.createText(parent, "", SWT.V_SCROLL); + _textControl = toolkit.createText(parent, "", SWT.V_SCROLL); //$NON-NLS-1$ } } else { if (_numRows <= 1) { @@ -271,7 +271,7 @@ public class StringDialogField extends DialogFieldBase implements _pending = false; if (text == null) - text = ""; + text = ""; //$NON-NLS-1$ _text = text; if (isOkToUse(_textControl)) { _textControl.removeModifyListener(_modifyListener); diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/FavoriteConfigurations.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/FavoriteConfigurations.java index d084f5aae..aa7744b1c 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/FavoriteConfigurations.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/FavoriteConfigurations.java @@ -40,17 +40,17 @@ public class FavoriteConfigurations { private static Logger _log = JSFUICommonPlugin .getLogger(FavoriteConfigurations.class); - private final static String FAV_EXTENSIONS = ".xml"; + private final static String FAV_EXTENSIONS = ".xml"; //$NON-NLS-1$ - private final static String ELEMENT_ROOT = "favorite"; + private final static String ELEMENT_ROOT = "favorite"; //$NON-NLS-1$ - private final static String ELEMENT_CONFIG = "config"; + private final static String ELEMENT_CONFIG = "config"; //$NON-NLS-1$ - private final static String ELEMENT_NAME = "name"; + private final static String ELEMENT_NAME = "name"; //$NON-NLS-1$ - private final static String ELEMENT_PROPERTY = "property"; + private final static String ELEMENT_PROPERTY = "property"; //$NON-NLS-1$ - private final static String ELEMENT_VALUE = "value"; + private final static String ELEMENT_VALUE = "value"; //$NON-NLS-1$ private Map _favorites; @@ -111,7 +111,7 @@ public class FavoriteConfigurations { } catch (Exception ee) { // log.FavoriteConfigurations.save.error=Failed to save {0} // favorites. File={1} - _log.info("log.FavoriteConfigurations.save.error", _favoriteName, + _log.info("log.FavoriteConfigurations.save.error", _favoriteName, //$NON-NLS-1$ _favoriteFile.toOSString(), ee); } finally { if (fw != null) { @@ -180,7 +180,7 @@ public class FavoriteConfigurations { } catch (Exception ee) { // log.FavoriteConfigurations.read.error=Failed to save {0} // favorites. File={1} - _log.error("log.FavoriteConfigurations.read.error", _favoriteName, + _log.error("log.FavoriteConfigurations.read.error", _favoriteName, //$NON-NLS-1$ _favoriteFile.toOSString(), ee); } finally { if (fr != null) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/PropertyUtils.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/PropertyUtils.java index cc734cc8d..57a2b97dd 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/PropertyUtils.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/PropertyUtils.java @@ -36,6 +36,16 @@ import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin; * @author mengbo */ public final class PropertyUtils { + + private static final String ENCODED_CHAR_PERCENT = "%25"; //$NON-NLS-1$ + private static final String ENCODED_CHAR_CARRIAGE_RETURN = "%0d"; //$NON-NLS-1$ + private static final String ENCODED_CHAR_TAB = "%09"; //$NON-NLS-1$ + private static final String ENCODED_CHAR_NEWLINE = "%0a"; //$NON-NLS-1$ + private static final String ENCODED_CHAR_SPACE = "%20"; //$NON-NLS-1$ + private static final String ENCODED_CHAR_COLON = "%3a"; //$NON-NLS-1$ + private static final String ENCODED_CHAR_EQUALS = "%3d"; //$NON-NLS-1$ + + // WARNING: There can be NO static logging line here since the logger uses // this class to figure out the preferences // for the logging system. "Logging" an error here would be useless since @@ -340,26 +350,26 @@ public final class PropertyUtils { switch (ch) { // these are the set of illegal characters in a Property name case '=': // %3d - encoded.append("%3d"); + encoded.append(ENCODED_CHAR_EQUALS); break; case ':': // %3a - encoded.append("%3a"); + encoded.append(ENCODED_CHAR_COLON); break; case ' ': // %20 - encoded.append("%20"); + encoded.append(ENCODED_CHAR_SPACE); break; case '\n': // %0a - encoded.append("%0a"); + encoded.append(ENCODED_CHAR_NEWLINE); break; case '\t': // %09 - encoded.append("%09"); + encoded.append(ENCODED_CHAR_TAB); break; case '\r': // %0d - encoded.append("%0d"); + encoded.append(ENCODED_CHAR_CARRIAGE_RETURN); break; case '%': // %25 // added because its our encoding flag - encoded.append("%25"); + encoded.append(ENCODED_CHAR_PERCENT); break; default: encoded.append(ch); diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/ResourceUtils.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/ResourceUtils.java index 75b0f1197..e35ee83ab 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/ResourceUtils.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/ResourceUtils.java @@ -26,6 +26,7 @@ import org.eclipse.jst.jsf.common.ui.internal.logging.Logger; * @author mengbo */ public abstract class ResourceUtils { + private static final String LOG_RESOURCE_UTILS_MSG_KEY = "log.ResourceUtils"; //$NON-NLS-1$ private static Logger _log = JSFUICommonPlugin.getLogger(ResourceUtils.class); /** * the resource bundle accessible by all children @@ -50,9 +51,9 @@ public abstract class ResourceUtils { _resources = resource; if (_resources == null) { // log.ResourceUtils=Missing Resource Bundle "{0}". - _log.error("log.ResourceUtils", bundleLocation); + _log.error(LOG_RESOURCE_UTILS_MSG_KEY, bundleLocation); // pluginName=Web Application Development Common - JSFUICommonPlugin.getAlerts().error("pluginName", "log.ResourceUtils", + JSFUICommonPlugin.getAlerts().error("pluginName", LOG_RESOURCE_UTILS_MSG_KEY, //$NON-NLS-1$ bundleLocation); } } @@ -117,7 +118,7 @@ public abstract class ResourceUtils { * @return true if there is a resource corresponding to key */ public boolean isResource(String key) { - return getString(key).equals("" + true); + return getString(key).equals("" + true); //$NON-NLS-1$ } /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/FacesConfigPlugin.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/FacesConfigPlugin.java index 4ac8b4544..a13bdb08e 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/FacesConfigPlugin.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/FacesConfigPlugin.java @@ -31,12 +31,12 @@ public final class FacesConfigPlugin extends EMFPlugin { * <!-- end-user-doc --> * @generated */ - public static final String copyright = "Copyright (c) 2005, 2006 IBM Corporation and others"; + public static final String copyright = "Copyright (c) 2005, 2006 IBM Corporation and others"; //$NON-NLS-1$ /** * Editor id string. TODO: broken? */ - public static final String FACES_CONFIG_EDITOR_ID = "org.eclipse.jst.jsf.facesconfig.internal.presentation.FacesConfigEditor"; + public static final String FACES_CONFIG_EDITOR_ID = "org.eclipse.jst.jsf.facesconfig.internal.presentation.FacesConfigEditor"; //$NON-NLS-1$ /** * The plugin instance diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/FacetExtensionTypeItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/FacetExtensionTypeItemProvider.java index e57515feb..cae6a960f 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/FacetExtensionTypeItemProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/FacetExtensionTypeItemProvider.java @@ -46,7 +46,7 @@ public class FacetExtensionTypeItemProvider * @generated */ @SuppressWarnings("hiding") - public static final String copyright = "Copyright (c) 2005, 2006 IBM Corporation and others"; + public static final String copyright = "Copyright (c) 2005, 2006 IBM Corporation and others"; //$NON-NLS-1$ /** * This constructs an instance from a factory and a notifier. @@ -80,7 +80,7 @@ public class FacetExtensionTypeItemProvider * @generated */ public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/FacetExtensionType")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/FacetExtensionType")); //$NON-NLS-1$ } /** @@ -92,8 +92,8 @@ public class FacetExtensionTypeItemProvider public String getText(Object object) { String label = ((FacetExtensionType)object).getId(); return label == null || label.length() == 0 ? - getString("_UI_FacetExtensionType_type") : - getString("_UI_FacetExtensionType_type") + " " + label; + getString("_UI_FacetExtensionType_type") : //$NON-NLS-1$ + getString("_UI_FacetExtensionType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/JSPCorePlugin.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/JSPCorePlugin.java index c31be115b..4ea96745f 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/JSPCorePlugin.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/JSPCorePlugin.java @@ -35,7 +35,7 @@ public class JSPCorePlugin extends Plugin { plugin = this; try { resourceBundle = ResourceBundle - .getBundle("org.eclipse.jst.pagedesigner.jsp.core.JSPCorePluginResources"); + .getBundle("org.eclipse.jst.pagedesigner.jsp.core.JSPCorePluginResources"); //$NON-NLS-1$ } catch (MissingResourceException x) { resourceBundle = null; } |