Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-8137 - Javadoc generation is currently not playing nicely with Java7 javadoc changes

This commit is contained in:
Steve Ebersole 2013-04-15 09:50:33 -05:00
parent f2b9ab8278
commit a906d1ffb2
12 changed files with 71 additions and 751 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
release/release.gradle
View File

@ -67,8 +67,8 @@ task aggregateJavadocs(type: Javadoc) {
maxMemory = '512m' maxMemory = '512m'
destinationDir = javadocBuildDir destinationDir = javadocBuildDir
configure( options ) { configure( options ) {
overview = new File( projectDir, 'src/javadoc/overview.html' ) overview = rootProject.file( 'shared/javadoc/overview.html' )
stylesheetFile = new File( projectDir, 'src/javadoc/stylesheet.css' ) stylesheetFile = rootProject.file( 'shared/javadoc/stylesheet.css' )
windowTitle = 'Hibernate JavaDocs' windowTitle = 'Hibernate JavaDocs'
docTitle = "Hibernate JavaDoc ($project.version)" docTitle = "Hibernate JavaDoc ($project.version)"
bottom = "Copyright &copy; 2001-$copyRightYear <a href=\"http://redhat.com\">Red Hat, Inc.</a> All Rights Reserved." bottom = "Copyright &copy; 2001-$copyRightYear <a href=\"http://redhat.com\">Red Hat, Inc.</a> All Rights Reserved."
@ -87,7 +87,7 @@ task aggregateJavadocs(type: Javadoc) {
aggregateJavadocs.doLast { aggregateJavadocs.doLast {
copy { copy {
from new File( projectDir, 'src/javadoc/images' ) from rootProject.file( 'shared/javadoc/images' )
into new File( javadocBuildDir, "/images" ) into new File( javadocBuildDir, "/images" )
} }
} }

474
release/src/javadoc/javadoc7-tool-stylesheet.css
View File

@ -1,474 +0,0 @@
/* Javadoc style sheet */
/*
Overall document style
*/
body {
background-color:#ffffff;
color:#353833;
font-family:Arial, Helvetica, sans-serif;
font-size:76%;
margin:0;
}
a:link, a:visited {
text-decoration:none;
color:#4c6b87;
}
a:hover, a:focus {
text-decoration:none;
color:#bb7a2a;
}
a:active {
text-decoration:none;
color:#4c6b87;
}
a[name] {
color:#353833;
}
a[name]:hover {
text-decoration:none;
color:#353833;
}
pre {
font-size:1.3em;
}
h1 {
font-size:1.8em;
}
h2 {
font-size:1.5em;
}
h3 {
font-size:1.4em;
}
h4 {
font-size:1.3em;
}
h5 {
font-size:1.2em;
}
h6 {
font-size:1.1em;
}
ul {
list-style-type:disc;
}
code, tt {
font-size:1.2em;
}
dt code {
font-size:1.2em;
}
table tr td dt code {
font-size:1.2em;
vertical-align:top;
}
sup {
font-size:.6em;
}
/*
Document title and Copyright styles
*/
.clear {
clear:both;
height:0px;
overflow:hidden;
}
.aboutLanguage {
float:right;
padding:0px 21px;
font-size:.8em;
z-index:200;
margin-top:-7px;
}
.legalCopy {
margin-left:.5em;
}
.bar a, .bar a:link, .bar a:visited, .bar a:active {
color:#FFFFFF;
text-decoration:none;
}
.bar a:hover, .bar a:focus {
color:#bb7a2a;
}
.tab {
background-color:#0066FF;
background-image:url(resources/titlebar.gif);
background-position:left top;
background-repeat:no-repeat;
color:#ffffff;
padding:8px;
width:5em;
font-weight:bold;
}
/*
Navigation bar styles
*/
.bar {
background-image:url(resources/background.gif);
background-repeat:repeat-x;
color:#FFFFFF;
padding:.8em .5em .4em .8em;
height:auto;/*height:1.8em;*/
font-size:1em;
margin:0;
}
.topNav {
background-image:url(resources/background.gif);
background-repeat:repeat-x;
color:#FFFFFF;
float:left;
padding:0;
width:100%;
clear:right;
height:2.8em;
padding-top:10px;
overflow:hidden;
}
.bottomNav {
margin-top:10px;
background-image:url(resources/background.gif);
background-repeat:repeat-x;
color:#FFFFFF;
float:left;
padding:0;
width:100%;
clear:right;
height:2.8em;
padding-top:10px;
overflow:hidden;
}
.subNav {
background-color:#dee3e9;
border-bottom:1px solid #9eadc0;
float:left;
width:100%;
overflow:hidden;
}
.subNav div {
clear:left;
float:left;
padding:0 0 5px 6px;
}
ul.navList, ul.subNavList {
float:left;
margin:0 25px 0 0;
padding:0;
}
ul.navList li{
list-style:none;
float:left;
padding:3px 6px;
}
ul.subNavList li{
list-style:none;
float:left;
font-size:90%;
}
.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {
color:#FFFFFF;
text-decoration:none;
}
.topNav a:hover, .bottomNav a:hover {
text-decoration:none;
color:#bb7a2a;
}
.navBarCell1Rev {
background-image:url(resources/tab.gif);
background-color:#a88834;
color:#FFFFFF;
margin: auto 5px;
border:1px solid #c9aa44;
}
/*
Page header and footer styles
*/
.header, .footer {
clear:both;
margin:0 20px;
padding:5px 0 0 0;
}
.indexHeader {
margin:10px;
position:relative;
}
.indexHeader h1 {
font-size:1.3em;
}
.title {
color:#2c4557;
margin:10px 0;
}
.subTitle {
margin:5px 0 0 0;
}
.header ul {
margin:0 0 25px 0;
padding:0;
}
.footer ul {
margin:20px 0 5px 0;
}
.header ul li, .footer ul li {
list-style:none;
font-size:1.2em;
}
/*
Heading styles
*/
div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
background-color:#dee3e9;
border-top:1px solid #9eadc0;
border-bottom:1px solid #9eadc0;
margin:0 0 6px -8px;
padding:2px 5px;
}
ul.blockList ul.blockList ul.blockList li.blockList h3 {
background-color:#dee3e9;
border-top:1px solid #9eadc0;
border-bottom:1px solid #9eadc0;
margin:0 0 6px -8px;
padding:2px 5px;
}
ul.blockList ul.blockList li.blockList h3 {
padding:0;
margin:15px 0;
}
ul.blockList li.blockList h2 {
padding:0px 0 20px 0;
}
/*
Page layout container styles
*/
.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer {
clear:both;
padding:10px 20px;
position:relative;
}
.indexContainer {
margin:10px;
position:relative;
font-size:1.0em;
}
.indexContainer h2 {
font-size:1.1em;
padding:0 0 3px 0;
}
.indexContainer ul {
margin:0;
padding:0;
}
.indexContainer ul li {
list-style:none;
}
.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
font-size:1.1em;
font-weight:bold;
margin:10px 0 0 0;
color:#4E4E4E;
}
.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
margin:10px 0 10px 20px;
}
.serializedFormContainer dl.nameValue dt {
margin-left:1px;
font-size:1.1em;
display:inline;
font-weight:bold;
}
.serializedFormContainer dl.nameValue dd {
margin:0 0 0 1px;
font-size:1.1em;
display:inline;
}
/*
List styles
*/
ul.horizontal li {
display:inline;
font-size:0.9em;
}
ul.inheritance {
margin:0;
padding:0;
}
ul.inheritance li {
display:inline;
list-style:none;
}
ul.inheritance li ul.inheritance {
margin-left:15px;
padding-left:15px;
padding-top:1px;
}
ul.blockList, ul.blockListLast {
margin:10px 0 10px 0;
padding:0;
}
ul.blockList li.blockList, ul.blockListLast li.blockList {
list-style:none;
margin-bottom:25px;
}
ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
padding:0px 20px 5px 10px;
border:1px solid #9eadc0;
background-color:#f9f9f9;
}
ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {
padding:0 0 5px 8px;
background-color:#ffffff;
border:1px solid #9eadc0;
border-top:none;
}
ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
margin-left:0;
padding-left:0;
padding-bottom:15px;
border:none;
border-bottom:1px solid #9eadc0;
}
ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
list-style:none;
border-bottom:none;
padding-bottom:0;
}
table tr td dl, table tr td dl dt, table tr td dl dd {
margin-top:0;
margin-bottom:1px;
}
/*
Table styles
*/
.contentContainer table, .classUseContainer table, .constantValuesContainer table {
border-bottom:1px solid #9eadc0;
width:100%;
}
.contentContainer ul li table, .classUseContainer ul li table, .constantValuesContainer ul li table {
width:100%;
}
.contentContainer .description table, .contentContainer .details table {
border-bottom:none;
}
.contentContainer ul li table th.colOne, .contentContainer ul li table th.colFirst, .contentContainer ul li table th.colLast, .classUseContainer ul li table th, .constantValuesContainer ul li table th, .contentContainer ul li table td.colOne, .contentContainer ul li table td.colFirst, .contentContainer ul li table td.colLast, .classUseContainer ul li table td, .constantValuesContainer ul li table td{
vertical-align:top;
padding-right:20px;
}
.contentContainer ul li table th.colLast, .classUseContainer ul li table th.colLast,.constantValuesContainer ul li table th.colLast,
.contentContainer ul li table td.colLast, .classUseContainer ul li table td.colLast,.constantValuesContainer ul li table td.colLast,
.contentContainer ul li table th.colOne, .classUseContainer ul li table th.colOne,
.contentContainer ul li table td.colOne, .classUseContainer ul li table td.colOne {
padding-right:3px;
}
.overviewSummary caption, .packageSummary caption, .contentContainer ul.blockList li.blockList caption, .summary caption, .classUseContainer caption, .constantValuesContainer caption {
position:relative;
text-align:left;
background-repeat:no-repeat;
color:#FFFFFF;
font-weight:bold;
clear:none;
overflow:hidden;
padding:0px;
margin:0px;
}
caption a:link, caption a:hover, caption a:active, caption a:visited {
color:#FFFFFF;
}
.overviewSummary caption span, .packageSummary caption span, .contentContainer ul.blockList li.blockList caption span, .summary caption span, .classUseContainer caption span, .constantValuesContainer caption span {
white-space:nowrap;
padding-top:8px;
padding-left:8px;
display:block;
float:left;
background-image:url(resources/titlebar.gif);
height:18px;
}
.overviewSummary .tabEnd, .packageSummary .tabEnd, .contentContainer ul.blockList li.blockList .tabEnd, .summary .tabEnd, .classUseContainer .tabEnd, .constantValuesContainer .tabEnd {
width:10px;
background-image:url(resources/titlebar_end.gif);
background-repeat:no-repeat;
background-position:top right;
position:relative;
float:left;
}
ul.blockList ul.blockList li.blockList table {
margin:0 0 12px 0px;
width:100%;
}
.tableSubHeadingColor {
background-color: #EEEEFF;
}
.altColor {
background-color:#eeeeef;
}
.rowColor {
background-color:#ffffff;
}
.overviewSummary td, .packageSummary td, .contentContainer ul.blockList li.blockList td, .summary td, .classUseContainer td, .constantValuesContainer td {
text-align:left;
padding:3px 3px 3px 7px;
}
th.colFirst, th.colLast, th.colOne, .constantValuesContainer th {
background:#dee3e9;
border-top:1px solid #9eadc0;
border-bottom:1px solid #9eadc0;
text-align:left;
padding:3px 3px 3px 7px;
}
td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover {
font-weight:bold;
}
td.colFirst, th.colFirst {
border-left:1px solid #9eadc0;
white-space:nowrap;
}
td.colLast, th.colLast {
border-right:1px solid #9eadc0;
}
td.colOne, th.colOne {
border-right:1px solid #9eadc0;
border-left:1px solid #9eadc0;
}
table.overviewSummary {
padding:0px;
margin-left:0px;
}
table.overviewSummary td.colFirst, table.overviewSummary th.colFirst,
table.overviewSummary td.colOne, table.overviewSummary th.colOne {
width:25%;
vertical-align:middle;
}
table.packageSummary td.colFirst, table.overviewSummary th.colFirst {
width:25%;
vertical-align:middle;
}
/*
Content styles
*/
.description pre {
margin-top:0;
}
.deprecatedContent {
margin:0;
padding:10px 0;
}
.docSummary {
padding:0;
}
/*
Formatting effect styles
*/
.sourceLineNo {
color:green;
padding:0 30px 0 0;
}
h1.hidden {
visibility:hidden;
overflow:hidden;
font-size:.9em;
}
.block {
display:block;
margin:3px 0 0 0;
}
.strong {
font-weight:bold;
}

