Attachment 38289 Details for Bug 136119 – the patch with webapp changes

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

[patch] the patch with webapp changes

org.eclipse.help.webapp.patch.txt (text/plain), 7.88 KB, created by Curtis d'Entremont

on 2006-04-11 11:18:47 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Curtis d'Entremont

Created: 2006-04-11 11:18:47 EDT

Size: 7.88 KB

patch

obsolete

>Index: src_servlets/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java,v
>retrieving revision 1.27
>diff -u -r1.27 EclipseConnector.java
>--- src_servlets/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java	2 Jun 2005 02:26:20 -0000	1.27
>+++ src_servlets/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java	9 Apr 2006 03:32:00 -0000
>@@ -12,7 +12,8 @@
> 
> import java.io.*;
> import java.net.*;
>-import java.util.*;
>+import java.util.Enumeration;
>+import java.util.Locale;
> 
> import javax.servlet.*;
> import javax.servlet.http.*;
>Index: src_servlets/org/eclipse/help/internal/webapp/servlet/HighlightFilter.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/HighlightFilter.java,v
>retrieving revision 1.9
>diff -u -r1.9 HighlightFilter.java
>--- src_servlets/org/eclipse/help/internal/webapp/servlet/HighlightFilter.java	23 Feb 2005 18:17:20 -0000	1.9
>+++ src_servlets/org/eclipse/help/internal/webapp/servlet/HighlightFilter.java	9 Apr 2006 03:32:01 -0000
>@@ -12,7 +12,10 @@
> package org.eclipse.help.internal.webapp.servlet;
> 
> import java.io.*;
>-import java.util.*;
>+import java.util.ArrayList;
>+import java.util.Collection;
>+import java.util.Iterator;
>+import java.util.StringTokenizer;
> 
> import javax.servlet.http.*;
> 
>Index: src_servlets/org/eclipse/help/internal/webapp/servlet/InfocenterWorkingSetManager.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/InfocenterWorkingSetManager.java,v
>retrieving revision 1.11
>diff -u -r1.11 InfocenterWorkingSetManager.java
>--- src_servlets/org/eclipse/help/internal/webapp/servlet/InfocenterWorkingSetManager.java	28 Apr 2005 15:36:02 -0000	1.11
>+++ src_servlets/org/eclipse/help/internal/webapp/servlet/InfocenterWorkingSetManager.java	9 Apr 2006 03:32:01 -0000
>@@ -11,7 +11,9 @@
> package org.eclipse.help.internal.webapp.servlet;
> 
> import java.io.*;
>-import java.util.*;
>+import java.util.Iterator;
>+import java.util.SortedSet;
>+import java.util.TreeSet;
> 
> import javax.servlet.http.*;
> 
>Index: src_servlets/org/eclipse/help/internal/webapp/servlet/SearchServlet.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/SearchServlet.java,v
>retrieving revision 1.21
>diff -u -r1.21 SearchServlet.java
>--- src_servlets/org/eclipse/help/internal/webapp/servlet/SearchServlet.java	23 Feb 2005 18:17:20 -0000	1.21
>+++ src_servlets/org/eclipse/help/internal/webapp/servlet/SearchServlet.java	9 Apr 2006 03:32:01 -0000
>@@ -11,7 +11,7 @@
> package org.eclipse.help.internal.webapp.servlet;
> 
> import java.io.*;
>-import java.util.*;
>+import java.util.ArrayList;
> 
> import javax.servlet.*;
> import javax.servlet.http.*;
>Index: src_servlets/org/eclipse/help/internal/webapp/data/ServletResources.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ServletResources.java,v
>retrieving revision 1.17
>diff -u -r1.17 ServletResources.java
>--- src_servlets/org/eclipse/help/internal/webapp/data/ServletResources.java	9 Dec 2005 20:34:05 -0000	1.17
>+++ src_servlets/org/eclipse/help/internal/webapp/data/ServletResources.java	9 Apr 2006 03:32:00 -0000
>@@ -10,7 +10,7 @@
>  *******************************************************************************/
> package org.eclipse.help.internal.webapp.data;
> 
>-import java.util.*;
>+import java.util.Locale;
> 
> import javax.servlet.http.*;
> 
>Index: src_servlets/org/eclipse/help/internal/webapp/data/UrlUtil.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/UrlUtil.java,v
>retrieving revision 1.32
>diff -u -r1.32 UrlUtil.java
>--- src_servlets/org/eclipse/help/internal/webapp/data/UrlUtil.java	9 Dec 2005 20:34:05 -0000	1.32
>+++ src_servlets/org/eclipse/help/internal/webapp/data/UrlUtil.java	9 Apr 2006 03:32:00 -0000
>@@ -11,7 +11,14 @@
> package org.eclipse.help.internal.webapp.data;
> import java.io.*;
> import java.net.*;
>-import java.util.*;
>+import java.util.ArrayList;
>+import java.util.Collection;
>+import java.util.Enumeration;
>+import java.util.HashSet;
>+import java.util.Iterator;
>+import java.util.List;
>+import java.util.Locale;
>+import java.util.StringTokenizer;
> import java.util.regex.*;
> 
> import javax.servlet.http.*;
>Index: src_servlets/org/eclipse/help/internal/webapp/data/ToolbarData.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ToolbarData.java,v
>retrieving revision 1.14
>diff -u -r1.14 ToolbarData.java
>--- src_servlets/org/eclipse/help/internal/webapp/data/ToolbarData.java	28 Apr 2005 15:36:02 -0000	1.14
>+++ src_servlets/org/eclipse/help/internal/webapp/data/ToolbarData.java	9 Apr 2006 03:32:00 -0000
>@@ -10,7 +10,8 @@
>  *******************************************************************************/
> package org.eclipse.help.internal.webapp.data;
> 
>-import java.util.*;
>+import java.util.ArrayList;
>+import java.util.List;
> 
> import javax.servlet.*;
> import javax.servlet.http.*;
>Index: src_servlets/org/eclipse/help/internal/webapp/data/WorkingSetManagerData.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/WorkingSetManagerData.java,v
>retrieving revision 1.16
>diff -u -r1.16 WorkingSetManagerData.java
>--- src_servlets/org/eclipse/help/internal/webapp/data/WorkingSetManagerData.java	28 Apr 2005 15:36:02 -0000	1.16
>+++ src_servlets/org/eclipse/help/internal/webapp/data/WorkingSetManagerData.java	9 Apr 2006 03:32:00 -0000
>@@ -11,7 +11,7 @@
> package org.eclipse.help.internal.webapp.data;
> 
> import java.io.*;
>-import java.util.*;
>+import java.util.ArrayList;
> 
> import javax.servlet.*;
> import javax.servlet.http.*;
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/META-INF/MANIFEST.MF,v
>retrieving revision 1.9
>diff -u -r1.9 MANIFEST.MF
>--- META-INF/MANIFEST.MF	9 Feb 2006 20:42:10 -0000	1.9
>+++ META-INF/MANIFEST.MF	9 Apr 2006 03:31:59 -0000
>@@ -11,3 +11,4 @@
>  org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)"
> Eclipse-LazyStart: true
> Export-Package: org.eclipse.help.internal.webapp;x-friends:="org.eclipse.ua.tests"
>+Import-Package: com.ibm.icu.text
>Index: src/org/eclipse/help/internal/webapp/WebappResources.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/WebappResources.java,v
>retrieving revision 1.11
>diff -u -r1.11 WebappResources.java
>--- src/org/eclipse/help/internal/webapp/WebappResources.java	23 Feb 2005 18:17:20 -0000	1.11
>+++ src/org/eclipse/help/internal/webapp/WebappResources.java	9 Apr 2006 03:31:59 -0000
>@@ -10,8 +10,12 @@
>  *******************************************************************************/
> package org.eclipse.help.internal.webapp;
> 
>-import java.text.*;
>-import java.util.*;
>+import com.ibm.icu.text.MessageFormat;
>+import java.util.HashMap;
>+import java.util.Locale;
>+import java.util.MissingResourceException;
>+import java.util.ResourceBundle;
>+import java.util.StringTokenizer;
> 
> import org.eclipse.core.runtime.*;
>

Actions: View | Diff

Attachments on bug 136119: 38289