Attachment 91888 Details for Bug 221685 – patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch

221685_patch.txt (text/plain), 4.75 KB, created by Kaloyan Raev

on 2008-03-07 10:47:36 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Kaloyan Raev

Created: 2008-03-07 10:47:36 EST

Size: 4.75 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.j2ee.web
>Index: web/org/eclipse/jst/j2ee/internal/web/operations/NewFilterClassDataModelProvider.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewFilterClassDataModelProvider.java,v
>retrieving revision 1.8
>diff -u -r1.8 NewFilterClassDataModelProvider.java
>--- web/org/eclipse/jst/j2ee/internal/web/operations/NewFilterClassDataModelProvider.java	19 Feb 2008 10:46:52 -0000	1.8
>+++ web/org/eclipse/jst/j2ee/internal/web/operations/NewFilterClassDataModelProvider.java	7 Mar 2008 15:46:52 -0000
>@@ -322,7 +322,7 @@
> 			}
> 			// If the filter name already exists, throw an error
> 			if (exists) {
>-				String msg = WebMessages.getResourceString(WebMessages.ERR_SERVLET_DISPLAY_NAME_EXIST, new String[]{prop});
>+				String msg = WebMessages.getResourceString(WebMessages.ERR_FILTER_NAME_EXIST, new String[]{prop});
> 				return WTPCommonPlugin.createErrorStatus(msg);
> 			}			
> 		} else if (mObj instanceof org.eclipse.jst.javaee.web.WebApp) {
>@@ -340,7 +340,7 @@
> 			}
> 			// If the filter name already exists, throw an error
> 			if (exists) {
>-				String msg = WebMessages.getResourceString(WebMessages.ERR_SERVLET_DISPLAY_NAME_EXIST, new String[] {prop});
>+				String msg = WebMessages.getResourceString(WebMessages.ERR_FILTER_NAME_EXIST, new String[] {prop});
> 				return WTPCommonPlugin.createErrorStatus(msg);
> 			}			
> 		}
>Index: web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassDataModelProvider.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassDataModelProvider.java,v
>retrieving revision 1.31
>diff -u -r1.31 NewServletClassDataModelProvider.java
>--- web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassDataModelProvider.java	19 Feb 2008 10:46:51 -0000	1.31
>+++ web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassDataModelProvider.java	7 Mar 2008 15:46:53 -0000
>@@ -498,7 +498,7 @@
> 			}
> 			// If the servlet name already exists, throw an error
> 			if (exists) {
>-				String msg = WebMessages.getResourceString(WebMessages.ERR_SERVLET_DISPLAY_NAME_EXIST, new String[]{prop});
>+				String msg = WebMessages.getResourceString(WebMessages.ERR_SERVLET_NAME_EXIST, new String[]{prop});
> 				return WTPCommonPlugin.createErrorStatus(msg);
> 			}			
> 		} else if (mObj instanceof org.eclipse.jst.javaee.web.WebApp) {
>@@ -516,7 +516,7 @@
> 			}
> 			// If the servlet name already exists, throw an error
> 			if (exists) {
>-				String msg = WebMessages.getResourceString(WebMessages.ERR_SERVLET_DISPLAY_NAME_EXIST, new String[]{prop});
>+				String msg = WebMessages.getResourceString(WebMessages.ERR_SERVLET_NAME_EXIST, new String[]{prop});
> 				return WTPCommonPlugin.createErrorStatus(msg);
> 			}			
> 		}
>Index: web/org/eclipse/jst/j2ee/internal/web/operations/WebMessages.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/WebMessages.java,v
>retrieving revision 1.17
>diff -u -r1.17 WebMessages.java
>--- web/org/eclipse/jst/j2ee/internal/web/operations/WebMessages.java	5 Dec 2007 17:11:41 -0000	1.17
>+++ web/org/eclipse/jst/j2ee/internal/web/operations/WebMessages.java	7 Mar 2008 15:46:53 -0000
>@@ -66,7 +66,7 @@
> 	public static String ERR_SERVLET_ROLE_LINK_EMPTY;
> 	public static String ERR_SERVLET_INTERFACE;
> 
>-	public static String ERR_FILTER_DISPLAY_NAME_EXIST;
>+	public static String ERR_FILTER_NAME_EXIST;
> 	public static String ERR_FILTER_CLASS_NAME_USED;
> 	public static String ERR_FILTER_CLASS_NAME_INVALID;
> 	public static String ERR_LISTENER_DISPLAY_NAME_EXIST;
>Index: property_files/web.properties
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.web/property_files/web.properties,v
>retrieving revision 1.17
>diff -u -r1.17 web.properties
>--- property_files/web.properties	5 Dec 2007 17:11:42 -0000	1.17
>+++ property_files/web.properties	7 Mar 2008 15:46:52 -0000
>@@ -33,7 +33,7 @@
> ERR_SERVLET_PARAMETER_VALUE_EMPTY=The servlet initialization parameter value cannot be empty.
> ERR_SERVLET_PARAMETER_VALUE_EXIST=The servlet initialization parameter value already exists.
> 
>-ERR_FILTER_DISPLAY_NAME_EXIST=The filter name already exists.
>+ERR_FILTER_NAME_EXIST=The filter name already exists.
> ERR_FILTER_CLASS_NAME_USED=The class is already associated with other filter.
> ERR_FILTER_CLASS_NAME_INVALID=Cannot use Filter as the filter class name.
>

Actions: View | Diff

Attachments on bug 221685: 91888