174
release/src/javadoc/stylesheet.css
View File

@ -1,174 +0,0 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* Copyright (c) 2010, Red Hat Inc. or third-party contributors as
* indicated by the @author tags or express copyright attribution
* statements applied by the authors. All third-party contributions are
* distributed under license by Red Hat Inc.
*
* This copyrighted material is made available to anyone wishing to use, modify,
* copy, or redistribute it subject to the terms and conditions of the GNU
* Lesser General Public License, as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this distribution; if not, write to:
* Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
/*
* Custom Hibernate javadoc style sheet
*/
/* Page background color */
body {
background: #FFFFFF url(images/bkg_gradient.gif) repeat-x;
margin:0 auto;
font-family:'Lucida Grande', Geneva, Verdana, Arial, sans-serif;
font-size:12px;
padding:0 2em;
color:#333;
}
/* Common elements */
font {
font-family: inherit, sans-serif;
font-size: inherit;
color: inherit;
font-weight: inherit;
}
hr {
border-style: none;
border-bottom: 1px solid #CCCCCC;
}
/* Links */
a:link {
color:#003399;
}
a:visited {
color:#888888;
}
a:hover {
color:#6699cc;
}
a:active {
color: #003399;
}
/* Headings */
h1 {
background: url(images/h1_hdr.png) no-repeat;
line-height:1.2em;
color:#586464;
font-size:2em;
padding:1.5em;
margin-top: 0;
text-align:left;
}
h2 {
color:#586464;
}
/* Default Table elements and colors */
th, table {
border-collapse:collapse;
border-color: #E6E7E8;
}
.TableHeadingColor {
background:#000000 url(images/bkg_blkheader.png) repeat-x scroll left top;
color:#FFFFFF;
font-size:12px;
font-weight:bold;
height:31px;
text-align:left;
padding:1.5em;
}
.TableHeadingColor th {
padding-left: 10px;
}
.TableSubHeadingColor {
background: #ebe7d7;
}
.TableRowColor {
background: #FFFFFF;
border-color: #E6E7E8;
}
.TableRowColor td {
line-height: 175%;
padding-left: 10px;
}
/* Font used in left-hand frame lists */
.FrameTitleFont {
font-size: 125%;
font-family: Helvetica, Arial, sans-serif;
font-weight: bold;
margin-top: 1em;
display: block;
}
.FrameHeadingFont {
font-size: 125%;
font-family: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif;
font-weight: bold;
margin-top: 1em;
display: block;
color:#586464;
border-bottom:1px dotted #CCCCCC;
}
.FrameItemFont {
font-size: 100%;
font-family: Helvetica, Arial, sans-serif
}
/* Navigation bar fonts and colors */
.NavBarCell1 {
background: #ffffff url(images/bkgheader.png) repeat-x;
line-height:3em;
padding-left:10px;
padding-right:10px;
}
.NavBarFont1 {
color: white;
}
.NavBarCell1 a {
color: white;
}
.NavBarCell1Rev {
background-color:#FFFFFF;
padding-left:6px;
padding-right:6px;
}
.NavBarFont1 {
color:#FFFFFF;
}
.NavBarFont1Rev {
color:#243446;
}
.NavBarCell2 {
background-color:#FFFFFF;
}
.NavBarCell3 {
background-color:#FFFFFF;
}

