Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 305893
Collapse All | Expand All

(-)advanced/workingSet.jsp (-1 / +5 lines)
Lines 494-500 Link Here
494
		    <td>
494
		    <td>
495
		       <div id="booksContainer">
495
		       <div id="booksContainer">
496
		       <% for (int i=0; i<data.getTocCount(); i++){
496
		       <% for (int i=0; i<data.getTocCount(); i++){
497
	                 if(!tocData.isEnabled(i)){
497
	                 if(!data.isTocEnabled(i)){
498
		             // do not show
498
		             // do not show
499
		                 continue;
499
		                 continue;
500
	                  }
500
	                  }
Lines 517-522 Link Here
517
                         <%
517
                         <%
518
	                         for (int topic=0; topic<data.getTopicCount(i); topic++)
518
	                         for (int topic=0; topic<data.getTopicCount(i); topic++)
519
	                         {
519
	                         {
520
	                            if(!data.isTopicEnabled(i, topic)){
521
		                           // do not show
522
		                           continue;
523
	                            }
520
		                        String topicLabel = data.getTopicLabel(i, topic);
524
		                        String topicLabel = data.getTopicLabel(i, topic);
521
		                        String topicChecked = (state == WorkingSetData.STATE_CHECKED) || 
525
		                        String topicChecked = (state == WorkingSetData.STATE_CHECKED) || 
522
							                          (state == WorkingSetData.STATE_GRAYED && data.getTopicState(i,topic) == WorkingSetData.STATE_CHECKED) 
526
							                          (state == WorkingSetData.STATE_GRAYED && data.getTopicState(i,topic) == WorkingSetData.STATE_CHECKED) 
(-)src/org/eclipse/help/internal/webapp/data/WorkingSetData.java (+17 lines)
Lines 20-25 Link Here
20
import javax.servlet.http.HttpServletRequest;
20
import javax.servlet.http.HttpServletRequest;
21
import javax.servlet.http.HttpServletResponse;
21
import javax.servlet.http.HttpServletResponse;
22
22
23
import org.eclipse.help.IToc;
24
import org.eclipse.help.base.AbstractHelpScope;
25
import org.eclipse.help.internal.base.scope.ScopeUtils;
23
import org.eclipse.help.internal.base.util.CriteriaUtilities;
26
import org.eclipse.help.internal.base.util.CriteriaUtilities;
24
import org.eclipse.help.internal.criteria.CriterionResource;
27
import org.eclipse.help.internal.criteria.CriterionResource;
25
import org.eclipse.help.internal.webapp.servlet.WebappWorkingSetManager;
28
import org.eclipse.help.internal.webapp.servlet.WebappWorkingSetManager;
Lines 41-46 Link Here
41
44
42
	private AdaptableToc[] tocs;
45
	private AdaptableToc[] tocs;
43
	private boolean isEditMode;
46
	private boolean isEditMode;
47
	private AbstractHelpScope filter;
44
48
45
	public WorkingSetData(ServletContext context, HttpServletRequest request,
49
	public WorkingSetData(ServletContext context, HttpServletRequest request,
46
			HttpServletResponse response) {
50
			HttpServletResponse response) {
Lines 49-54 Link Here
49
		AdaptableTocsArray adaptableTocs = wsmgr.getRoot();
53
		AdaptableTocsArray adaptableTocs = wsmgr.getRoot();
50
		tocs = (AdaptableToc[]) adaptableTocs.getChildren();
54
		tocs = (AdaptableToc[]) adaptableTocs.getChildren();
51
		isEditMode = "edit".equals(getOperation()); //$NON-NLS-1$
55
		isEditMode = "edit".equals(getOperation()); //$NON-NLS-1$
56
		filter = RequestScope.getScope(request, response, true);
52
	}
57
	}
53
58
54
	public boolean isEditMode() {
59
	public boolean isEditMode() {
Lines 106-111 Link Here
106
		return STATE_UNCHECKED;
111
		return STATE_UNCHECKED;
107
	}
112
	}
108
113
114
	public boolean isTocEnabled(int tocIndex) {
115
		AdaptableToc adaptableToc = tocs[tocIndex];
116
		IToc toc = (IToc) adaptableToc.getAdapter(IToc.class);
117
		return ScopeUtils.showInTree(toc, filter);
118
	}
119
	
120
	public boolean isTopicEnabled(int tocIndex, int topicIndex) {
121
		AdaptableToc adaptableToc = tocs[tocIndex];
122
		IToc toc = (IToc) adaptableToc.getAdapter(IToc.class);
123
		return ScopeUtils.showInTree(toc.getTopics()[topicIndex], filter);
124
	}
125
109
	/**
126
	/**
110
	 * Returns the state of the topic. The state is not dependent on the parent
127
	 * Returns the state of the topic. The state is not dependent on the parent
111
	 * toc, but only whether it was part of the working set. To get the real
128
	 * toc, but only whether it was part of the working set. To get the real

Return to bug 305893