Attachment 162226 Details for Bug 305893 – Patch

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

[patch] Patch

patch305893 .txt (text/plain), 3.48 KB, created by Chris Goldthorpe

on 2010-03-16 19:15:57 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Goldthorpe

Created: 2010-03-16 19:15:57 EDT

Size: 3.48 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.help.webapp
>Index: advanced/workingSet.jsp
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/advanced/workingSet.jsp,v
>retrieving revision 1.57
>diff -u -r1.57 workingSet.jsp
>--- advanced/workingSet.jsp	12 Feb 2010 21:56:05 -0000	1.57
>+++ advanced/workingSet.jsp	16 Mar 2010 23:15:23 -0000
>@@ -494,7 +494,7 @@
> 		    <td>
> 		       <div id="booksContainer">
> 		       <% for (int i=0; i<data.getTocCount(); i++){
>-	                 if(!tocData.isEnabled(i)){
>+	                 if(!data.isTocEnabled(i)){
> 		             // do not show
> 		                 continue;
> 	                  }
>@@ -517,6 +517,10 @@
>                          <%
> 	                         for (int topic=0; topic<data.getTopicCount(i); topic++)
> 	                         {
>+	                            if(!data.isTopicEnabled(i, topic)){
>+		                           // do not show
>+		                           continue;
>+	                            }
> 		                        String topicLabel = data.getTopicLabel(i, topic);
> 		                        String topicChecked = (state == WorkingSetData.STATE_CHECKED) || 
> 							                          (state == WorkingSetData.STATE_GRAYED && data.getTopicState(i,topic) == WorkingSetData.STATE_CHECKED) 
>Index: src/org/eclipse/help/internal/webapp/data/WorkingSetData.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/WorkingSetData.java,v
>retrieving revision 1.4
>diff -u -r1.4 WorkingSetData.java
>--- src/org/eclipse/help/internal/webapp/data/WorkingSetData.java	12 Feb 2010 21:56:05 -0000	1.4
>+++ src/org/eclipse/help/internal/webapp/data/WorkingSetData.java	16 Mar 2010 23:15:23 -0000
>@@ -20,6 +20,9 @@
> import javax.servlet.http.HttpServletRequest;
> import javax.servlet.http.HttpServletResponse;
> 
>+import org.eclipse.help.IToc;
>+import org.eclipse.help.base.AbstractHelpScope;
>+import org.eclipse.help.internal.base.scope.ScopeUtils;
> import org.eclipse.help.internal.base.util.CriteriaUtilities;
> import org.eclipse.help.internal.criteria.CriterionResource;
> import org.eclipse.help.internal.webapp.servlet.WebappWorkingSetManager;
>@@ -41,6 +44,7 @@
> 
> 	private AdaptableToc[] tocs;
> 	private boolean isEditMode;
>+	private AbstractHelpScope filter;
> 
> 	public WorkingSetData(ServletContext context, HttpServletRequest request,
> 			HttpServletResponse response) {
>@@ -49,6 +53,7 @@
> 		AdaptableTocsArray adaptableTocs = wsmgr.getRoot();
> 		tocs = (AdaptableToc[]) adaptableTocs.getChildren();
> 		isEditMode = "edit".equals(getOperation()); //$NON-NLS-1$
>+		filter = RequestScope.getScope(request, response, true);
> 	}
> 
> 	public boolean isEditMode() {
>@@ -106,6 +111,18 @@
> 		return STATE_UNCHECKED;
> 	}
> 
>+	public boolean isTocEnabled(int tocIndex) {
>+		AdaptableToc adaptableToc = tocs[tocIndex];
>+		IToc toc = (IToc) adaptableToc.getAdapter(IToc.class);
>+		return ScopeUtils.showInTree(toc, filter);
>+	}
>+	
>+	public boolean isTopicEnabled(int tocIndex, int topicIndex) {
>+		AdaptableToc adaptableToc = tocs[tocIndex];
>+		IToc toc = (IToc) adaptableToc.getAdapter(IToc.class);
>+		return ScopeUtils.showInTree(toc.getTopics()[topicIndex], filter);
>+	}
>+
> 	/**
> 	 * Returns the state of the topic. The state is not dependent on the parent
> 	 * toc, but only whether it was part of the working set. To get the real

Actions: View | Diff

Attachments on bug 305893: 162226