0
release/src/javadoc/images/bkg_blkheader.png → shared/javadoc/images/bkg_blkheader.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

0
release/src/javadoc/images/bkg_gradient.gif → shared/javadoc/images/bkg_gradient.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
release/src/javadoc/images/bkgheader.png → shared/javadoc/images/bkgheader.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 270 B

After

Width:  |  Height:  |  Size: 270 B

0
release/src/javadoc/images/h1_hdr.png → shared/javadoc/images/h1_hdr.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
shared/javadoc/images/tab.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
shared/javadoc/images/titlebar.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.0 KiB

BIN
shared/javadoc/images/titlebar_end.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

7
release/src/javadoc/overview.html → shared/javadoc/overview.html
View File

@ -23,17 +23,18 @@
--> -->
<body> <body>
<h2>Aggregated Hibernate O/RM JavaDocs</h2> <h2>Hibernate O/RM JavaDocs (aggregated)</h2>
Hibernate provides both<ul> Hibernate provides both<ul>
<li> <li>
a native API comprised centrally around {@link org.hibernate.SessionFactory} and {@link org.hibernate.Session} a native API comprised centrally around {@link org.hibernate.SessionFactory} and {@link org.hibernate.Session}
</li> </li>
<li> <li>
an implementation of the <a href="http://jcp.org/en/jsr/detail?id=317">JSR-317</a> Java Persistence API (JPA) an implementation of the Java Persistence API (JPA)
specification comprised centrally around {@link org.hibernate.jpa.internal.EntityManagerFactoryImpl} and specification comprised centrally around {@link org.hibernate.jpa.internal.EntityManagerFactoryImpl} and
{@link org.hibernate.jpa.internal.EntityManagerImpl} (the Hibernate implementations of {@link org.hibernate.jpa.internal.EntityManagerImpl} (the Hibernate implementations of
{@link javax.persistence.EntityManager} and {@link javax.persistence.EntityManagerFactory}, respectively) {@link javax.persistence.EntityManager} and {@link javax.persistence.EntityManagerFactory}, respectively).
See the latest <a href="http://jcp.org/en/jsr/detail?id=338">JPA JSR</a> for details.
</li> </li>
</ul> </ul>
<hr/> <hr/>

