Attachment 86298 Details for Bug 165183 – Storing for historic purposes

[patch] Storing for historic purposes

bug165183-attemptToTarget32-patch.txt (text/plain), 26.28 KB, created by Les Jones

on 2008-01-07 05:22:31 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Les Jones

Created: 2008-01-07 05:22:31 EST

Size: 26.28 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.ui
>Index: src/org/eclipse/pde/ui/templates/AbstractTemplateSection.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/AbstractTemplateSection.java,v
>retrieving revision 1.41
>diff -u -r1.41 AbstractTemplateSection.java
>--- src/org/eclipse/pde/ui/templates/AbstractTemplateSection.java	13 Nov 2007 23:57:03 -0000	1.41
>+++ src/org/eclipse/pde/ui/templates/AbstractTemplateSection.java	7 Jan 2008 10:20:09 -0000
>@@ -739,13 +739,16 @@
> 	}
> 	
> 	protected double getTargetVersion() {
>-        try {
>-    		IPluginBase plugin = model.getPluginBase();
>-			if (plugin instanceof IBundlePluginBase)
>-			    return Double.parseDouble(((IBundlePluginBase)plugin).getTargetVersion());
>-		} catch (NumberFormatException e) {
>+		if (model != null) {
>+			try {
>+				IPluginBase plugin = model.getPluginBase();
>+				if (plugin instanceof IBundlePluginBase)
>+					return Double.parseDouble(((IBundlePluginBase) plugin)
>+							.getTargetVersion());
>+			} catch (NumberFormatException e) {
>+			}
> 		}
>-       return TargetPlatformHelper.getTargetVersion();
>+		return TargetPlatformHelper.getTargetVersion();
> 	}
> 
> 	/**
>#P org.eclipse.pde.ui.templates
>Index: src/org/eclipse/pde/internal/ui/templates/PDETemplateMessages.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/PDETemplateMessages.java,v
>retrieving revision 1.5
>diff -u -r1.5 PDETemplateMessages.java
>--- src/org/eclipse/pde/internal/ui/templates/PDETemplateMessages.java	21 Jun 2007 14:38:43 -0000	1.5
>+++ src/org/eclipse/pde/internal/ui/templates/PDETemplateMessages.java	7 Jan 2008 10:20:12 -0000
>@@ -178,6 +178,7 @@
> 	public static String HelpTemplate_tasks;
> 	public static String HelpTemplate_reference;
> 	public static String HelpTemplate_samples;
>+	public static String HelpTemplate_index;
> 
> 	public static String BuilderNewWizard_wtitle;
> 	public static String BuilderTemplate_title;
>Index: src/org/eclipse/pde/internal/ui/templates/pderesources.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/pderesources.properties,v
>retrieving revision 1.6
>diff -u -r1.6 pderesources.properties
>--- src/org/eclipse/pde/internal/ui/templates/pderesources.properties	21 Jun 2007 14:38:43 -0000	1.6
>+++ src/org/eclipse/pde/internal/ui/templates/pderesources.properties	7 Jan 2008 10:20:13 -0000
>@@ -153,6 +153,7 @@
> HelpTemplate_reference = Generate a '&Reference' category
> HelpTemplate_samples = Generate a '&Samples' category
> HelpTemplate_sampleText=Sample Table of Contents
>+HelpTemplate_index = Generate an '&Index'
> 
> BuilderNewWizard_wtitle = New plug-in project with a sample project builder and nature
> BuilderTemplate_title = Sample Project Builder and Nature
>Index: src/org/eclipse/pde/internal/ui/templates/ide/HelpTemplate.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/ide/HelpTemplate.java,v
>retrieving revision 1.1
>diff -u -r1.1 HelpTemplate.java
>--- src/org/eclipse/pde/internal/ui/templates/ide/HelpTemplate.java	12 Nov 2006 09:00:46 -0000	1.1
>+++ src/org/eclipse/pde/internal/ui/templates/ide/HelpTemplate.java	7 Jan 2008 10:20:13 -0000
>@@ -37,6 +37,7 @@
> 	public static final String KEY_TASKS       = "tasks"; //$NON-NLS-1$
> 	public static final String KEY_REFERENCE   = "reference"; //$NON-NLS-1$
> 	public static final String KEY_SAMPLES     = "samples"; //$NON-NLS-1$
>+	public static final String KEY_INDEX       = "index"; //$NON-NLS-1$
> 	
> 	private TemplateOption tocLabelOption;
> 	private BooleanOption primaryOption;
>@@ -46,6 +47,7 @@
> 	private BooleanOption tasksOption;
> 	private BooleanOption referenceOption;
> 	private BooleanOption samplesOption;
>+	private BooleanOption indexOption;
> 	
> 	public HelpTemplate() {
> 		setPageCount(1);
>@@ -68,8 +70,11 @@
> 		tasksOption.setEnabled(primaryOption.isSelected());
> 		referenceOption.setEnabled(primaryOption.isSelected());
> 		samplesOption.setEnabled(primaryOption.isSelected());
>+		
>+		indexOption.setEnabled(isIncludeIndex() && primaryOption.isSelected());
>+		
> 	}	
>-
>+	
> 	private void createOptions() {
> 		tocLabelOption = addOption(
> 			KEY_TOC_LABEL,
>@@ -119,6 +124,15 @@
> 			true,
> 			0);
> 
>+		// Although we'd like to only create the index option if the eclipse
>+		// target version is high enough, unfortunately, at this point the model
>+		// has not been set and so it's just not possible
>+		
>+		indexOption = (BooleanOption)addOption(
>+				KEY_INDEX,
>+				PDETemplateMessages.HelpTemplate_index,
>+				true,
>+				0);
> 	}
> 	/**
> 	 * @see OptionTemplateSection#getSectionId()
>@@ -172,6 +186,11 @@
> 						&& !tasksOption.isSelected()
> 						&& !referenceOption.isSelected()
> 						&& !samplesOption.isSelected());
>+		} else if ( fileName.equals("index.xml")) { //$NON-NLS-1$
>+			if (isIncludeIndex())
>+				isOk = (indexOption.isEnabled() && indexOption.isSelected());
>+			else 
>+				isOk = false;
> 		}
> 		return isOk;	
> 	}
>@@ -219,8 +238,26 @@
> 		
> 		if (!extension.isInTheModel())
> 			plugin.add(extension);
>+		
>+		// Add the index?
>+		if (indexOption != null && indexOption.isEnabled()
>+				&& indexOption.isSelected()) {
>+			
>+			final String indexExtPoint = "org.eclipse.help.index";
>+			extension = createExtension(indexExtPoint, true);
>+			
>+			IPluginElement indexElement = factory.createElement(extension);
>+			indexElement.setName("index"); //$NON-NLS-1$
>+			indexElement.setAttribute("file", "index.xml");
>+			extension.add(indexElement);
>+			
>+			if( !extension.isInTheModel() ) 
>+				plugin.add(extension);
>+			
>+		}
> 	}
> 	
>+
> 	private void addNonPrimaryTopic(BooleanOption option, String file, IPluginExtension extension) throws CoreException {
> 		if (option.isEnabled() && option.isSelected()) {
> 			IPluginElement tocElement = extension.getPluginModel().getPluginFactory().createElement(extension);
>@@ -251,4 +288,17 @@
> 		return new String[] {"html/", "*.xml"}; //$NON-NLS-1$ //$NON-NLS-2$
> 	}
> 
>+	/**
>+	 * Determines whether the index option should be available. This is
>+	 * dependent upon the Eclipse version being targeted by the plugin. Indexes
>+	 * were introduced in Eclipse 3.2. This must only be called once the model
>+	 * has been set on the template - i.e. it CANNOT be called in createOptions.
>+	 * 
>+	 * @return true if the index option should be included, false otherwise.
>+	 */
>+	private boolean isIncludeIndex() {
>+
>+		double targetVersion = getTargetVersion();
>+		return (targetVersion >= 3.2);
>+	}
> }
>Index: templates_3.2/help/bin/html/concepts/subtopic.html
>===================================================================
>RCS file: templates_3.2/help/bin/html/concepts/subtopic.html
>diff -N templates_3.2/help/bin/html/concepts/subtopic.html
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ templates_3.2/help/bin/html/concepts/subtopic.html	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,13 @@
>+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
>+
>+<html>
>+<head>
>+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
>+	<title>Sub Topic</title>
>+</head>
>+
>+<body>
>+<h1>Sub Topic</h1>
>+Please enter your text here.
>+</body>
>+</html>
>Index: templates_3.2/help/bin/html/tasks/subtopic2.html
>===================================================================
>RCS file: templates_3.2/help/bin/html/tasks/subtopic2.html
>diff -N templates_3.2/help/bin/html/tasks/subtopic2.html
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ templates_3.2/help/bin/html/tasks/subtopic2.html	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,13 @@
>+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
>+
>+<html>
>+<head>
>+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
>+	<title>Sub Topic 2</title>
>+</head>
>+
>+<body>
>+<h1>Sub Topic 2</h1>
>+Please enter your text here.
>+</body>
>+</html>
>Index: templates_3.2/help/bin/html/toc.html
>===================================================================
>RCS file: templates_3.2/help/bin/html/toc.html
>diff -N templates_3.2/help/bin/html/toc.html
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ templates_3.2/help/bin/html/toc.html	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,13 @@
>+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
>+
>+<html>
>+<head>
>+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
>+	<title>Table of Contents</title>
>+</head>
>+
>+<body>
>+<h1>Table of Contents</h1>
>+Please enter your text here.
>+</body>
>+</html>
>Index: templates_3.2/help/testToc.xml
>===================================================================
>RCS file: templates_3.2/help/testToc.xml
>diff -N templates_3.2/help/testToc.xml
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ templates_3.2/help/testToc.xml	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,6 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<?NLS TYPE="org.eclipse.help.toc"?>
>+
>+<toc label="Test TOC" topic="html/toc.html">
>+	<link toc="toc.xml" />
>+</toc>
>Index: templates_3.2/help/bin/html/reference/subtopic.html
>===================================================================
>RCS file: templates_3.2/help/bin/html/reference/subtopic.html
>diff -N templates_3.2/help/bin/html/reference/subtopic.html
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ templates_3.2/help/bin/html/reference/subtopic.html	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,13 @@
>+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
>+
>+<html>
>+<head>
>+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
>+	<title>Sub Topic</title>
>+</head>
>+
>+<body>
>+<h1>Sub Topic</h1>
>+Please enter your text here.
>+</body>
>+</html>
>Index: templates_3.2/help/index.xml
>===================================================================
>RCS file: templates_3.2/help/index.xml
>diff -N templates_3.2/help/index.xml
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ templates_3.2/help/index.xml	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,72 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<index>
>+   
>+   <entry keyword="Main Topics">
>+%if gettingStarted   
>+	   <entry keyword="Getting Started">
>+	      <topic href="html/gettingStarted/maintopic.html"/>
>+	   </entry>
>+%endif
>+%if concepts   
>+	   <entry keyword="Concepts">
>+	      <topic href="html/concepts/maintopic.html"/>
>+	   </entry>
>+%endif
>+%if tasks   
>+	   <entry keyword="Tasks">
>+	      <topic href="html/tasks/maintopic.html"/>
>+	   </entry>
>+%endif
>+%if reference   
>+	   <entry keyword="Reference">
>+	      <topic href="html/reference/maintopic.html"/>
>+	   </entry>
>+%endif
>+%if samples   
>+	   <entry keyword="Samples">
>+	      <topic href="html/samples/maintopic.html"/>
>+	   </entry>
>+%endif
>+%if gettingStarted || concepts || tasks || reference || samples 
>+%else
>+	   <entry keyword="Only Entry">
>+	      <topic href="html/maintopic.html"/>
>+	   </entry>
>+%endif
>+   </entry>
>+   
>+   
>+   <entry keyword="Subtopics">
>+%if gettingStarted   
>+	   <entry keyword="Getting Started">
>+	      <topic href="html/gettingStarted/subtopic.html"/>
>+	   </entry>
>+%endif
>+%if concepts   
>+	   <entry keyword="Concepts">
>+	      <topic href="html/concepts/subtopic.html"/>
>+	   </entry>
>+%endif
>+%if tasks   
>+	   <entry keyword="Tasks">
>+	      <topic href="html/tasks/subtopic.html"/>
>+	   </entry>
>+%endif
>+%if reference   
>+	   <entry keyword="Reference">
>+	      <topic href="html/reference/subtopic.html"/>
>+	   </entry>
>+%endif
>+%if samples   
>+	   <entry keyword="Samples">
>+	      <topic href="html/samples/subtopic.html"/>
>+	   </entry>
>+%endif
>+%if gettingStarted || concepts || tasks || reference || samples 
>+%else
>+	   <entry keyword="Only Entry">
>+	      <topic href="html/subtopic.html"/>
>+	   </entry>
>+%endif
>+   </entry>
>+</index>
>Index: templates_3.2/help/bin/html/reference/maintopic.html
>===================================================================
>RCS file: templates_3.2/help/bin/html/reference/maintopic.html
>diff -N templates_3.2/help/bin/html/reference/maintopic.html
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ templates_3.2/help/bin/html/reference/maintopic.html	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,13 @@
>+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
>+
>+<html>
>+<head>
>+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
>+	<title>Main Topic</title>
>+</head>
>+
>+<body>
>+<h1>Main Topic</h1>
>+Please enter your text here.
>+</body>
>+</html>
>Index: templates_3.2/help/bin/tocgettingstarted.xml
>===================================================================
>RCS file: templates_3.2/help/bin/tocgettingstarted.xml
>diff -N templates_3.2/help/bin/tocgettingstarted.xml
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ templates_3.2/help/bin/tocgettingstarted.xml	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,11 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<?NLS TYPE="org.eclipse.help.toc"?>
>+
>+<toc label="Getting Started" link_to="toc.xml#gettingstarted"> 
>+	<topic label="Main Topic"  href="html/gettingstarted/maintopic.html"> 
>+		<topic label="Sub Topic" href="html/gettingstarted/subtopic.html" /> 
>+	</topic>
>+	<topic label="Main Topic 2">
>+		<topic label="Sub Topic 2" href="html/gettingstarted/subtopic2.html" />
>+	</topic> 
>+</toc>
>Index: templates_3.2/help/bin/html/gettingstarted/subtopic.html
>===================================================================
>RCS file: templates_3.2/help/bin/html/gettingstarted/subtopic.html
>diff -N templates_3.2/help/bin/html/gettingstarted/subtopic.html
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ templates_3.2/help/bin/html/gettingstarted/subtopic.html	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,13 @@
>+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
>+
>+<html>
>+<head>
>+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
>+	<title>Sub Topic</title>
>+</head>
>+
>+<body>
>+<h1>Sub Topic</h1>
>+Please enter your text here.
>+</body>
>+</html>
>Index: templates_3.2/help/bin/tocconcepts.xml
>===================================================================
>RCS file: templates_3.2/help/bin/tocconcepts.xml
>diff -N templates_3.2/help/bin/tocconcepts.xml
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ templates_3.2/help/bin/tocconcepts.xml	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,11 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<?NLS TYPE="org.eclipse.help.toc"?>
>+
>+<toc label="Concepts" link_to="toc.xml#concepts"> 
>+	<topic label="Main Topic"  href="html/concepts/maintopic.html"> 
>+		<topic label="Sub Topic" href="html/concepts/subtopic.html" /> 
>+	</topic>
>+	<topic label="Main Topic 2">
>+		<topic label="Sub Topic 2" href="html/concepts/subtopic2.html" /> 
>+	</topic> 
>+</toc>
>Index: templates_3.2/help/bin/html/tasks/maintopic.html
>===================================================================
>RCS file: templates_3.2/help/bin/html/tasks/maintopic.html
>diff -N templates_3.2/help/bin/html/tasks/maintopic.html
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ templates_3.2/help/bin/html/tasks/maintopic.html	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,13 @@
>+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
>+
>+<html>
>+<head>
>+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
>+	<title>Main Topic</title>
>+</head>
>+
>+<body>
>+<h1>Main Topic</h1>
>+Please enter your text here.
>+</body>
>+</html>
>Index: templates_3.2/help/bin/html/maintopic.html
>===================================================================
>RCS file: templates_3.2/help/bin/html/maintopic.html
>diff -N templates_3.2/help/bin/html/maintopic.html
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ templates_3.2/help/bin/html/maintopic.html	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,13 @@
>+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
>+
>+<html>
>+<head>
>+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
>+	<title>Main Topic</title>
>+</head>
>+
>+<body>
>+<h1>Main Topic</h1>
>+Please enter your text here.
>+</body>
>+</html>
>Index: templates_3.2/help/bin/html/subtopic.html
>===================================================================
>RCS file: templates_3.2/help/bin/html/subtopic.html
>diff -N templates_3.2/help/bin/html/subtopic.html
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ templates_3.2/help/bin/html/subtopic.html	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,13 @@
>+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
>+
>+<html>
>+<head>
>+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
>+	<title>Sub Topic</title>
>+</head>
>+
>+<body>
>+<h1>Sub Topic</h1>
>+Please enter your text here.
>+</body>
>+</html>
>Index: templates_3.2/help/bin/html/tasks/subtopic.html
>===================================================================
>RCS file: templates_3.2/help/bin/html/tasks/subtopic.html
>diff -N templates_3.2/help/bin/html/tasks/subtopic.html
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ templates_3.2/help/bin/html/tasks/subtopic.html	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,13 @@
>+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
>+
>+<html>
>+<head>
>+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
>+	<title>Sub Topic</title>
>+</head>
>+
>+<body>
>+<h1>Sub Topic</h1>
>+Please enter your text here.
>+</body>
>+</html>
>Index: templates_3.2/help/toc.xml
>===================================================================
>RCS file: templates_3.2/help/toc.xml
>diff -N templates_3.2/help/toc.xml
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ templates_3.2/help/toc.xml	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,41 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<?NLS TYPE="org.eclipse.help.toc"?>
>+
>+%if isPrimary
>+<toc label="$tocLabel$" topic="html/toc.html">
>+%else
>+<toc label="$tocLabel$">
>+%endif
>+%if isPrimary && gettingStarted
>+   <topic label="Getting Started">
>+      <anchor id="gettingstarted"/>
>+   </topic>
>+%endif
>+%if isPrimary && concepts
>+   <topic label="Concepts">
>+      <anchor id="concepts"/>
>+   </topic>
>+%endif
>+%if isPrimary && tasks
>+   <topic label="Tasks">
>+      <anchor id="tasks"/>
>+   </topic>
>+%endif
>+%if isPrimary && reference
>+   <topic label="Reference">
>+      <anchor id="reference"/>
>+   </topic>
>+%endif
>+%if isPrimary && samples
>+   <topic label="Samples">
>+      <anchor id="samples"/>
>+   </topic>
>+%endif
>+%if isPrimary && (gettingStarted || concepts || tasks || reference || samples) 
>+%else
>+	<topic label="Main Topic"  href="html/maintopic.html"> 
>+		<topic label="Sub Topic" href="html/subtopic.html"/> 
>+	</topic>
>+	<topic label="Main Topic 2"/>
>+%endif
>+</toc>
>Index: templates_3.2/help/bin/html/gettingstarted/subtopic2.html
>===================================================================
>RCS file: templates_3.2/help/bin/html/gettingstarted/subtopic2.html
>diff -N templates_3.2/help/bin/html/gettingstarted/subtopic2.html
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ templates_3.2/help/bin/html/gettingstarted/subtopic2.html	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,13 @@
>+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
>+
>+<html>
>+<head>
>+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
>+	<title>Sub Topic 2</title>
>+</head>
>+
>+<body>
>+<h1>Sub Topic 2</h1>
>+Please enter your text here.
>+</body>
>+</html>
>Index: templates_3.2/help/bin/tocsamples.xml
>===================================================================
>RCS file: templates_3.2/help/bin/tocsamples.xml
>diff -N templates_3.2/help/bin/tocsamples.xml
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ templates_3.2/help/bin/tocsamples.xml	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,11 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<?NLS TYPE="org.eclipse.help.toc"?>
>+
>+<toc label="Samples" link_to="toc.xml#samples"> 
>+	<topic label="Main Topic"  href="html/samples/maintopic.html"> 
>+		<topic label="Sub Topic" href="html/samples/subtopic.html" /> 
>+	</topic>
>+	<topic label="Main Topic 2">
>+		<topic label="Sub Topic 2" href="html/samples/subtopic2.html" /> 
>+	</topic> 
>+</toc>
>Index: templates_3.2/help/bin/toctasks.xml
>===================================================================
>RCS file: templates_3.2/help/bin/toctasks.xml
>diff -N templates_3.2/help/bin/toctasks.xml
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ templates_3.2/help/bin/toctasks.xml	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,11 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<?NLS TYPE="org.eclipse.help.toc"?>
>+
>+<toc label="Tasks" link_to="toc.xml#tasks"> 
>+	<topic label="Main Topic"  href="html/tasks/maintopic.html"> 
>+		<topic label="Sub Topic" href="html/tasks/subtopic.html" /> 
>+	</topic>
>+	<topic label="Main Topic 2">
>+		<topic label="Sub Topic 2" href="html/tasks/subtopic2.html" /> 
>+	</topic> 
>+</toc>
>Index: templates_3.2/help/bin/html/concepts/subtopic2.html
>===================================================================
>RCS file: templates_3.2/help/bin/html/concepts/subtopic2.html
>diff -N templates_3.2/help/bin/html/concepts/subtopic2.html
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ templates_3.2/help/bin/html/concepts/subtopic2.html	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,13 @@
>+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
>+
>+<html>
>+<head>
>+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
>+	<title>Sub Topic 2</title>
>+</head>
>+
>+<body>
>+<h1>Sub Topic 2</h1>
>+Please enter your text here.
>+</body>
>+</html>
>Index: templates_3.2/help/bin/html/concepts/maintopic.html
>===================================================================
>RCS file: templates_3.2/help/bin/html/concepts/maintopic.html
>diff -N templates_3.2/help/bin/html/concepts/maintopic.html
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ templates_3.2/help/bin/html/concepts/maintopic.html	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,13 @@
>+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
>+
>+<html>
>+<head>
>+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
>+	<title>Main Topic</title>
>+</head>
>+
>+<body>
>+<h1>Main Topic</h1>
>+Please enter your text here.
>+</body>
>+</html>
>Index: templates_3.2/help/bin/html/samples/subtopic.html
>===================================================================
>RCS file: templates_3.2/help/bin/html/samples/subtopic.html
>diff -N templates_3.2/help/bin/html/samples/subtopic.html
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ templates_3.2/help/bin/html/samples/subtopic.html	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,13 @@
>+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
>+
>+<html>
>+<head>
>+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
>+	<title>Sub Topic</title>
>+</head>
>+
>+<body>
>+<h1>Sub Topic</h1>
>+Please enter your text here.
>+</body>
>+</html>
>Index: templates_3.2/help/bin/html/samples/subtopic2.html
>===================================================================
>RCS file: templates_3.2/help/bin/html/samples/subtopic2.html
>diff -N templates_3.2/help/bin/html/samples/subtopic2.html
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ templates_3.2/help/bin/html/samples/subtopic2.html	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,13 @@
>+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
>+
>+<html>
>+<head>
>+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
>+	<title>Sub Topic 2</title>
>+</head>
>+
>+<body>
>+<h1>Sub Topic 2</h1>
>+Please enter your text here.
>+</body>
>+</html>
>Index: templates_3.2/help/bin/html/reference/subtopic2.html
>===================================================================
>RCS file: templates_3.2/help/bin/html/reference/subtopic2.html
>diff -N templates_3.2/help/bin/html/reference/subtopic2.html
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ templates_3.2/help/bin/html/reference/subtopic2.html	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,13 @@
>+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
>+
>+<html>
>+<head>
>+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
>+	<title>Sub Topic 2</title>
>+</head>
>+
>+<body>
>+<h1>Sub Topic 2</h1>
>+Please enter your text here.
>+</body>
>+</html>
>Index: templates_3.2/help/bin/html/gettingstarted/maintopic.html
>===================================================================
>RCS file: templates_3.2/help/bin/html/gettingstarted/maintopic.html
>diff -N templates_3.2/help/bin/html/gettingstarted/maintopic.html
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ templates_3.2/help/bin/html/gettingstarted/maintopic.html	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,13 @@
>+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
>+
>+<html>
>+<head>
>+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
>+	<title>Main Topic</title>
>+</head>
>+
>+<body>
>+<h1>Main Topic</h1>
>+Please enter your text here.
>+</body>
>+</html>
>Index: templates_3.2/help/bin/tocreference.xml
>===================================================================
>RCS file: templates_3.2/help/bin/tocreference.xml
>diff -N templates_3.2/help/bin/tocreference.xml
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ templates_3.2/help/bin/tocreference.xml	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,11 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<?NLS TYPE="org.eclipse.help.toc"?>
>+
>+<toc label="Reference" link_to="toc.xml#reference"> 
>+	<topic label="Main Topic"  href="html/reference/maintopic.html"> 
>+		<topic label="Sub Topic" href="html/reference/subtopic.html" /> 
>+	</topic>
>+	<topic label="Main Topic 2">
>+		<topic label="Sub Topic 2" href="html/reference/subtopic2.html" /> 
>+	</topic> 
>+</toc>
>Index: templates_3.2/help/bin/html/samples/maintopic.html
>===================================================================
>RCS file: templates_3.2/help/bin/html/samples/maintopic.html
>diff -N templates_3.2/help/bin/html/samples/maintopic.html
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ templates_3.2/help/bin/html/samples/maintopic.html	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,13 @@
>+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
>+
>+<html>
>+<head>
>+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
>+	<title>Main Topic</title>
>+</head>
>+
>+<body>
>+<h1>Main Topic</h1>
>+Please enter your text here.
>+</body>
>+</html>

Actions: View | Diff

Attachments on bug 165183: 86275 | 86298 | 86299 | 86300 | 86322