232534 232577 234387 234388
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/Messages.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/Messages.java new file mode 100644 index 0000000..9569c99 --- /dev/null +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/Messages.java
@@ -0,0 +1,14 @@ +package org.eclipse.jst.jsf.designtime.internal; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.designtime.internal.messages"; //$NON-NLS-1$ + public static String DefaultJSPTagResolver_DisplayName; + public static String PersistedDataTagStrategy_DisplayName; + public static String TagIntrospectingStrategy_DisplayName; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } +}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/messages.properties b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/messages.properties new file mode 100644 index 0000000..f4a8f98 --- /dev/null +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/messages.properties
@@ -0,0 +1,3 @@ +DefaultJSPTagResolver_DisplayName=Meta-data Driven Resolver +PersistedDataTagStrategy_DisplayName=Cached Data Tag Resolver +TagIntrospectingStrategy_DisplayName=Introspecting Tag Resolver
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/DefaultJSPTagResolver.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/DefaultJSPTagResolver.java index aa01276..a1dfc16 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/DefaultJSPTagResolver.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/DefaultJSPTagResolver.java
@@ -22,6 +22,7 @@ import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.ITagElement; import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.IHandlerTagElement.TagHandlerType; import org.eclipse.jst.jsf.core.internal.tld.TagIdentifierFactory; +import org.eclipse.jst.jsf.designtime.internal.Messages; import org.eclipse.jst.jsf.designtime.internal.view.mapping.ViewMetadataLoader; import org.eclipse.jst.jsf.designtime.internal.view.mapping.ViewMetadataMapper; import org.eclipse.jst.jsf.designtime.internal.view.mapping.viewmapping.TagMapping; @@ -41,11 +42,11 @@ /** * strategy id */ - public final static String ID = "org.eclipse.jst.jsf.metadata.DefaultJSPTagResolver"; + public final static String ID = "org.eclipse.jst.jsf.metadata.DefaultJSPTagResolver"; //$NON-NLS-1$ /** * displayable nameb */ - public final static String DISPLAY_NAME = "Meta-data Driven Resolver"; + public final static String DISPLAY_NAME = Messages.DefaultJSPTagResolver_DisplayName; private final ViewMetadataLoader _loader; private final ViewMetadataMapper _mapper; @@ -75,7 +76,7 @@ TypeInfo elementType = null; if (mapping != null) { - elementType = findTypeInfo(mapping, "1.1", null); + elementType = findTypeInfo(mapping, "1.1", null); //$NON-NLS-1$ } if (elementType instanceof ComponentTypeInfo)
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/TagIntrospectingStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/TagIntrospectingStrategy.java index ec86bed..6608cf6 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/TagIntrospectingStrategy.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/TagIntrospectingStrategy.java
@@ -12,6 +12,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.ITagElement; +import org.eclipse.jst.jsf.designtime.internal.Messages; import org.eclipse.jst.jsf.designtime.internal.view.model.jsp.analyzer.TagAnalyzer; import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDElementDeclaration; @@ -26,11 +27,11 @@ /** * the identifier of this strategy */ - public final static String ID = "org.eclipse.jst.jsf.designtime.TagIntrospectingStrategy"; + public final static String ID = "org.eclipse.jst.jsf.designtime.TagIntrospectingStrategy"; //$NON-NLS-1$ /** * the display name */ - public final static String DISPLAY_NAME = "Introspecting Tag Resolver"; + public final static String DISPLAY_NAME = Messages.TagIntrospectingStrategy_DisplayName; private final IProject _project;
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/persistence/PersistedDataTagStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/persistence/PersistedDataTagStrategy.java index 781563d..a1eebbe 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/persistence/PersistedDataTagStrategy.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/view/model/jsp/persistence/PersistedDataTagStrategy.java
@@ -19,6 +19,7 @@ import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.ITagElement; import org.eclipse.jst.jsf.core.internal.JSFCorePlugin; import org.eclipse.jst.jsf.core.internal.JSFCoreTraceOptions; +import org.eclipse.jst.jsf.designtime.internal.Messages; import org.eclipse.jst.jsf.designtime.internal.view.model.jsp.JSPTagResolvingStrategy; import org.eclipse.jst.jsf.designtime.internal.view.model.jsp.TLDNamespace; import org.eclipse.jst.jsf.designtime.internal.view.model.jsp.TLDTagElement; @@ -35,11 +36,11 @@ /** * the identifier of this strategy */ - public final static String ID = "org.eclipse.jst.jsf.designtime.PersistedDataTagStrategy"; + public final static String ID = "org.eclipse.jst.jsf.designtime.PersistedDataTagStrategy"; //$NON-NLS-1$ /** * the display name */ - public final static String DISPLAY_NAME = "Cached Data Tag Resolver"; + public final static String DISPLAY_NAME = Messages.PersistedDataTagStrategy_DisplayName; private final IProject _project; private final TagRepository _repository; @@ -64,7 +65,7 @@ if (JSFCoreTraceOptions.TRACE_JSPTAGPERSISTENCE) { JSFCoreTraceOptions - .log("Initializing PersistedDataTagStrategy for project: " + .log("Initializing PersistedDataTagStrategy for project: " //$NON-NLS-1$ + _project.toString()); } try @@ -76,13 +77,13 @@ { JSFCorePlugin .log(e, - "JSP tag registry cached failed to load. Strategy will not be used"); + "JSP tag registry cached failed to load. Strategy will not be used"); //$NON-NLS-1$ } catch (final ClassNotFoundException e) { JSFCorePlugin .log(e, - "JSP tag registry cached failed to load. Strategy will not be used"); + "JSP tag registry cached failed to load. Strategy will not be used"); //$NON-NLS-1$ } _namespaces = new HashMap<String, SerializableTLDNamespace>(); } @@ -98,7 +99,7 @@ if (JSFCoreTraceOptions.TRACE_JSPTAGPERSISTENCE) { JSFCoreTraceOptions - .log("Saving PersistedDataTagStrategy for project: " + .log("Saving PersistedDataTagStrategy for project: " //$NON-NLS-1$ + _project.toString()); } @@ -117,7 +118,7 @@ if (JSFCoreTraceOptions.TRACE_JSPTAGPERSISTENCE) { JSFCoreTraceOptions.log(String.format( - "Adding namespace %s for project", ns.getNSUri(), + "Adding namespace %s for project", ns.getNSUri(), //$NON-NLS-1$ _project.toString())); } @@ -128,7 +129,7 @@ if (JSFCoreTraceOptions.TRACE_JSPTAGPERSISTENCE) { JSFCoreTraceOptions.log(String.format( - "Updating namespace %s for project", ns.getNSUri(), + "Updating namespace %s for project", ns.getNSUri(), //$NON-NLS-1$ _project.toString())); } @@ -138,7 +139,7 @@ if (JSFCoreTraceOptions.TRACE_JSPTAGPERSISTENCE) { JSFCoreTraceOptions.log(String.format( - "Putting element %s", elementEntry.getKey())); + "Putting element %s", elementEntry.getKey())); //$NON-NLS-1$ } myNs.put(elementEntry.getKey(), elementEntry.getValue()); } @@ -154,7 +155,7 @@ if (JSFCoreTraceOptions.TRACE_JSPTAGPERSISTENCE) { JSFCoreTraceOptions.log(String.format( - "Attempting to resolve element %s for project %s", element + "Attempting to resolve element %s for project %s", element //$NON-NLS-1$ .getElementName(), _project)); } @@ -162,7 +163,7 @@ { if (!_reentrancyFlag.compareAndSet(false, true)) { - throw new IllegalStateException("Reentrant call to resolve"); + throw new IllegalStateException("Reentrant call to resolve"); //$NON-NLS-1$ } final String uri = getUri(element); @@ -181,7 +182,7 @@ if (JSFCoreTraceOptions.TRACE_JSPTAGPERSISTENCE) { JSFCoreTraceOptions.log(String.format( - "Resolved element %s for project %s", + "Resolved element %s for project %s", //$NON-NLS-1$ element.getElementName(), _project)); } return tagElement; @@ -204,7 +205,7 @@ if (JSFCoreTraceOptions.TRACE_JSPTAGPERSISTENCE) { JSFCoreTraceOptions.log(String.format( - "Flushing all data for project %s", _project)); + "Flushing all data for project %s", _project)); //$NON-NLS-1$ } try @@ -213,12 +214,12 @@ } catch (IOException e) { - JSFCorePlugin.log(e, "Failure during cache flushing on project: " + JSFCorePlugin.log(e, "Failure during cache flushing on project: " //$NON-NLS-1$ + _project); } catch (ClassNotFoundException e) { - JSFCorePlugin.log(e, "Failure during cache flushing on project: " + JSFCorePlugin.log(e, "Failure during cache flushing on project: " //$NON-NLS-1$ + _project); } _namespaces.clear();
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.java index 39694bd..bb5d872 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.java
@@ -39,6 +39,8 @@ */ public static String AddEditManagedPropertyDialog_Edit; + public static String AddEditMapEntryDialog_NullValue; + /** * see EditorMessages.properties */
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.properties b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.properties index adb0ac4..28dc0a2 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.properties +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.properties
@@ -448,3 +448,4 @@ AlignmentAction_AlignMiddleAction_Label=Align &Middle AddEditManagedPropertyDialog_Add=Add Managed Property AddEditManagedPropertyDialog_Edit=Edit Managed Property +AddEditMapEntryDialog_NullValue=Null Value
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditMapEntryDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditMapEntryDialog.java index c50e936..e85e9a3 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditMapEntryDialog.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditMapEntryDialog.java
@@ -16,7 +16,6 @@ import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringDialogField; import org.eclipse.jst.jsf.common.ui.internal.guiutils.SWTUtils; import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages; -import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -114,7 +113,7 @@ keyField.setText(key); if (this.isNullValue) { nullValueTypeButton.setSelection(true); - valueField.setText(""); + valueField.setText(""); //$NON-NLS-1$ valueField.setEnabled(false); } else { nullValueTypeButton.setSelection(false); @@ -163,7 +162,7 @@ valueSection.setLayout(gl); nullValueTypeButton = SWTUtils.createCheckBox(valueSection, - IFacesConfigConstants.NULL_VALUE, 2); + EditorMessages.AddEditMapEntryDialog_NullValue, 2); nullValueTypeButton.addSelectionListener(new SelectionAdapter() {
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.java index 52790e6..b6d6199 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.java
@@ -439,4 +439,6 @@ * see PageFlowMessages.properties */ public static String PageflowLinkEditPart_FromOutcome; + + public static String ProjectWebPageSelectionDialog_Description; }
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.properties b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.properties index 5be3509..27e3f29 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.properties +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.properties
@@ -144,3 +144,4 @@ PageflowLinkEditPart_FromAction=fromAction: PageflowLinkEditPart_FromOutcome=fromOutcome: +ProjectWebPageSelectionDialog_Description=Please select a Web Page
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ProjectWebPageSelectionDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ProjectWebPageSelectionDialog.java index eb218e8..7d668d7 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ProjectWebPageSelectionDialog.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ProjectWebPageSelectionDialog.java
@@ -15,6 +15,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IPath; import org.eclipse.jst.jsf.common.ui.internal.dialogs.CommonResourceDialog; +import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages; import org.eclipse.swt.widgets.Shell; /** @@ -44,19 +45,19 @@ } private void init() { - setResourceDescription("Web page"); - setSuffixs(new String[] { "jsp", "jspx", "jsf", "html", "htm" }); + setResourceDescription(PageflowMessages.ProjectWebPageSelectionDialog_Description); + setSuffixs(new String[] { "jsp", "jspx", "jsf", "html", "htm" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ } /** * @return the rseult file path */ public String getResultFilePath() { - String result = ""; + String result = ""; //$NON-NLS-1$ IFile selectedFile = (IFile) getResult()[0]; IPath path = selectedFile.getProjectRelativePath(); path = path.removeFirstSegments(1); - result = "/" + path.toString(); + result = "/" + path.toString(); //$NON-NLS-1$ return result; } }
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/plugin.xml b/jsf/plugins/org.eclipse.jst.jsf.ui/plugin.xml index ace6512..2d1ede2 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.ui/plugin.xml +++ b/jsf/plugins/org.eclipse.jst.jsf.ui/plugin.xml
@@ -248,7 +248,7 @@ <template autoinsert="true" contextTypeId="jsp_new" - description="%NewJSFPage_html_description" + description="%NewJSFPage_xhtml_description" id="org.eclipse.jst.jsf.ui.new_jsf_page_xhtml" name="%NewJSFPage_xhtml"> <pattern>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/preferences/JSPTagRegistryPreferencePage.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/preferences/JSPTagRegistryPreferencePage.java index 4021ddb..4cb06ad 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/preferences/JSPTagRegistryPreferencePage.java +++ b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/preferences/JSPTagRegistryPreferencePage.java
@@ -57,7 +57,7 @@ _panel = new StrategyOrderingPanel( _provider, new MyLabelProvider(), - "Set the order in which tag resolvers are consulted when constructing the JSP tag registry"); + Messages.JSPTagRegistryPreferencePage_PanelDescription); final Control contents = _panel.createContents(parent); _panel.refresh(); return contents;
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/preferences/Messages.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/preferences/Messages.java new file mode 100644 index 0000000..44429fc --- /dev/null +++ b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/preferences/Messages.java
@@ -0,0 +1,12 @@ +package org.eclipse.jst.jsf.ui.internal.preferences; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.ui.internal.preferences.messages"; //$NON-NLS-1$ + public static String JSPTagRegistryPreferencePage_PanelDescription; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } +}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/preferences/messages.properties b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/preferences/messages.properties new file mode 100644 index 0000000..64b3389 --- /dev/null +++ b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/preferences/messages.properties
@@ -0,0 +1 @@ +JSPTagRegistryPreferencePage_PanelDescription=Set the order in which tag resolvers are consulted when constructing the JSP tag registry