157
release/src/javadoc/in-progress-java7-styles.css → shared/javadoc/stylesheet.css
View File

@ -1,40 +1,7 @@
/* /**
* Hibernate, Relational Persistence for Idiomatic Java * Hibernate O/RM Java 7 compliant JavaDoc stylesheet.
*
* Copyright (c) 2013, Red Hat Inc. or third-party contributors as
* indicated by the @author tags or express copyright attribution
* statements applied by the authors. All third-party contributions are
* distributed under license by Red Hat Inc.
*
* This copyrighted material is made available to anyone wishing to use, modify,
* copy, or redistribute it subject to the terms and conditions of the GNU
* Lesser General Public License, as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this distribution; if not, write to:
* Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/ */
/* Javadoc style sheet */
/*
Overall document style
*/
body { body {
/*
background-color:#ffffff;
color:#353833;
font-family:Arial, Helvetica, sans-serif;
font-size:76%;
margin:0;
*/
background: #FFFFFF url(images/bkg_gradient.gif) repeat-x; background: #FFFFFF url(images/bkg_gradient.gif) repeat-x;
margin:0 auto; margin:0 auto;
font-family:'Lucida Grande', Geneva, Verdana, Arial, sans-serif; font-family:'Lucida Grande', Geneva, Verdana, Arial, sans-serif;
@ -45,7 +12,7 @@ body {
a:link, a:visited { a:link, a:visited {
text-decoration:none; text-decoration:none;
color:#4c6b87; color:#455e60;
} }
a:hover, a:focus { a:hover, a:focus {
text-decoration:none; text-decoration:none;
@ -53,7 +20,7 @@ a:hover, a:focus {
} }
a:active { a:active {
text-decoration:none; text-decoration:none;
color:#4c6b87; color:#455e60;
} }
a[name] { a[name] {
color:#353833; color:#353833;
@ -63,23 +30,18 @@ a[name]:hover {
color:#353833; color:#353833;
} }
pre { pre {
font-size:1.3em; font-size:11pt;
} }
h1 { h1 {
background: url(images/h1_hdr.png) no-repeat; background: url(images/h1_hdr.png) no-repeat;
line-height:1.2em; line-height:1.2em;
color:#586464; color:#586464;
font-size:2em; font-size:16pt;
padding:1.5em; padding:17pt;
margin-top: 0; margin-top: 0;
text-align:left; text-align:left;
} }
/*
h1 {
font-size:1.8em;
}
*/
h2 { h2 {
color:#586464; color:#586464;
@ -113,9 +75,10 @@ table tr td dt code {
sup { sup {
font-size:.6em; font-size:.6em;
} }
/*
Document title and Copyright styles /**
*/ * Document title and Copyright styles
*/
.clear { .clear {
clear:both; clear:both;
height:0px; height:0px;
@ -140,7 +103,6 @@ Document title and Copyright styles
} }
.tab { .tab {
background-color:#0066FF; background-color:#0066FF;
/* background-image:url(resources/titlebar.gif); */
background-image:url(images/bkgheader.png); background-image:url(images/bkgheader.png);
background-position:left top; background-position:left top;
background-repeat:no-repeat; background-repeat:no-repeat;
@ -149,11 +111,11 @@ Document title and Copyright styles
width:5em; width:5em;
font-weight:bold; font-weight:bold;
} }
/* /*
Navigation bar styles * Navigation bar styles
*/ */
.bar { .bar {
/* background-image:url(resources/background.gif);*/
background-image:url(images/bkgheader.png); background-image:url(images/bkgheader.png);
background-repeat:repeat-x; background-repeat:repeat-x;
color:#FFFFFF; color:#FFFFFF;
@ -163,7 +125,6 @@ Navigation bar styles
margin:0; margin:0;
} }
.topNav { .topNav {
/* background-image:url(resources/background.gif);*/
background-image:url(images/bkgheader.png); background-image:url(images/bkgheader.png);
background-repeat:repeat-x; background-repeat:repeat-x;
color:#FFFFFF; color:#FFFFFF;
@ -177,7 +138,6 @@ Navigation bar styles
} }
.bottomNav { .bottomNav {
margin-top:10px; margin-top:10px;
/* background-image:url(resources/background.gif);*/
background-image:url(images/bkgheader.png); background-image:url(images/bkgheader.png);
background-repeat:repeat-x; background-repeat:repeat-x;
color:#FFFFFF; color:#FFFFFF;
@ -190,8 +150,8 @@ Navigation bar styles
overflow:hidden; overflow:hidden;
} }
.subNav { .subNav {
background-color:#dee3e9; background-color:#cccdc7;
border-bottom:1px solid #9eadc0; border-bottom:1px solid #949c9c;
float:left; float:left;
width:100%; width:100%;
overflow:hidden; overflow:hidden;
@ -225,15 +185,16 @@ ul.subNavList li{
color:#BCAE79; color:#BCAE79;
} }
.navBarCell1Rev { .navBarCell1Rev {
background-image:url(resources/tab.gif); background-image:url(images/tab.gif);
background-color:#a88834; background-color:#ab9d69;
color:#FFFFFF; color:#FFFFFF;
margin: auto 5px; margin: auto 5px;
border:1px solid #c9aa44; border:1px solid #ab9d69;
} }
/* /*
Page header and footer styles * Page header and footer styles
*/ */
.header, .footer { .header, .footer {
clear:both; clear:both;
margin:0 20px; margin:0 20px;
@ -264,20 +225,21 @@ Page header and footer styles
list-style:none; list-style:none;
font-size:1.2em; font-size:1.2em;
} }
/* /*
Heading styles * Heading styles
*/ */
div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 { div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
background-color:#dee3e9; background-color:#cccdc7;
border-top:1px solid #9eadc0; border-top:1px solid #949c9c;
border-bottom:1px solid #9eadc0; border-bottom:1px solid #949c9c;
margin:0 0 6px -8px; margin:0 0 6px -8px;
padding:2px 5px; padding:2px 5px;
} }
ul.blockList ul.blockList ul.blockList li.blockList h3 { ul.blockList ul.blockList ul.blockList li.blockList h3 {
background-color:#dee3e9; background-color:#cccdc7;
border-top:1px solid #9eadc0; border-top:1px solid #949c9c;
border-bottom:1px solid #9eadc0; border-bottom:1px solid #949c9c;
margin:0 0 6px -8px; margin:0 0 6px -8px;
padding:2px 5px; padding:2px 5px;
} }
@ -288,9 +250,10 @@ ul.blockList ul.blockList li.blockList h3 {
ul.blockList li.blockList h2 { ul.blockList li.blockList h2 {
padding:0px 0 20px 0; padding:0px 0 20px 0;
} }
/* /*
Page layout container styles * Page layout container styles
*/ */
.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer { .contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer {
clear:both; clear:both;
padding:10px 20px; padding:10px 20px;
@ -332,9 +295,10 @@ Page layout container styles
font-size:1.1em; font-size:1.1em;
display:inline; display:inline;
} }
/* /*
List styles * List styles
*/ */
ul.horizontal li { ul.horizontal li {
display:inline; display:inline;
font-size:0.9em; font-size:0.9em;
@ -362,13 +326,13 @@ ul.blockList li.blockList, ul.blockListLast li.blockList {
} }
ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList { ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
padding:0px 20px 5px 10px; padding:0px 20px 5px 10px;
border:1px solid #9eadc0; border:1px solid #949c9c;
background-color:#f9f9f9; background-color:#f9f9f9;
} }
ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList { ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {
padding:0 0 5px 8px; padding:0 0 5px 8px;
background-color:#ffffff; background-color:#ffffff;
border:1px solid #9eadc0; border:1px solid #949c9c;
border-top:none; border-top:none;
} }
ul.blockList ul.blockList ul.blockList ul.blockList li.blockList { ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
@ -376,7 +340,7 @@ ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
padding-left:0; padding-left:0;
padding-bottom:15px; padding-bottom:15px;
border:none; border:none;
border-bottom:1px solid #9eadc0; border-bottom:1px solid #949c9c;
} }
ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast { ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
list-style:none; list-style:none;
@ -387,11 +351,12 @@ table tr td dl, table tr td dl dt, table tr td dl dd {
margin-top:0; margin-top:0;
margin-bottom:1px; margin-bottom:1px;
} }
/* /*
Table styles * Table styles
*/ */
.contentContainer table, .classUseContainer table, .constantValuesContainer table { .contentContainer table, .classUseContainer table, .constantValuesContainer table {
border-bottom:1px solid #9eadc0; border-bottom:1px solid #949c9c;
width:100%; width:100%;
} }
.contentContainer ul li table, .classUseContainer ul li table, .constantValuesContainer ul li table { .contentContainer ul li table, .classUseContainer ul li table, .constantValuesContainer ul li table {
@ -430,12 +395,12 @@ caption a:link, caption a:hover, caption a:active, caption a:visited {
padding-left:8px; padding-left:8px;
display:block; display:block;
float:left; float:left;
background-image:url(resources/titlebar.gif); background-image:url(images/titlebar.gif);
height:18px; height:18px;
} }
.overviewSummary .tabEnd, .packageSummary .tabEnd, .contentContainer ul.blockList li.blockList .tabEnd, .summary .tabEnd, .classUseContainer .tabEnd, .constantValuesContainer .tabEnd { .overviewSummary .tabEnd, .packageSummary .tabEnd, .contentContainer ul.blockList li.blockList .tabEnd, .summary .tabEnd, .classUseContainer .tabEnd, .constantValuesContainer .tabEnd {
width:10px; width:10px;
background-image:url(resources/titlebar_end.gif); background-image:url(images/titlebar_end.gif);
background-repeat:no-repeat; background-repeat:no-repeat;
background-position:top right; background-position:top right;
position:relative; position:relative;
@ -449,19 +414,19 @@ ul.blockList ul.blockList li.blockList table {
background-color: #EEEEFF; background-color: #EEEEFF;
} }
.altColor { .altColor {
background-color:#eeeeef; background-color:#dad7ce;
} }
.rowColor { .rowColor {
background-color:#ffffff; background-color:#e8e6e0;
} }
.overviewSummary td, .packageSummary td, .contentContainer ul.blockList li.blockList td, .summary td, .classUseContainer td, .constantValuesContainer td { .overviewSummary td, .packageSummary td, .contentContainer ul.blockList li.blockList td, .summary td, .classUseContainer td, .constantValuesContainer td {
text-align:left; text-align:left;
padding:3px 3px 3px 7px; padding:3px 3px 3px 7px;
} }
th.colFirst, th.colLast, th.colOne, .constantValuesContainer th { th.colFirst, th.colLast, th.colOne, .constantValuesContainer th {
background:#dee3e9; background:#cccdc7;
border-top:1px solid #9eadc0; border-top:1px solid #949c9c;
border-bottom:1px solid #9eadc0; border-bottom:1px solid #949c9c;
text-align:left; text-align:left;
padding:3px 3px 3px 7px; padding:3px 3px 3px 7px;
} }
@ -469,15 +434,15 @@ td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td
font-weight:bold; font-weight:bold;
} }
td.colFirst, th.colFirst { td.colFirst, th.colFirst {
border-left:1px solid #9eadc0; border-left:1px solid #949c9c;
white-space:nowrap; white-space:nowrap;
} }
td.colLast, th.colLast { td.colLast, th.colLast {
border-right:1px solid #9eadc0; border-right:1px solid #949c9c;
} }
td.colOne, th.colOne { td.colOne, th.colOne {
border-right:1px solid #9eadc0; border-right:1px solid #949c9c;
border-left:1px solid #9eadc0; border-left:1px solid #949c9c;
} }
table.overviewSummary { table.overviewSummary {
padding:0px; padding:0px;
@ -492,9 +457,10 @@ table.packageSummary td.colFirst, table.overviewSummary th.colFirst {
width:25%; width:25%;
vertical-align:middle; vertical-align:middle;
} }
/* /*
Content styles * Content styles
*/ */
.description pre { .description pre {
margin-top:0; margin-top:0;
} }
@ -505,9 +471,10 @@ Content styles
.docSummary { .docSummary {
padding:0; padding:0;
} }
/* /*
Formatting effect styles * Formatting effect styles
*/ */
.sourceLineNo { .sourceLineNo {
color:green; color:green;
padding:0 30px 0 0; padding:0 30px 0 0;
@ -550,7 +517,7 @@ table.overviewSummary, table.packageSummary {
} }
table.overviewSummary td, table.packageSummary td { table.overviewSummary td, table.packageSummary td {
border: 1px solid #9EADC0; border: 1px solid #949c9c;
} }
td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active,