Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 195192 Details for
Bug 319907
[Help] Promote main help servlets to public API
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
JSON fixes
patch_org.eclipse.help.webapp.txt (text/plain), 5.87 KB, created by
Snehasish Paul
on 2011-05-10 06:36:46 EDT
(
hide
)
Description:
JSON fixes
Filename:
MIME Type:
Creator:
Snehasish Paul
Created:
2011-05-10 06:36:46 EDT
Size:
5.87 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.help.webapp >Index: src/org/eclipse/help/internal/webapp/parser/ParseElement.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/parser/ParseElement.java,v >retrieving revision 1.1 >diff -u -r1.1 ParseElement.java >--- src/org/eclipse/help/internal/webapp/parser/ParseElement.java 2 Mar 2011 21:05:57 -0000 1.1 >+++ src/org/eclipse/help/internal/webapp/parser/ParseElement.java 10 May 2011 10:28:38 -0000 >@@ -10,6 +10,8 @@ > *******************************************************************************/ > package org.eclipse.help.internal.webapp.parser; > >+import java.io.UnsupportedEncodingException; >+import java.net.URLEncoder; > import java.util.ArrayList; > import java.util.Enumeration; > import java.util.Properties; >@@ -81,6 +83,11 @@ > buff.append(JSonHelper.NEWLINE + space + JSonHelper.SPACE); > buff.append(key); > buff.append(JSonHelper.COLON); >+ try { >+ val = URLEncoder.encode(val, "UTF-8"); //$NON-NLS-1$ >+ } catch (UnsupportedEncodingException e) { >+ e.printStackTrace(); >+ } > buff.append(JSonHelper.getQuotes(val)); > buff.append(JSonHelper.COMMA); > } >Index: src/org/eclipse/help/internal/webapp/parser/ResultParser.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/parser/ResultParser.java,v >retrieving revision 1.1 >diff -u -r1.1 ResultParser.java >--- src/org/eclipse/help/internal/webapp/parser/ResultParser.java 2 Mar 2011 21:05:58 -0000 1.1 >+++ src/org/eclipse/help/internal/webapp/parser/ResultParser.java 10 May 2011 10:28:38 -0000 >@@ -45,6 +45,10 @@ > parser.parse(in, this); > } > >+ public void setLabel(String label) { >+ this.label = label; >+ } >+ > public ArrayList getItems() > { > return items; >Index: src/org/eclipse/help/internal/webapp/parser/TocFragmentParser.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/parser/TocFragmentParser.java,v >retrieving revision 1.1 >diff -u -r1.1 TocFragmentParser.java >--- src/org/eclipse/help/internal/webapp/parser/TocFragmentParser.java 2 Mar 2011 21:05:57 -0000 1.1 >+++ src/org/eclipse/help/internal/webapp/parser/TocFragmentParser.java 10 May 2011 10:28:38 -0000 >@@ -49,13 +49,20 @@ > public void startElement(String uri, > String lname, String name, Attributes attrs) { > >- if (name.equalsIgnoreCase(XMLHelper.ELEMENT_NODE)) >- { >+ if (name.equalsIgnoreCase(XMLHelper.ELEMENT_NODE) >+ || name.equalsIgnoreCase(XMLHelper.ELEMENT_NUMERIC_PATH)) { >+ > tagLevel++; > > if (tagLevel == level) { > properties = new Properties(); >- properties.put(JSonHelper.PROPERTY_NAME, JSonHelper.TOPIC); >+ if (name.equalsIgnoreCase(XMLHelper.ELEMENT_NUMERIC_PATH)) { >+ setLabel(""); //$NON-NLS-1$ >+ properties.put(JSonHelper.PROPERTY_NAME, JSonHelper.NUMERIC_PATH); >+ } >+ else >+ properties.put(JSonHelper.PROPERTY_NAME, JSonHelper.TOPIC); >+ > for (int i = 0; i < attrs.getLength(); i++) { > String qname = attrs.getQName(i); > String val = attrs.getValue(i); >@@ -76,11 +83,17 @@ > > public void endElement(String uri, String lname, String name) { > >- if (name.equalsIgnoreCase(XMLHelper.ELEMENT_NODE)) >+ if (name.equalsIgnoreCase(XMLHelper.ELEMENT_NODE) >+ || name.equalsIgnoreCase(XMLHelper.ELEMENT_NUMERIC_PATH)) > { > if (tagLevel == level && properties != null ) { > >- properties.setProperty("type", "toc"); //$NON-NLS-1$ //$NON-NLS-2$ >+ if (name.equalsIgnoreCase(XMLHelper.ELEMENT_NUMERIC_PATH)) { >+ properties.setProperty("id", "0"); //$NON-NLS-1$ //$NON-NLS-2$ >+ properties.setProperty("type", "topic"); //$NON-NLS-1$ //$NON-NLS-2$ >+ } >+ else >+ properties.setProperty("type", "toc"); //$NON-NLS-1$ //$NON-NLS-2$ > > ParseElement element = new ParseElement(properties); > items.add(element); >Index: src/org/eclipse/help/internal/webapp/utils/JSonHelper.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/utils/JSonHelper.java,v >retrieving revision 1.1 >diff -u -r1.1 JSonHelper.java >--- src/org/eclipse/help/internal/webapp/utils/JSonHelper.java 2 Mar 2011 21:05:57 -0000 1.1 >+++ src/org/eclipse/help/internal/webapp/utils/JSonHelper.java 10 May 2011 10:28:38 -0000 >@@ -48,6 +48,7 @@ > public static final String PROPERTY_NAME = "propertyName"; //$NON-NLS-1$ > public static final String INDEX = "Index"; //$NON-NLS-1$ > public static final String TOPIC = "Topic"; //$NON-NLS-1$ >+ public static final String NUMERIC_PATH = "NumericPath"; //$NON-NLS-1$ > > public static String getQuotes(String str){ > return ((str != null)?QUOTE + str + QUOTE:""); //$NON-NLS-1$ >Index: src/org/eclipse/help/internal/webapp/utils/XMLHelper.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/utils/XMLHelper.java,v >retrieving revision 1.1 >diff -u -r1.1 XMLHelper.java >--- src/org/eclipse/help/internal/webapp/utils/XMLHelper.java 2 Mar 2011 21:05:57 -0000 1.1 >+++ src/org/eclipse/help/internal/webapp/utils/XMLHelper.java 10 May 2011 10:28:38 -0000 >@@ -36,6 +36,7 @@ > public static final String ELEMENT_INDEX = "index"; //$NON-NLS-1$ > public static final String ELEMENT_INDEX_CONTRIBUTIONS = "indexContributions"; //$NON-NLS-1$ > public static final String ELEMENT_TOC_CONTRIBUTIONS = "tocContributions"; //$NON-NLS-1$ >+ public static final String ELEMENT_NUMERIC_PATH = "numeric_path"; //$NON-NLS-1$ > > public static final String CATEGORY_HREF = "categoryHref"; //$NON-NLS-1$ > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 319907
:
186915
|
187144
|
187289
|
188265
|
188681
|
190202
| 195192