Attachment 77896 Details for Bug 173447 – patch

[patch] patch

patch173447.txt (text/plain), 11.81 KB, created by Adam Archer

on 2007-09-07 12:34:02 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Archer

Created: 2007-09-07 12:34:02 EDT

Size: 11.81 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.platform.doc.isv
>Index: schema.css
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.platform.doc.isv/schema.css,v
>retrieving revision 1.5
>diff -u -r1.5 schema.css
>--- schema.css	8 May 2006 23:44:19 -0000	1.5
>+++ schema.css	7 Sep 2007 16:22:40 -0000
>@@ -9,12 +9,12 @@
>  *     IBM Corporation - initial API and implementation
>  *******************************************************************************/
> 
>-H6.CaptionFigColumn#header {
>+H6.SchemaHeader {
> 	font-size:16px; 
> 	display:inline
> }
> 
>-P.Note#copyright {
>+P.SchemaCopyright {
> 	font-size: smaller; 
> 	font-style: normal;
> 	color: #336699; 
>@@ -25,7 +25,7 @@
> 	margin-left: 0.000000pt;
> }
> 
>-P.Code#dtd {
>+P.SchemaDtd {
> 	color: #800000; 
> 	margin-top: 0.000000pt;
> 	margin-bottom: 0.000000pt;
>@@ -33,7 +33,7 @@
> 	margin-left: 10.000000pt;
> }
> 
>-P.Code#dtdAttlist {
>+P.SchemaDtdAttlist {
> 	color: #800000; 
> 	margin-top: 0.000000pt;
> 	margin-bottom: 0.000000pt;
>@@ -41,25 +41,19 @@
> 	margin-left: 20.000000pt;
> }
> 
>-P.Code#tag {
>-	color: #000080; 
>-	display:inline;
>-	margin-top: 0.000000pt;
>-	margin-bottom: 0.000000pt;
>-	margin-right: 0.000000pt;
>-	margin-left: 0.000000pt;
>+span.SchemaTag {
>+	color: #000080;
> }
> 
>-P.Code#cstring {
>-	color: #008000; 
>-	display:inline;
>+span.SchemaCstring {
>+	color: #008000;
>+}
>+
>+pre.Example {
> 	margin-top: 0.000000pt;
>-	margin-bottom: 0.000000pt;
>-	margin-right: 0.000000pt;
>-	margin-left: 0.000000pt;	
> }
> 
>-.ConfigMarkup#elementDesc {
>+.ConfigMarkupElementDesc {
> 	color: black;
> 	margin-top: 0.000000pt;
> 	margin-bottom: 0.000000pt;
>@@ -67,7 +61,7 @@
> 	margin-left: 10.000000pt;
> }
> 
>-.ConfigMarkup#attlistDesc {
>+.ConfigMarkupAttlistDesc {
> 	color: black;
> 	margin-top: 0.000000pt;
> 	margin-bottom: 0.000000pt;
>#P org.eclipse.pde.core
>Index: src/org/eclipse/pde/internal/core/builders/SchemaTransformer.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/SchemaTransformer.java,v
>retrieving revision 1.7
>diff -u -r1.7 SchemaTransformer.java
>--- src/org/eclipse/pde/internal/core/builders/SchemaTransformer.java	15 Jul 2007 05:22:36 -0000	1.7
>+++ src/org/eclipse/pde/internal/core/builders/SchemaTransformer.java	7 Sep 2007 16:22:41 -0000
>@@ -102,8 +102,8 @@
> 	}
> 
> 	private void printStyles() {
>-		fWriter.println("<style>@import url(\"" + getCssURL() + "\");</style>"); //$NON-NLS-1$ //$NON-NLS-2$
>-		fWriter.println("<style>@import url(\"" + getSchemaCssURL() + "\");</style>"); //$NON-NLS-1$ //$NON-NLS-2$
>+		fWriter.println("<style type=\"text/css\">@import url(\"" + getCssURL() + "\");</style>"); //$NON-NLS-1$ //$NON-NLS-2$
>+		fWriter.println("<style type=\"text/css\">@import url(\"" + getSchemaCssURL() + "\");</style>"); //$NON-NLS-1$ //$NON-NLS-2$
> 	}
> 	
> 	private URL getResourceURL(String bundleID, String resourcePath) {
>@@ -121,7 +121,7 @@
> 	
> 	private void printBody() {
> 		fWriter.println("<BODY>"); //$NON-NLS-1$
>-		fWriter.println("<H1><CENTER>" + fSchema.getName() + "</CENTER></H1>"); //$NON-NLS-1$ //$NON-NLS-2$
>+		fWriter.println("<H1 style=\"text-align:center\">" + fSchema.getName() + "</H1>"); //$NON-NLS-1$ //$NON-NLS-2$
> 		if (fSchema.isDeperecated()) {
> 			fWriter.print("<div style=\"border: 1px solid #990000; padding: 5px; text-align: center; color: red;\">"); //$NON-NLS-1$
> 			fWriter.print("This extension point is deprecated"); //$NON-NLS-1$
>@@ -131,18 +131,18 @@
> 			fWriter.println("</div>"); //$NON-NLS-1$
> 		}
> 		fWriter.println("<p></p>"); //$NON-NLS-1$
>-		fWriter.print("<h6 class=CaptionFigColumn id=header>Identifier: </h6>"); //$NON-NLS-1$
>+		fWriter.print("<h6 class=\"CaptionFigColumn SchemaHeader\">Identifier: </h6>"); //$NON-NLS-1$
> 		fWriter.print(fSchema.getQualifiedPointId());
> 		fWriter.println("<p></p>"); //$NON-NLS-1$
> 		transformSection("Since:", IDocumentSection.SINCE); //$NON-NLS-1$
> 		transformDescription();
>-		fWriter.println("<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>"); //$NON-NLS-1$
>+		fWriter.println("<h6 class=\"CaptionFigColumn SchemaHeader\">Configuration Markup:</h6>"); //$NON-NLS-1$
> 		transformMarkup();
> 		transformSection("Examples:", IDocumentSection.EXAMPLES); //$NON-NLS-1$
> 		transformSection("API Information:", IDocumentSection.API_INFO); //$NON-NLS-1$
> 		transformSection("Supplied Implementation:", IDocumentSection.IMPLEMENTATION); //$NON-NLS-1$
>-		fWriter.println("<br>"); //$NON-NLS-1$
>-		fWriter.println("<p class=note id=copyright>"); //$NON-NLS-1$
>+		fWriter.println("<br/>"); //$NON-NLS-1$
>+		fWriter.println("<p class=\"note SchemaCopyright\">"); //$NON-NLS-1$
> 		transformSection(null, IDocumentSection.COPYRIGHT);
> 		fWriter.println("</p>"); //$NON-NLS-1$
> 		fWriter.println("</BODY>"); //$NON-NLS-1$		
>@@ -156,10 +156,11 @@
> 		if (description == null || description.trim().length() == 0)
> 			return;
> 		if (title != null)
>-			fWriter.print("<h6 class=CaptionFigColumn id=header>" + title + " </h6>"); //$NON-NLS-1$ //$NON-NLS-2$
>+			fWriter.print("<h6 class=\"CaptionFigColumn SchemaHeader\">" + title + " </h6>"); //$NON-NLS-1$ //$NON-NLS-2$
> 		transformText(description);
> 		fWriter.println();
>-		fWriter.println("<p></p>"); //$NON-NLS-1$
>+		if (!sectionId.equals(IDocumentSection.COPYRIGHT))
>+			fWriter.println("<p></p>"); //$NON-NLS-1$
> 		fWriter.println();
> 	}
> 
>@@ -183,13 +184,13 @@
> 			char c = text.charAt(i);
> 			if (c == '<') {
> 				if (isPreStart(text, i)) {
>-					fWriter.print("<pre>"); //$NON-NLS-1$
>+					fWriter.print("<pre class=\"Example\"><span class=\"code SchemaTag\">"); //$NON-NLS-1$
> 					i += 4;
> 					preformatted = true;
> 					continue;
> 				}
> 				if (isPreEnd(text, i)) {
>-					fWriter.print("</pre>"); //$NON-NLS-1$
>+					fWriter.print("</span></pre>"); //$NON-NLS-1$
> 					i += 5;
> 					preformatted = false;
> 					inTag = false;
>@@ -201,12 +202,11 @@
> 				switch (c) {
> 					case '<' :
> 						inTag = true;
>-						fWriter.print("<p class=code id=tag>"); //$NON-NLS-1$
> 						fWriter.print("&lt;"); //$NON-NLS-1$
> 						break;
> 					case '>' :
> 						fWriter.print("&gt;"); //$NON-NLS-1$
>-						fWriter.print("</p>"); //$NON-NLS-1$
>+//						fWriter.print("</p>"); //$NON-NLS-1$
> 						inTag = false;
> 						inCstring = false;
> 						break;
>@@ -220,12 +220,12 @@
> 						if (inTag) {
> 							if (inCstring) {
> 								fWriter.print("&quot;"); //$NON-NLS-1$
>-								fWriter.print("</p>"); //$NON-NLS-1$
>-								fWriter.print("<p class=code id=tag>"); //$NON-NLS-1$
>+//								fWriter.print("</p>"); //$NON-NLS-1$
>+								fWriter.print("</span><span class=\"code SchemaTag\">"); //$NON-NLS-1$
> 								inCstring = false;
> 							} else {
> 								inCstring = true;
>-								fWriter.print("<p class=code id=cstring>"); //$NON-NLS-1$
>+								fWriter.print("</span><span class=\"code SchemaCstring\">"); //$NON-NLS-1$
> 								fWriter.print("&quot;"); //$NON-NLS-1$
> 							}
> 						} else {
>@@ -241,8 +241,7 @@
> 	}
> 
> 	private void transformDescription() {
>-		fWriter.println("<p>"); //$NON-NLS-1$
>-		fWriter.print("<h6 class=CaptionFigColumn id=header>Description: </h6>"); //$NON-NLS-1$
>+		fWriter.print("<h6 class=\"CaptionFigColumn SchemaHeader\">Description: </h6>"); //$NON-NLS-1$
> 		transformText(fSchema.getDescription());
> 		ISchemaInclude[] includes = fSchema.getIncludes();
> 		for (int i = 0; i < includes.length; i++) {
>@@ -252,10 +251,11 @@
> 				transformText(ischema.getDescription());
> 			}
> 		}
>-		fWriter.println("</p>"); //$NON-NLS-1$
>+		fWriter.println("<p></p>"); //$NON-NLS-1$
> 	}
> 
> 	private void transformMarkup() {
>+		fWriter.println("<p></p>"); //$NON-NLS-1$
> 		ISchemaElement[] elements = fSchema.getResolvedElements();
> 		for (int i = 0; i < elements.length; i++) {
> 			transformElement(elements[i]);
>@@ -271,7 +271,7 @@
> 			fWriter.print("<div style=\"color: red; font-style: italic;\">The <b>" + name + "</b> element is deprecated</div> "); //$NON-NLS-1$ //$NON-NLS-2$
> 		
> 		fWriter.print(
>-			"<p class=code id=dtd>&lt;!ELEMENT " //$NON-NLS-1$
>+			"<p class=\"code SchemaDtd\">&lt;!ELEMENT " //$NON-NLS-1$
> 				+ nameLink
> 				+ " " //$NON-NLS-1$
> 				+ dtd);
>@@ -281,7 +281,7 @@
> 
> 		if (attributes.length > 0) { 
> 			fWriter.println(
>-				"<p class=code id=dtd>&lt;!ATTLIST " //$NON-NLS-1$
>+				"<p class=\"code SchemaDtd\">&lt;!ATTLIST " //$NON-NLS-1$
> 					+ name
> 					+ "</p>"); //$NON-NLS-1$
> 			int maxWidth = calculateMaxAttributeWidth(element.getAttributes());
>@@ -297,19 +297,19 @@
> 		String description = element.getDescription();
> 
> 		if (description != null && description.trim().length() > 0) {
>-			fWriter.println("<p class=ConfigMarkup id=elementDesc>");  //$NON-NLS-1$
>+			fWriter.println("<p class=\"ConfigMarkupElementDesc\">");  //$NON-NLS-1$
> 			transformText(description);
> 			fWriter.println("</p>"); //$NON-NLS-1$
> 		} 
> 		// end of inserted desc for element
> 		if (attributes.length == 0){
>-			fWriter.println("<br><br>"); //$NON-NLS-1$
>+			fWriter.println("<br/><br/>"); //$NON-NLS-1$
> 			return;
> 		} else if (description != null && description.trim().length() > 0){
>-			fWriter.println("<br>"); //$NON-NLS-1$
>+			fWriter.println("<br/>"); //$NON-NLS-1$
> 		}
> 		
>-		fWriter.println("<ul class=ConfigMarkup id=attlistDesc>"); //$NON-NLS-1$
>+		fWriter.println("<ul class=\"ConfigMarkupAttlistDesc\">"); //$NON-NLS-1$
> 		for (int i = 0; i < attributes.length; i++) {
> 			ISchemaAttribute att = attributes[i];
> 			if (name.equals("extension")) { //$NON-NLS-1$
>@@ -327,11 +327,11 @@
> 		}
> 		fWriter.println("</ul>"); //$NON-NLS-1$
> 		// adding spaces for new shifted view
>-		fWriter.print("<br>"); //$NON-NLS-1$
>+		fWriter.print("<br/>"); //$NON-NLS-1$
> 	}
> 	
> 	private void appendAttlist(ISchemaAttribute att, int maxWidth) {
>-		fWriter.print("<p class=code id=dtdAttlist>"); //$NON-NLS-1$
>+		fWriter.print("<p class=\"code SchemaDtdAttlist\">"); //$NON-NLS-1$
> 		// add name
> 		fWriter.print(att.getName());
> 		// fill spaces to align data type
>Index: schema.css
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.core/schema.css,v
>retrieving revision 1.2
>diff -u -r1.2 schema.css
>--- schema.css	17 May 2007 08:30:42 -0000	1.2
>+++ schema.css	7 Sep 2007 16:22:41 -0000
>@@ -9,12 +9,12 @@
>  *     IBM Corporation - initial API and implementation
>  *******************************************************************************/
> 
>-H6.CaptionFigColumn#header {
>+H6.SchemaHeader {
> 	font-size:16px; 
> 	display:inline
> }
> 
>-P.Note#copyright {
>+P.SchemaCopyright {
> 	font-size: smaller; 
> 	font-style: normal;
> 	color: #336699; 
>@@ -25,7 +25,7 @@
> 	margin-left: 0.000000pt;
> }
> 
>-P.Code#dtd {
>+P.SchemaDtd {
> 	color: #800000; 
> 	margin-top: 0.000000pt;
> 	margin-bottom: 0.000000pt;
>@@ -33,7 +33,7 @@
> 	margin-left: 10.000000pt;
> }
> 
>-P.Code#dtdAttlist {
>+P.SchemaDtdAttlist {
> 	color: #800000; 
> 	margin-top: 0.000000pt;
> 	margin-bottom: 0.000000pt;
>@@ -41,25 +41,19 @@
> 	margin-left: 20.000000pt;
> }
> 
>-P.Code#tag {
>-	color: #000080; 
>-	display:inline;
>-	margin-top: 0.000000pt;
>-	margin-bottom: 0.000000pt;
>-	margin-right: 0.000000pt;
>-	margin-left: 0.000000pt;
>+span.SchemaTag {
>+	color: #000080;
> }
> 
>-P.Code#cstring {
>-	color: #008000; 
>-	display:inline;
>+span.SchemaCstring {
>+	color: #008000;
>+}
>+
>+pre.Example {
> 	margin-top: 0.000000pt;
>-	margin-bottom: 0.000000pt;
>-	margin-right: 0.000000pt;
>-	margin-left: 0.000000pt;	
> }
> 
>-.ConfigMarkup#elementDesc {
>+.ConfigMarkupElementDesc {
> 	color: black;
> 	margin-top: 0.000000pt;
> 	margin-bottom: 0.000000pt;
>@@ -67,7 +61,7 @@
> 	margin-left: 10.000000pt;
> }
> 
>-.ConfigMarkup#attlistDesc {
>+.ConfigMarkupAttlistDesc {
> 	color: black;
> 	margin-top: 0.000000pt;
> 	margin-bottom: 0.000000pt;

Actions: View | Diff

Attachments on bug 173447: 77321 | 77896