[ jEdit-CVS ] jEdit/org/gjt/sp/jedit/help HelpSearchPanel.java,1.11,1.12 HelpTOCPanel.java,1.20,1.21 HelpViewer.java,1.20,1.21 HelpViewerInterface.java,1.5,1.6

[Alan E. <ez...@us...>]

Update of /cvsroot/jedit/jEdit/org/gjt/sp/jedit/help
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv25746

Modified Files:
	HelpSearchPanel.java HelpTOCPanel.java HelpViewer.java 
	HelpViewerInterface.java 
Log Message:
Added vertical scrollbar position for HelpViewer interface. 



Index: HelpViewer.java
===================================================================
RCS file: /cvsroot/jedit/jEdit/org/gjt/sp/jedit/help/HelpViewer.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- HelpViewer.java	16 Dec 2005 07:26:15 -0000	1.20
+++ HelpViewer.java	19 May 2006 22:33:12 -0000	1.21
@@ -132,7 +132,7 @@
 		historyModel.addHelpHistoryModelListener(this);
 		historyUpdated();
 
-		gotoURL(url,true);
+		gotoURL(url,true, 0);
 
 		setDefaultCloseOperation(DISPOSE_ON_CLOSE);
 
@@ -163,7 +163,7 @@
 	 * @param addToHistory Should the URL be added to the back/forward
 	 * history?
 	 */
-	public void gotoURL(String url, boolean addToHistory)
+	public void gotoURL(String url, boolean addToHistory, int scrollPos)
 	{
 		// the TOC pane looks up user's guide URLs relative to the
 		// doc directory...
@@ -323,7 +323,7 @@
 			String url = evt.getActionCommand();
 			if (!url.equals(""))
 			{
-				gotoURL(url,false);
+				gotoURL(url,false,0);
 				return;
 			}
 				
@@ -334,7 +334,7 @@
 					getToolkit().beep();
 				else
 				{
-					gotoURL(url,false);
+					gotoURL(url,false,0);
 				}
 			}
 			else if(source == forward)
@@ -344,7 +344,7 @@
 					getToolkit().beep();
 				else
 				{
-					gotoURL(url,false);
+					gotoURL(url,false,0);
 				}
 			}
 		} //}}}
@@ -369,7 +369,7 @@
 				{
 					URL url = evt.getURL();
 					if(url != null)
-						gotoURL(url.toString(),true);
+						gotoURL(url.toString(),true,0);
 				}
 			}
 			else if (evt.getEventType() == HyperlinkEvent.EventType.ENTERED) {

Index: HelpTOCPanel.java
===================================================================
RCS file: /cvsroot/jedit/jEdit/org/gjt/sp/jedit/help/HelpTOCPanel.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- HelpTOCPanel.java	16 Dec 2005 07:26:15 -0000	1.20
+++ HelpTOCPanel.java	19 May 2006 22:33:12 -0000	1.21
@@ -396,7 +396,7 @@
 
 					HelpNode node = (HelpNode)obj;
 
-					helpViewer.gotoURL(node.href,true);
+					helpViewer.gotoURL(node.href,true,0);
 				}
 
 				super.processMouseEvent(evt);

Index: HelpViewerInterface.java
===================================================================
RCS file: /cvsroot/jedit/jEdit/org/gjt/sp/jedit/help/HelpViewerInterface.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- HelpViewerInterface.java	23 Jan 2006 23:04:25 -0000	1.5
+++ HelpViewerInterface.java	19 May 2006 22:33:12 -0000	1.6
@@ -7,17 +7,34 @@
  * Interface supported by all HelpViewer classes.
  * Currently used by @ref infoviewer.InfoViewerPlugin and @ref HelpViewer 
  * 
- * @since Jedit 4.2pre3
+ * @since Jedit 4.2pre5
  * @version $Id$
  */
 public interface HelpViewerInterface 
 {
+	
+	/**
+	 * 
+	 * @param url
+	 * @param addToHistory 
+	 * @param scrollPos desired vertical scrollbar position after we go there
+	 */
+	public void gotoURL(String url, boolean addToHistory, int scrollPos);
+	
+	public String getBaseURL();
+	
 	public void addPropertyChangeListener(PropertyChangeListener l);
+	
+	/**
+	 * Called when the helpviewer is closed
+	 */
 	public void dispose();
-	public String getBaseURL();
+	/**
+	 * @return the root pane of this help viewer
+	 */
 	public Component getComponent();
 	public String getShortURL();
-	public void gotoURL(String url, boolean addToHistory);
+	
 	public void queueTOCReload();
 	public void setTitle(String newTitle);
 }

Index: HelpSearchPanel.java
===================================================================
RCS file: /cvsroot/jedit/jEdit/org/gjt/sp/jedit/help/HelpSearchPanel.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- HelpSearchPanel.java	16 Dec 2005 07:26:15 -0000	1.11
+++ HelpSearchPanel.java	19 May 2006 22:33:12 -0000	1.12
@@ -293,7 +293,7 @@
 			{
 				Result result = (Result)results.getModel()
 					.getElementAt(row);
-				helpViewer.gotoURL(result.file,true);
+				helpViewer.gotoURL(result.file,true, 0);
 			}
 		}
 	} //}}}