Rename implementation packages to 'internal' and exclude them from generated JavaDoc. User Java 5 style package-info.java instead of package.html.
diff --git a/org.jacoco.agent/src/org/jacoco/agent/package-info.java b/org.jacoco.agent/src/org/jacoco/agent/package-info.java
new file mode 100644
index 0000000..ba96b96
--- /dev/null
+++ b/org.jacoco.agent/src/org/jacoco/agent/package-info.java
@@ -0,0 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Mountainminds GmbH & Co. KG and Contributors
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Marc R. Hoffmann - initial API and implementation
+ *
+ *******************************************************************************/
+
+/**
+ * Provides the runtime Java agent (JAR file) as a resource.
+ */
+package org.jacoco.agent;
\ No newline at end of file
diff --git a/org.jacoco.core/src/org/jacoco/core/analysis/package-info.java b/org.jacoco.core/src/org/jacoco/core/analysis/package-info.java
new file mode 100644
index 0000000..bc00d64
--- /dev/null
+++ b/org.jacoco.core/src/org/jacoco/core/analysis/package-info.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Mountainminds GmbH & Co. KG and Contributors
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Marc R. Hoffmann - initial API and implementation
+ *
+ *******************************************************************************/
+
+/**
+ * <p>
+ * Structures to represent coverage information in node hierarchies. Each node
+ * represents a Java element like class or method. The coverage information is
+ * build from {@linkplain org.jacoco.core.data.IStructureVisitor structure}
+ * and {@linkplain org.jacoco.core.data.IExecutionDataVisitor execution}</a>
+ * information.
+ * </p>
+ *
+ * <p>
+ * A coverage analysis is represented in the following node hierarchy:
+ * </p>
+ *
+ * <pre>
+ * +-- {@linkplain org.jacoco.core.analysis.ICoverageNode.ElementType#GROUP Group} (optional)
+ * +-- {@linkplain org.jacoco.core.analysis.ICoverageNode.ElementType#BUNDLE Bundle}
+ * +-- {@linkplain org.jacoco.core.analysis.ICoverageNode.ElementType#PACKAGE Package}
+ * +-- {@linkplain org.jacoco.core.analysis.ICoverageNode.ElementType#SOURCEFILE Source File}
+ * +-- {@linkplain org.jacoco.core.analysis.ICoverageNode.ElementType#CLASS Class}
+ * +-- {@linkplain org.jacoco.core.analysis.ICoverageNode.ElementType#METHOD Method}
+ * </pre>
+ */
+package org.jacoco.core.analysis;
\ No newline at end of file
diff --git a/org.jacoco.core/src/org/jacoco/core/analysis/package.html b/org.jacoco.core/src/org/jacoco/core/analysis/package.html
deleted file mode 100644
index 751388f..0000000
--- a/org.jacoco.core/src/org/jacoco/core/analysis/package.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<html>
-<body>
-
-<p>
- Structures to represent coverage information in node hierarchies. Each node
- represents a Java element like class or method. The coverage information is
- build from <a href="../data/IStructureVisitor.html">structure</a> and
- <a href="../data/IExecutionDataVisitor.html">execution</a> information.
-</p>
-
-<p>
- A coverage analysis is represented in the following node hierarchy:
-</p>
-
-<pre>
- +-- <a href="ICoverageNode.ElementType.html#GROUP">Group</a>
- +-- <a href="ICoverageNode.ElementType.html#GROUP">Group</a> (optional)
- +-- <a href="ICoverageNode.ElementType.html#BUNDLE">Bundle</a>
- +-- <a href="ICoverageNode.ElementType.html#PACKAGE">Package</a>
- +-- <a href="ICoverageNode.ElementType.html#SOURCEFILE">SourceFile</a>
- +-- <a href="ICoverageNode.ElementType.html#CLASS">Class</a>
- +-- <a href="ICoverageNode.ElementType.html#METHOD">Method</a>
-</pre>
-
-</body>
-</html>
diff --git a/org.jacoco.core/src/org/jacoco/core/data/package-info.java b/org.jacoco.core/src/org/jacoco/core/data/package-info.java
new file mode 100644
index 0000000..7087697
--- /dev/null
+++ b/org.jacoco.core/src/org/jacoco/core/data/package-info.java
@@ -0,0 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Mountainminds GmbH & Co. KG and Contributors
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Marc R. Hoffmann - initial API and implementation
+ *
+ *******************************************************************************/
+
+/**
+ * APIs to represent and persists execution data and traverse code structures.
+ */
+package org.jacoco.core.data;
\ No newline at end of file
diff --git a/org.jacoco.core/src/org/jacoco/core/data/package.html b/org.jacoco.core/src/org/jacoco/core/data/package.html
deleted file mode 100644
index f654ae3..0000000
--- a/org.jacoco.core/src/org/jacoco/core/data/package.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<body>
-
-<p>
- APIs to describe structure and execution data.
-</p>
-
-</body>
-</html>
diff --git a/org.jacoco.core/src/org/jacoco/core/instr/package-info.java b/org.jacoco.core/src/org/jacoco/core/instr/package-info.java
new file mode 100644
index 0000000..c063d88
--- /dev/null
+++ b/org.jacoco.core/src/org/jacoco/core/instr/package-info.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Mountainminds GmbH & Co. KG and Contributors
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Marc R. Hoffmann - initial API and implementation
+ *
+ *******************************************************************************/
+
+/**
+ * <p>
+ * Analysis and instrumentation of Java class files for code coverage. The main
+ * entry points are:
+ * </p>
+ *
+ * <ul>
+ * <li>{@link org.jacoco.core.instr.Analyzer}: Class structure information for
+ * analysis and report generation.</li>
+ * <li>{@link org.jacoco.core.instr.Instrumenter}: Classes instrumentation for
+ * tracing coverage at runtime.</li>
+ * </ul>
+ */
+package org.jacoco.core.instr;
\ No newline at end of file
diff --git a/org.jacoco.core/src/org/jacoco/core/instr/package.html b/org.jacoco.core/src/org/jacoco/core/instr/package.html
deleted file mode 100644
index 43e20a5..0000000
--- a/org.jacoco.core/src/org/jacoco/core/instr/package.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html>
-<body>
-<p>
- Analysis and instrumentation of Java class files for code coverage. The main
- entry points are:
-</p>
-
-<ul>
- <li><a href="Analyzer.html">Analyzer</a>: Class structure information for
- analysis and report generation.</li>
- <li><a href="Instrumenter.html">Instrumenter</a>: Classes instrumentation for
- tracing coverage at runtime.</li>
-</ul>
-
-</body>
-</html>
diff --git a/org.jacoco.core/src/org/jacoco/core/package-info.java b/org.jacoco.core/src/org/jacoco/core/package-info.java
new file mode 100644
index 0000000..a159c31
--- /dev/null
+++ b/org.jacoco.core/src/org/jacoco/core/package-info.java
@@ -0,0 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Mountainminds GmbH & Co. KG and Contributors
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Marc R. Hoffmann - initial API and implementation
+ *
+ *******************************************************************************/
+
+/**
+ * Meta information about JaCoCo.
+ */
+package org.jacoco.core;
\ No newline at end of file
diff --git a/org.jacoco.core/src/org/jacoco/core/runtime/package-info.java b/org.jacoco.core/src/org/jacoco/core/runtime/package-info.java
new file mode 100644
index 0000000..bdf6ca5
--- /dev/null
+++ b/org.jacoco.core/src/org/jacoco/core/runtime/package-info.java
@@ -0,0 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Mountainminds GmbH & Co. KG and Contributors
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Marc R. Hoffmann - initial API and implementation
+ *
+ *******************************************************************************/
+
+/**
+ * Runtime control and execution data collection.
+ */
+package org.jacoco.core.runtime;
\ No newline at end of file
diff --git a/org.jacoco.core/src/org/jacoco/core/runtime/package.html b/org.jacoco.core/src/org/jacoco/core/runtime/package.html
deleted file mode 100644
index 2886a67..0000000
--- a/org.jacoco.core/src/org/jacoco/core/runtime/package.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<body>
-
-<p>
- Runtime control and runtime data collection.
-</p>
-
-</body>
-</html>
diff --git a/org.jacoco.doc/buildhook.xml b/org.jacoco.doc/buildhook.xml
index f7d1c2f..745bfb1 100644
--- a/org.jacoco.doc/buildhook.xml
+++ b/org.jacoco.doc/buildhook.xml
@@ -106,17 +106,9 @@
windowtitle="JaCoCo ${qualified.bundle.version}"
overview="${source.bundle.dir}/javadoc/overview.html"
stylesheetfile="${source.bundle.dir}/javadoc/stylesheet.css">
- <sourcefiles>
- <fileset dir="${result.tmp.org.jacoco.agent.dir}/java" includes="**/*.java"/>
- <fileset dir="${result.tmp.org.jacoco.core.dir}/java" includes="**/*.java"/>
- <fileset dir="${result.tmp.org.jacoco.report.dir}/java" includes="**/*.java"/>
- </sourcefiles>
<classpath>
<path refid="bundle-org.objectweb.asm"/>
</classpath>
- <group title="Bundle org.jacoco.core" packages="org.jacoco.core*"/>
- <group title="Bundle org.jacoco.agent" packages="org.jacoco.agent*"/>
- <group title="Bundle org.jacoco.report" packages="org.jacoco.report*"/>
<link href="http://java.sun.com/j2se/1.5.0/docs/api" offline="true" packagelistloc="${source.bundle.dir}/javadoc/java"/>
<link href="http://asm.ow2.org/asm31/javadoc/user" offline="true" packagelistloc="${source.bundle.dir}/javadoc/asm"/>
<bottom>
@@ -125,6 +117,15 @@
Copyright © ${copyright.years} Mountainminds GmbH & Co. KG and Contributors
</div>
</bottom>
+
+ <packageset dir="${result.tmp.org.jacoco.agent.dir}/java" excludes="**/internal/**"/>
+ <group title="Bundle org.jacoco.core" packages="org.jacoco.core*"/>
+
+ <packageset dir="${result.tmp.org.jacoco.core.dir}/java" excludes="**/internal/**"/>
+ <group title="Bundle org.jacoco.agent" packages="org.jacoco.agent*"/>
+
+ <packageset dir="${result.tmp.org.jacoco.report.dir}/java" excludes="**/internal/**"/>
+ <group title="Bundle org.jacoco.report" packages="org.jacoco.report*"/>
</javadoc>
<copy todir="${result.dist.dir}">
diff --git a/org.jacoco.doc/javadoc/overview.html b/org.jacoco.doc/javadoc/overview.html
index 951a2e4..9538a83 100644
--- a/org.jacoco.doc/javadoc/overview.html
+++ b/org.jacoco.doc/javadoc/overview.html
@@ -2,15 +2,15 @@
<body>
<p>
- This is the public JaCoCo API that can be used for tool integration. JaCoCo is
+ This is the public JaCoCo API that can be used for integration. JaCoCo is
packed as several bundles. While the bundles formally fulfill the OSGi
specification, there is no dependency on OSGi. They can also be used as
regular JARs in your classpath.
</p>
-<h2>org.jacoco.core</h2>
+<h2>Bundle org.jacoco.core</h2>
-</p>
+<p>
The core bundle implements the code coverage technology itself. It
provides APIs and implementation for
</p>
@@ -21,14 +21,14 @@
<li>calculating and storing coverage data.</li>
</ul>
-<h2>org.jacoco.agent</h2>
+<h2>Bundle org.jacoco.agent</h2>
<p>
Provides the runtime Java agent (JAR file) as a resource.
</p>
-<h2>org.jacoco.report</h2>
+<h2>Bundle org.jacoco.report</h2>
<p>
APIs and implementation to create coverage reports in several formats.
diff --git a/org.jacoco.report.test/src/org/jacoco/report/html/NodePageTest.java b/org.jacoco.report.test/src/org/jacoco/report/html/NodePageTest.java
index 41a314a..e698e5a 100644
--- a/org.jacoco.report.test/src/org/jacoco/report/html/NodePageTest.java
+++ b/org.jacoco.report.test/src/org/jacoco/report/html/NodePageTest.java
@@ -24,10 +24,10 @@
import org.jacoco.report.IReportVisitor;
import org.jacoco.report.MemoryMultiReportOutput;
import org.jacoco.report.ReportOutputFolder;
-import org.jacoco.report.html.index.IIndexUpdate;
-import org.jacoco.report.html.resources.Resources;
-import org.jacoco.report.html.resources.Styles;
-import org.jacoco.report.html.table.Table;
+import org.jacoco.report.internal.html.index.IIndexUpdate;
+import org.jacoco.report.internal.html.resources.Resources;
+import org.jacoco.report.internal.html.resources.Styles;
+import org.jacoco.report.internal.html.table.Table;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/org.jacoco.report.test/src/org/jacoco/report/html/ReportPageTest.java b/org.jacoco.report.test/src/org/jacoco/report/html/ReportPageTest.java
index 73a0955..0115526 100644
--- a/org.jacoco.report.test/src/org/jacoco/report/html/ReportPageTest.java
+++ b/org.jacoco.report.test/src/org/jacoco/report/html/ReportPageTest.java
@@ -19,10 +19,10 @@
import org.jacoco.report.ILanguageNames;
import org.jacoco.report.MemoryMultiReportOutput;
import org.jacoco.report.ReportOutputFolder;
-import org.jacoco.report.html.index.IIndexUpdate;
-import org.jacoco.report.html.resources.Resources;
-import org.jacoco.report.html.resources.Styles;
-import org.jacoco.report.html.table.Table;
+import org.jacoco.report.internal.html.index.IIndexUpdate;
+import org.jacoco.report.internal.html.resources.Resources;
+import org.jacoco.report.internal.html.resources.Styles;
+import org.jacoco.report.internal.html.table.Table;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/org.jacoco.report.test/src/org/jacoco/report/html/SessionsPageTest.java b/org.jacoco.report.test/src/org/jacoco/report/html/SessionsPageTest.java
index 6b0b5ab..4c19d8e 100644
--- a/org.jacoco.report.test/src/org/jacoco/report/html/SessionsPageTest.java
+++ b/org.jacoco.report.test/src/org/jacoco/report/html/SessionsPageTest.java
@@ -26,11 +26,11 @@
import org.jacoco.report.JavaNames;
import org.jacoco.report.MemoryMultiReportOutput;
import org.jacoco.report.ReportOutputFolder;
-import org.jacoco.report.html.index.ElementIndex;
-import org.jacoco.report.html.index.IIndexUpdate;
-import org.jacoco.report.html.resources.Resources;
-import org.jacoco.report.html.resources.Styles;
-import org.jacoco.report.html.table.Table;
+import org.jacoco.report.internal.html.index.ElementIndex;
+import org.jacoco.report.internal.html.index.IIndexUpdate;
+import org.jacoco.report.internal.html.resources.Resources;
+import org.jacoco.report.internal.html.resources.Styles;
+import org.jacoco.report.internal.html.table.Table;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/org.jacoco.report.test/src/org/jacoco/report/html/SourceFilePageTest.java b/org.jacoco.report.test/src/org/jacoco/report/html/SourceFilePageTest.java
index fb69c72..017cdf9 100644
--- a/org.jacoco.report.test/src/org/jacoco/report/html/SourceFilePageTest.java
+++ b/org.jacoco.report.test/src/org/jacoco/report/html/SourceFilePageTest.java
@@ -27,10 +27,10 @@
import org.jacoco.report.ISourceFileLocator;
import org.jacoco.report.MemoryMultiReportOutput;
import org.jacoco.report.ReportOutputFolder;
-import org.jacoco.report.html.index.IIndexUpdate;
-import org.jacoco.report.html.resources.Resources;
-import org.jacoco.report.html.resources.Styles;
-import org.jacoco.report.html.table.Table;
+import org.jacoco.report.internal.html.index.IIndexUpdate;
+import org.jacoco.report.internal.html.resources.Resources;
+import org.jacoco.report.internal.html.resources.Styles;
+import org.jacoco.report.internal.html.table.Table;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/org.jacoco.report.test/src/org/jacoco/report/html/SourceHighlighterTest.java b/org.jacoco.report.test/src/org/jacoco/report/html/SourceHighlighterTest.java
index 5f92f98..1e19868 100644
--- a/org.jacoco.report.test/src/org/jacoco/report/html/SourceHighlighterTest.java
+++ b/org.jacoco.report.test/src/org/jacoco/report/html/SourceHighlighterTest.java
@@ -17,7 +17,7 @@
import java.io.StringWriter;
import org.jacoco.core.analysis.LinesImpl;
-import org.jacoco.report.html.resources.Styles;
+import org.jacoco.report.internal.html.resources.Styles;
import org.junit.Before;
import org.junit.Test;
import org.w3c.dom.Document;
diff --git a/org.jacoco.report.test/src/org/jacoco/report/html/resources/ResourcesTest.java b/org.jacoco.report.test/src/org/jacoco/report/internal/html/resources/ResourcesTest.java
similarity index 95%
rename from org.jacoco.report.test/src/org/jacoco/report/html/resources/ResourcesTest.java
rename to org.jacoco.report.test/src/org/jacoco/report/internal/html/resources/ResourcesTest.java
index 9b06385..8ec6e39 100644
--- a/org.jacoco.report.test/src/org/jacoco/report/html/resources/ResourcesTest.java
+++ b/org.jacoco.report.test/src/org/jacoco/report/internal/html/resources/ResourcesTest.java
@@ -9,7 +9,7 @@
* Marc R. Hoffmann - initial API and implementation
*
*******************************************************************************/
-package org.jacoco.report.html.resources;
+package org.jacoco.report.internal.html.resources;
import static org.junit.Assert.assertEquals;
@@ -18,6 +18,7 @@
import org.jacoco.core.analysis.ICoverageNode.ElementType;
import org.jacoco.report.MemoryMultiReportOutput;
import org.jacoco.report.ReportOutputFolder;
+import org.jacoco.report.internal.html.resources.Resources;
import org.junit.Before;
import org.junit.Test;
diff --git a/org.jacoco.report.test/src/org/jacoco/report/html/resources/StylesTest.java b/org.jacoco.report.test/src/org/jacoco/report/internal/html/resources/StylesTest.java
similarity index 91%
rename from org.jacoco.report.test/src/org/jacoco/report/html/resources/StylesTest.java
rename to org.jacoco.report.test/src/org/jacoco/report/internal/html/resources/StylesTest.java
index ae2ee06..8484ec4 100644
--- a/org.jacoco.report.test/src/org/jacoco/report/html/resources/StylesTest.java
+++ b/org.jacoco.report.test/src/org/jacoco/report/internal/html/resources/StylesTest.java
@@ -9,10 +9,11 @@
* Marc R. Hoffmann - initial API and implementation
*
*******************************************************************************/
-package org.jacoco.report.html.resources;
+package org.jacoco.report.internal.html.resources;
import static org.junit.Assert.assertEquals;
+import org.jacoco.report.internal.html.resources.Styles;
import org.junit.Test;
/**
diff --git a/org.jacoco.report.test/src/org/jacoco/report/html/table/BarColumnTest.java b/org.jacoco.report.test/src/org/jacoco/report/internal/html/table/BarColumnTest.java
similarity index 95%
rename from org.jacoco.report.test/src/org/jacoco/report/html/table/BarColumnTest.java
rename to org.jacoco.report.test/src/org/jacoco/report/internal/html/table/BarColumnTest.java
index 8509b72..91adf06 100644
--- a/org.jacoco.report.test/src/org/jacoco/report/html/table/BarColumnTest.java
+++ b/org.jacoco.report.test/src/org/jacoco/report/internal/html/table/BarColumnTest.java
@@ -9,7 +9,7 @@
* Marc R. Hoffmann - initial API and implementation
*
*******************************************************************************/
-package org.jacoco.report.html.table;
+package org.jacoco.report.internal.html.table;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -28,7 +28,10 @@
import org.jacoco.report.html.HTMLDocument;
import org.jacoco.report.html.HTMLElement;
import org.jacoco.report.html.HTMLSupport;
-import org.jacoco.report.html.resources.Resources;
+import org.jacoco.report.internal.html.resources.Resources;
+import org.jacoco.report.internal.html.table.BarColumn;
+import org.jacoco.report.internal.html.table.IColumnRenderer;
+import org.jacoco.report.internal.html.table.ITableItem;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/org.jacoco.report.test/src/org/jacoco/report/html/table/CounterColumnTest.java b/org.jacoco.report.test/src/org/jacoco/report/internal/html/table/CounterColumnTest.java
similarity index 95%
rename from org.jacoco.report.test/src/org/jacoco/report/html/table/CounterColumnTest.java
rename to org.jacoco.report.test/src/org/jacoco/report/internal/html/table/CounterColumnTest.java
index ae58712..3f148ac 100644
--- a/org.jacoco.report.test/src/org/jacoco/report/html/table/CounterColumnTest.java
+++ b/org.jacoco.report.test/src/org/jacoco/report/internal/html/table/CounterColumnTest.java
@@ -9,7 +9,7 @@
* Marc R. Hoffmann - initial API and implementation
*
*******************************************************************************/
-package org.jacoco.report.html.table;
+package org.jacoco.report.internal.html.table;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -30,7 +30,10 @@
import org.jacoco.report.html.HTMLDocument;
import org.jacoco.report.html.HTMLElement;
import org.jacoco.report.html.HTMLSupport;
-import org.jacoco.report.html.resources.Resources;
+import org.jacoco.report.internal.html.resources.Resources;
+import org.jacoco.report.internal.html.table.CounterColumn;
+import org.jacoco.report.internal.html.table.IColumnRenderer;
+import org.jacoco.report.internal.html.table.ITableItem;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/org.jacoco.report.test/src/org/jacoco/report/html/table/LabelColumnTest.java b/org.jacoco.report.test/src/org/jacoco/report/internal/html/table/LabelColumnTest.java
similarity index 93%
rename from org.jacoco.report.test/src/org/jacoco/report/html/table/LabelColumnTest.java
rename to org.jacoco.report.test/src/org/jacoco/report/internal/html/table/LabelColumnTest.java
index 1911372..30ad843 100644
--- a/org.jacoco.report.test/src/org/jacoco/report/html/table/LabelColumnTest.java
+++ b/org.jacoco.report.test/src/org/jacoco/report/internal/html/table/LabelColumnTest.java
@@ -9,7 +9,7 @@
* Marc R. Hoffmann - initial API and implementation
*
*******************************************************************************/
-package org.jacoco.report.html.table;
+package org.jacoco.report.internal.html.table;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -22,7 +22,10 @@
import org.jacoco.report.html.HTMLDocument;
import org.jacoco.report.html.HTMLElement;
import org.jacoco.report.html.HTMLSupport;
-import org.jacoco.report.html.resources.Resources;
+import org.jacoco.report.internal.html.resources.Resources;
+import org.jacoco.report.internal.html.table.IColumnRenderer;
+import org.jacoco.report.internal.html.table.ITableItem;
+import org.jacoco.report.internal.html.table.LabelColumn;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/org.jacoco.report.test/src/org/jacoco/report/html/table/PercentageColumnTest.java b/org.jacoco.report.test/src/org/jacoco/report/internal/html/table/PercentageColumnTest.java
similarity index 94%
rename from org.jacoco.report.test/src/org/jacoco/report/html/table/PercentageColumnTest.java
rename to org.jacoco.report.test/src/org/jacoco/report/internal/html/table/PercentageColumnTest.java
index 2dd14fa..8884bdc 100644
--- a/org.jacoco.report.test/src/org/jacoco/report/html/table/PercentageColumnTest.java
+++ b/org.jacoco.report.test/src/org/jacoco/report/internal/html/table/PercentageColumnTest.java
@@ -9,7 +9,7 @@
* Marc R. Hoffmann - initial API and implementation
*
*******************************************************************************/
-package org.jacoco.report.html.table;
+package org.jacoco.report.internal.html.table;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -27,7 +27,10 @@
import org.jacoco.report.html.HTMLDocument;
import org.jacoco.report.html.HTMLElement;
import org.jacoco.report.html.HTMLSupport;
-import org.jacoco.report.html.resources.Resources;
+import org.jacoco.report.internal.html.resources.Resources;
+import org.jacoco.report.internal.html.table.IColumnRenderer;
+import org.jacoco.report.internal.html.table.ITableItem;
+import org.jacoco.report.internal.html.table.PercentageColumn;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/org.jacoco.report.test/src/org/jacoco/report/html/table/SortIndexTest.java b/org.jacoco.report.test/src/org/jacoco/report/internal/html/table/SortIndexTest.java
similarity index 95%
rename from org.jacoco.report.test/src/org/jacoco/report/html/table/SortIndexTest.java
rename to org.jacoco.report.test/src/org/jacoco/report/internal/html/table/SortIndexTest.java
index 4fab8a0..ca3fabd 100644
--- a/org.jacoco.report.test/src/org/jacoco/report/html/table/SortIndexTest.java
+++ b/org.jacoco.report.test/src/org/jacoco/report/internal/html/table/SortIndexTest.java
@@ -9,7 +9,7 @@
* Marc R. Hoffmann - initial API and implementation
*
*******************************************************************************/
-package org.jacoco.report.html.table;
+package org.jacoco.report.internal.html.table;
import static org.junit.Assert.assertEquals;
@@ -19,6 +19,7 @@
import java.util.Comparator;
import java.util.List;
+import org.jacoco.report.internal.html.table.SortIndex;
import org.junit.Before;
import org.junit.Test;
diff --git a/org.jacoco.report.test/src/org/jacoco/report/html/table/TableTest.java b/org.jacoco.report.test/src/org/jacoco/report/internal/html/table/TableTest.java
similarity index 95%
rename from org.jacoco.report.test/src/org/jacoco/report/html/table/TableTest.java
rename to org.jacoco.report.test/src/org/jacoco/report/internal/html/table/TableTest.java
index c708b0d..01c8932 100644
--- a/org.jacoco.report.test/src/org/jacoco/report/html/table/TableTest.java
+++ b/org.jacoco.report.test/src/org/jacoco/report/internal/html/table/TableTest.java
@@ -9,7 +9,7 @@
* Marc R. Hoffmann - initial API and implementation
*
*******************************************************************************/
-package org.jacoco.report.html.table;
+package org.jacoco.report.internal.html.table;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
@@ -30,7 +30,11 @@
import org.jacoco.report.html.HTMLDocument;
import org.jacoco.report.html.HTMLElement;
import org.jacoco.report.html.HTMLSupport;
-import org.jacoco.report.html.resources.Resources;
+import org.jacoco.report.internal.html.resources.Resources;
+import org.jacoco.report.internal.html.table.IColumnRenderer;
+import org.jacoco.report.internal.html.table.ITableItem;
+import org.jacoco.report.internal.html.table.Table;
+import org.jacoco.report.internal.html.table.TableItemComparator;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/org.jacoco.report/buildhook.xml b/org.jacoco.report/buildhook.xml
index 4a696e2..a00485d 100644
--- a/org.jacoco.report/buildhook.xml
+++ b/org.jacoco.report/buildhook.xml
@@ -21,9 +21,9 @@
</path>
<fileset dir="${source.bundle.java.dir}" id="classpathresources">
- <include name="org/jacoco/report/html/resources/*.css"/>
- <include name="org/jacoco/report/html/resources/*.js"/>
- <include name="org/jacoco/report/html/resources/*.gif"/>
+ <include name="org/jacoco/report/internal/html/resources/*.css"/>
+ <include name="org/jacoco/report/internal/html/resources/*.js"/>
+ <include name="org/jacoco/report/internal/html/resources/*.gif"/>
<include name="**/*.dtd"/>
</fileset>
diff --git a/org.jacoco.report/src/org/jacoco/report/csv/package-info.java b/org.jacoco.report/src/org/jacoco/report/csv/package-info.java
new file mode 100644
index 0000000..100199d
--- /dev/null
+++ b/org.jacoco.report/src/org/jacoco/report/csv/package-info.java
@@ -0,0 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Mountainminds GmbH & Co. KG and Contributors
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Brock Janiczak - initial API and implementation
+ *
+ *******************************************************************************/
+
+/**
+ * CSV report implementation.
+ */
+package org.jacoco.report.csv;
\ No newline at end of file
diff --git a/org.jacoco.report/src/org/jacoco/report/csv/package.html b/org.jacoco.report/src/org/jacoco/report/csv/package.html
deleted file mode 100644
index 17dcb11..0000000
--- a/org.jacoco.report/src/org/jacoco/report/csv/package.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<body>
-
-<p>
- CSV report implementation.
-</p>
-
-</body>
-</html>
diff --git a/org.jacoco.report/src/org/jacoco/report/html/ClassPage.java b/org.jacoco.report/src/org/jacoco/report/html/ClassPage.java
index 5da5d55..60b9b49 100644
--- a/org.jacoco.report/src/org/jacoco/report/html/ClassPage.java
+++ b/org.jacoco.report/src/org/jacoco/report/html/ClassPage.java
@@ -21,9 +21,9 @@
import org.jacoco.core.analysis.MethodCoverage;
import org.jacoco.report.IReportVisitor;
import org.jacoco.report.ReportOutputFolder;
-import org.jacoco.report.html.resources.Resources;
-import org.jacoco.report.html.resources.Styles;
-import org.jacoco.report.html.table.ITableItem;
+import org.jacoco.report.internal.html.resources.Resources;
+import org.jacoco.report.internal.html.resources.Styles;
+import org.jacoco.report.internal.html.table.ITableItem;
/**
* Page showing coverage information for a class as a table of methods. The
diff --git a/org.jacoco.report/src/org/jacoco/report/html/GroupPage.java b/org.jacoco.report/src/org/jacoco/report/html/GroupPage.java
index 00fe38d..1c712e7 100644
--- a/org.jacoco.report/src/org/jacoco/report/html/GroupPage.java
+++ b/org.jacoco.report/src/org/jacoco/report/html/GroupPage.java
@@ -19,7 +19,7 @@
import org.jacoco.report.IReportVisitor;
import org.jacoco.report.ISourceFileLocator;
import org.jacoco.report.ReportOutputFolder;
-import org.jacoco.report.html.resources.Resources;
+import org.jacoco.report.internal.html.resources.Resources;
/**
* Page showing coverage information for a node that groups other nodes. The
diff --git a/org.jacoco.report/src/org/jacoco/report/html/HTMLFormatter.java b/org.jacoco.report/src/org/jacoco/report/html/HTMLFormatter.java
index de3ab6e..5acce18 100644
--- a/org.jacoco.report/src/org/jacoco/report/html/HTMLFormatter.java
+++ b/org.jacoco.report/src/org/jacoco/report/html/HTMLFormatter.java
@@ -33,15 +33,15 @@
import org.jacoco.report.ISourceFileLocator;
import org.jacoco.report.JavaNames;
import org.jacoco.report.ReportOutputFolder;
-import org.jacoco.report.html.index.ElementIndex;
-import org.jacoco.report.html.index.IIndexUpdate;
-import org.jacoco.report.html.resources.Resources;
-import org.jacoco.report.html.resources.Styles;
-import org.jacoco.report.html.table.BarColumn;
-import org.jacoco.report.html.table.CounterColumn;
-import org.jacoco.report.html.table.LabelColumn;
-import org.jacoco.report.html.table.PercentageColumn;
-import org.jacoco.report.html.table.Table;
+import org.jacoco.report.internal.html.index.ElementIndex;
+import org.jacoco.report.internal.html.index.IIndexUpdate;
+import org.jacoco.report.internal.html.resources.Resources;
+import org.jacoco.report.internal.html.resources.Styles;
+import org.jacoco.report.internal.html.table.BarColumn;
+import org.jacoco.report.internal.html.table.CounterColumn;
+import org.jacoco.report.internal.html.table.LabelColumn;
+import org.jacoco.report.internal.html.table.PercentageColumn;
+import org.jacoco.report.internal.html.table.Table;
/**
* Formatter for coverage reports in multiple HTML pages.
diff --git a/org.jacoco.report/src/org/jacoco/report/html/IHTMLReportContext.java b/org.jacoco.report/src/org/jacoco/report/html/IHTMLReportContext.java
index 0c5cf1b..1c89d12 100644
--- a/org.jacoco.report/src/org/jacoco/report/html/IHTMLReportContext.java
+++ b/org.jacoco.report/src/org/jacoco/report/html/IHTMLReportContext.java
@@ -14,9 +14,9 @@
import java.util.Locale;
import org.jacoco.report.ILanguageNames;
-import org.jacoco.report.html.index.IIndexUpdate;
-import org.jacoco.report.html.resources.Resources;
-import org.jacoco.report.html.table.Table;
+import org.jacoco.report.internal.html.index.IIndexUpdate;
+import org.jacoco.report.internal.html.resources.Resources;
+import org.jacoco.report.internal.html.table.Table;
/**
* Context and configuration information during creation of a HTML report.
diff --git a/org.jacoco.report/src/org/jacoco/report/html/NodePage.java b/org.jacoco.report/src/org/jacoco/report/html/NodePage.java
index f26b6d2..d5f7c26 100644
--- a/org.jacoco.report/src/org/jacoco/report/html/NodePage.java
+++ b/org.jacoco.report/src/org/jacoco/report/html/NodePage.java
@@ -17,8 +17,8 @@
import org.jacoco.report.IReportVisitor;
import org.jacoco.report.ISourceFileLocator;
import org.jacoco.report.ReportOutputFolder;
-import org.jacoco.report.html.resources.Resources;
-import org.jacoco.report.html.table.ITableItem;
+import org.jacoco.report.internal.html.resources.Resources;
+import org.jacoco.report.internal.html.table.ITableItem;
/**
* Report page that represents a coverage node.
diff --git a/org.jacoco.report/src/org/jacoco/report/html/PackagePage.java b/org.jacoco.report/src/org/jacoco/report/html/PackagePage.java
index 3bd0a1c..9183a9b 100644
--- a/org.jacoco.report/src/org/jacoco/report/html/PackagePage.java
+++ b/org.jacoco.report/src/org/jacoco/report/html/PackagePage.java
@@ -24,7 +24,7 @@
import org.jacoco.report.IReportVisitor;
import org.jacoco.report.ISourceFileLocator;
import org.jacoco.report.ReportOutputFolder;
-import org.jacoco.report.html.resources.Resources;
+import org.jacoco.report.internal.html.resources.Resources;
/**
* Page showing coverage information for a Java package. The page contains a
diff --git a/org.jacoco.report/src/org/jacoco/report/html/ReportPage.java b/org.jacoco.report/src/org/jacoco/report/html/ReportPage.java
index bd407c3..753481d 100644
--- a/org.jacoco.report/src/org/jacoco/report/html/ReportPage.java
+++ b/org.jacoco.report/src/org/jacoco/report/html/ReportPage.java
@@ -15,8 +15,8 @@
import org.jacoco.core.JaCoCo;
import org.jacoco.report.ReportOutputFolder;
-import org.jacoco.report.html.resources.Resources;
-import org.jacoco.report.html.resources.Styles;
+import org.jacoco.report.internal.html.resources.Resources;
+import org.jacoco.report.internal.html.resources.Styles;
/**
* Base class for HTML page generators. It renders the page skeleton with the
diff --git a/org.jacoco.report/src/org/jacoco/report/html/SessionsPage.java b/org.jacoco.report/src/org/jacoco/report/html/SessionsPage.java
index 09652d5..ed02e4e 100644
--- a/org.jacoco.report/src/org/jacoco/report/html/SessionsPage.java
+++ b/org.jacoco.report/src/org/jacoco/report/html/SessionsPage.java
@@ -24,8 +24,8 @@
import org.jacoco.core.data.SessionInfo;
import org.jacoco.report.ILanguageNames;
import org.jacoco.report.ReportOutputFolder;
-import org.jacoco.report.html.index.ElementIndex;
-import org.jacoco.report.html.resources.Styles;
+import org.jacoco.report.internal.html.index.ElementIndex;
+import org.jacoco.report.internal.html.resources.Styles;
/**
* Page to display information about sessions covered by this report.
diff --git a/org.jacoco.report/src/org/jacoco/report/html/SourceFilePage.java b/org.jacoco.report/src/org/jacoco/report/html/SourceFilePage.java
index 10afc28..1a49d29 100644
--- a/org.jacoco.report/src/org/jacoco/report/html/SourceFilePage.java
+++ b/org.jacoco.report/src/org/jacoco/report/html/SourceFilePage.java
@@ -20,7 +20,7 @@
import org.jacoco.report.IReportVisitor;
import org.jacoco.report.ISourceFileLocator;
import org.jacoco.report.ReportOutputFolder;
-import org.jacoco.report.html.resources.Resources;
+import org.jacoco.report.internal.html.resources.Resources;
/**
* Page showing the content of a source file with numbered and highlighted
diff --git a/org.jacoco.report/src/org/jacoco/report/html/SourceHighlighter.java b/org.jacoco.report/src/org/jacoco/report/html/SourceHighlighter.java
index 5818186..f501782 100644
--- a/org.jacoco.report/src/org/jacoco/report/html/SourceHighlighter.java
+++ b/org.jacoco.report/src/org/jacoco/report/html/SourceHighlighter.java
@@ -17,7 +17,7 @@
import java.util.Arrays;
import org.jacoco.core.analysis.ILines;
-import org.jacoco.report.html.resources.Styles;
+import org.jacoco.report.internal.html.resources.Styles;
/**
* Creates a highlighted output of a source file.
diff --git a/org.jacoco.report/src/org/jacoco/report/html/index/package.html b/org.jacoco.report/src/org/jacoco/report/html/index/package.html
deleted file mode 100644
index cf21dbf..0000000
--- a/org.jacoco.report/src/org/jacoco/report/html/index/package.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<body>
-
-<p>
- Index generation for HTML reports.
-</p>
-
-</body>
-</html>
diff --git a/org.jacoco.report/src/org/jacoco/report/html/package-info.java b/org.jacoco.report/src/org/jacoco/report/html/package-info.java
new file mode 100644
index 0000000..be64d34
--- /dev/null
+++ b/org.jacoco.report/src/org/jacoco/report/html/package-info.java
@@ -0,0 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Mountainminds GmbH & Co. KG and Contributors
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Marc R. Hoffmann - initial API and implementation
+ *
+ *******************************************************************************/
+
+/**
+ * HTML report implementation.
+ */
+package org.jacoco.report.html;
\ No newline at end of file
diff --git a/org.jacoco.report/src/org/jacoco/report/html/package.html b/org.jacoco.report/src/org/jacoco/report/html/package.html
deleted file mode 100644
index 19bed59..0000000
--- a/org.jacoco.report/src/org/jacoco/report/html/package.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<body>
-
-<p>
- HTML report implementation.
-</p>
-
-</body>
-</html>
diff --git a/org.jacoco.report/src/org/jacoco/report/html/table/package.html b/org.jacoco.report/src/org/jacoco/report/html/table/package.html
deleted file mode 100644
index ea1d9e2..0000000
--- a/org.jacoco.report/src/org/jacoco/report/html/table/package.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<body>
-
-<p>
- Sortable HTML table for coverage node elements.
-</p>
-
-</body>
-</html>
diff --git a/org.jacoco.report/src/org/jacoco/report/html/index/ElementIndex.java b/org.jacoco.report/src/org/jacoco/report/internal/html/index/ElementIndex.java
similarity index 97%
rename from org.jacoco.report/src/org/jacoco/report/html/index/ElementIndex.java
rename to org.jacoco.report/src/org/jacoco/report/internal/html/index/ElementIndex.java
index 25e2474..30bef68 100644
--- a/org.jacoco.report/src/org/jacoco/report/html/index/ElementIndex.java
+++ b/org.jacoco.report/src/org/jacoco/report/internal/html/index/ElementIndex.java
@@ -9,7 +9,7 @@
* Marc R. Hoffmann - initial API and implementation
*
*******************************************************************************/
-package org.jacoco.report.html.index;
+package org.jacoco.report.internal.html.index;
import java.util.HashMap;
import java.util.Map;
diff --git a/org.jacoco.report/src/org/jacoco/report/html/index/IIndexUpdate.java b/org.jacoco.report/src/org/jacoco/report/internal/html/index/IIndexUpdate.java
similarity index 95%
rename from org.jacoco.report/src/org/jacoco/report/html/index/IIndexUpdate.java
rename to org.jacoco.report/src/org/jacoco/report/internal/html/index/IIndexUpdate.java
index bf3f212..9a8d32e 100644
--- a/org.jacoco.report/src/org/jacoco/report/html/index/IIndexUpdate.java
+++ b/org.jacoco.report/src/org/jacoco/report/internal/html/index/IIndexUpdate.java
@@ -9,7 +9,7 @@
* Marc R. Hoffmann - initial API and implementation
*
*******************************************************************************/
-package org.jacoco.report.html.index;
+package org.jacoco.report.internal.html.index;
import org.jacoco.report.html.ILinkable;
diff --git a/org.jacoco.report/src/org/jacoco/report/internal/html/index/package-info.java b/org.jacoco.report/src/org/jacoco/report/internal/html/index/package-info.java
new file mode 100644
index 0000000..f565b41
--- /dev/null
+++ b/org.jacoco.report/src/org/jacoco/report/internal/html/index/package-info.java
@@ -0,0 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Mountainminds GmbH & Co. KG and Contributors
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Marc R. Hoffmann - initial API and implementation
+ *
+ *******************************************************************************/
+
+/**
+ * Internal: Index generation for HTML reports.
+ */
+package org.jacoco.report.internal.html.index;
\ No newline at end of file
diff --git a/org.jacoco.report/src/org/jacoco/report/html/resources/Resources.java b/org.jacoco.report/src/org/jacoco/report/internal/html/resources/Resources.java
similarity index 98%
rename from org.jacoco.report/src/org/jacoco/report/html/resources/Resources.java
rename to org.jacoco.report/src/org/jacoco/report/internal/html/resources/Resources.java
index a264ba2..e930079 100644
--- a/org.jacoco.report/src/org/jacoco/report/html/resources/Resources.java
+++ b/org.jacoco.report/src/org/jacoco/report/internal/html/resources/Resources.java
@@ -9,7 +9,7 @@
* Marc R. Hoffmann - initial API and implementation
*
*******************************************************************************/
-package org.jacoco.report.html.resources;
+package org.jacoco.report.internal.html.resources;
import java.io.IOException;
import java.io.InputStream;
diff --git a/org.jacoco.report/src/org/jacoco/report/html/resources/Styles.java b/org.jacoco.report/src/org/jacoco/report/internal/html/resources/Styles.java
similarity index 98%
rename from org.jacoco.report/src/org/jacoco/report/html/resources/Styles.java
rename to org.jacoco.report/src/org/jacoco/report/internal/html/resources/Styles.java
index 72462dd..92b6d2e 100644
--- a/org.jacoco.report/src/org/jacoco/report/html/resources/Styles.java
+++ b/org.jacoco.report/src/org/jacoco/report/internal/html/resources/Styles.java
@@ -9,7 +9,7 @@
* Marc R. Hoffmann - initial API and implementation
*
*******************************************************************************/
-package org.jacoco.report.html.resources;
+package org.jacoco.report.internal.html.resources;
/**
* Constants for styles defined by the report style sheet.
diff --git a/org.jacoco.report/src/org/jacoco/report/html/resources/bundle.gif b/org.jacoco.report/src/org/jacoco/report/internal/html/resources/bundle.gif
similarity index 100%
rename from org.jacoco.report/src/org/jacoco/report/html/resources/bundle.gif
rename to org.jacoco.report/src/org/jacoco/report/internal/html/resources/bundle.gif
Binary files differ
diff --git a/org.jacoco.report/src/org/jacoco/report/html/resources/class.gif b/org.jacoco.report/src/org/jacoco/report/internal/html/resources/class.gif
similarity index 100%
rename from org.jacoco.report/src/org/jacoco/report/html/resources/class.gif
rename to org.jacoco.report/src/org/jacoco/report/internal/html/resources/class.gif
Binary files differ
diff --git a/org.jacoco.report/src/org/jacoco/report/html/resources/down.gif b/org.jacoco.report/src/org/jacoco/report/internal/html/resources/down.gif
similarity index 100%
rename from org.jacoco.report/src/org/jacoco/report/html/resources/down.gif
rename to org.jacoco.report/src/org/jacoco/report/internal/html/resources/down.gif
Binary files differ
diff --git a/org.jacoco.report/src/org/jacoco/report/html/resources/greenbar.gif b/org.jacoco.report/src/org/jacoco/report/internal/html/resources/greenbar.gif
similarity index 100%
rename from org.jacoco.report/src/org/jacoco/report/html/resources/greenbar.gif
rename to org.jacoco.report/src/org/jacoco/report/internal/html/resources/greenbar.gif
Binary files differ
diff --git a/org.jacoco.report/src/org/jacoco/report/html/resources/group.gif b/org.jacoco.report/src/org/jacoco/report/internal/html/resources/group.gif
similarity index 100%
rename from org.jacoco.report/src/org/jacoco/report/html/resources/group.gif
rename to org.jacoco.report/src/org/jacoco/report/internal/html/resources/group.gif
Binary files differ
diff --git a/org.jacoco.report/src/org/jacoco/report/html/resources/method.gif b/org.jacoco.report/src/org/jacoco/report/internal/html/resources/method.gif
similarity index 100%
rename from org.jacoco.report/src/org/jacoco/report/html/resources/method.gif
rename to org.jacoco.report/src/org/jacoco/report/internal/html/resources/method.gif
Binary files differ
diff --git a/org.jacoco.report/src/org/jacoco/report/internal/html/resources/package-info.java b/org.jacoco.report/src/org/jacoco/report/internal/html/resources/package-info.java
new file mode 100644
index 0000000..65e2ea6
--- /dev/null
+++ b/org.jacoco.report/src/org/jacoco/report/internal/html/resources/package-info.java
@@ -0,0 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Mountainminds GmbH & Co. KG and Contributors
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Marc R. Hoffmann - initial API and implementation
+ *
+ *******************************************************************************/
+
+/**
+ * Internal: Resources for HTML reports.
+ */
+package org.jacoco.report.internal.html.resources;
\ No newline at end of file
diff --git a/org.jacoco.report/src/org/jacoco/report/html/resources/package.gif b/org.jacoco.report/src/org/jacoco/report/internal/html/resources/package.gif
similarity index 100%
rename from org.jacoco.report/src/org/jacoco/report/html/resources/package.gif
rename to org.jacoco.report/src/org/jacoco/report/internal/html/resources/package.gif
Binary files differ
diff --git a/org.jacoco.report/src/org/jacoco/report/html/resources/package.html b/org.jacoco.report/src/org/jacoco/report/internal/html/resources/package.html
similarity index 100%
rename from org.jacoco.report/src/org/jacoco/report/html/resources/package.html
rename to org.jacoco.report/src/org/jacoco/report/internal/html/resources/package.html
diff --git a/org.jacoco.report/src/org/jacoco/report/html/resources/prettify.css b/org.jacoco.report/src/org/jacoco/report/internal/html/resources/prettify.css
similarity index 100%
rename from org.jacoco.report/src/org/jacoco/report/html/resources/prettify.css
rename to org.jacoco.report/src/org/jacoco/report/internal/html/resources/prettify.css
diff --git a/org.jacoco.report/src/org/jacoco/report/html/resources/prettify.js b/org.jacoco.report/src/org/jacoco/report/internal/html/resources/prettify.js
similarity index 100%
rename from org.jacoco.report/src/org/jacoco/report/html/resources/prettify.js
rename to org.jacoco.report/src/org/jacoco/report/internal/html/resources/prettify.js
diff --git a/org.jacoco.report/src/org/jacoco/report/html/resources/redbar.gif b/org.jacoco.report/src/org/jacoco/report/internal/html/resources/redbar.gif
similarity index 100%
rename from org.jacoco.report/src/org/jacoco/report/html/resources/redbar.gif
rename to org.jacoco.report/src/org/jacoco/report/internal/html/resources/redbar.gif
Binary files differ
diff --git a/org.jacoco.report/src/org/jacoco/report/html/resources/report.css b/org.jacoco.report/src/org/jacoco/report/internal/html/resources/report.css
similarity index 100%
rename from org.jacoco.report/src/org/jacoco/report/html/resources/report.css
rename to org.jacoco.report/src/org/jacoco/report/internal/html/resources/report.css
diff --git a/org.jacoco.report/src/org/jacoco/report/html/resources/report.gif b/org.jacoco.report/src/org/jacoco/report/internal/html/resources/report.gif
similarity index 100%
rename from org.jacoco.report/src/org/jacoco/report/html/resources/report.gif
rename to org.jacoco.report/src/org/jacoco/report/internal/html/resources/report.gif
Binary files differ
diff --git a/org.jacoco.report/src/org/jacoco/report/html/resources/session.gif b/org.jacoco.report/src/org/jacoco/report/internal/html/resources/session.gif
similarity index 100%
rename from org.jacoco.report/src/org/jacoco/report/html/resources/session.gif
rename to org.jacoco.report/src/org/jacoco/report/internal/html/resources/session.gif
Binary files differ
diff --git a/org.jacoco.report/src/org/jacoco/report/html/resources/sort.gif b/org.jacoco.report/src/org/jacoco/report/internal/html/resources/sort.gif
similarity index 100%
rename from org.jacoco.report/src/org/jacoco/report/html/resources/sort.gif
rename to org.jacoco.report/src/org/jacoco/report/internal/html/resources/sort.gif
Binary files differ
diff --git a/org.jacoco.report/src/org/jacoco/report/html/resources/sort.js b/org.jacoco.report/src/org/jacoco/report/internal/html/resources/sort.js
similarity index 100%
rename from org.jacoco.report/src/org/jacoco/report/html/resources/sort.js
rename to org.jacoco.report/src/org/jacoco/report/internal/html/resources/sort.js
diff --git a/org.jacoco.report/src/org/jacoco/report/html/resources/source.gif b/org.jacoco.report/src/org/jacoco/report/internal/html/resources/source.gif
similarity index 100%
rename from org.jacoco.report/src/org/jacoco/report/html/resources/source.gif
rename to org.jacoco.report/src/org/jacoco/report/internal/html/resources/source.gif
Binary files differ
diff --git a/org.jacoco.report/src/org/jacoco/report/html/resources/up.gif b/org.jacoco.report/src/org/jacoco/report/internal/html/resources/up.gif
similarity index 100%
rename from org.jacoco.report/src/org/jacoco/report/html/resources/up.gif
rename to org.jacoco.report/src/org/jacoco/report/internal/html/resources/up.gif
Binary files differ
diff --git a/org.jacoco.report/src/org/jacoco/report/html/table/BarColumn.java b/org.jacoco.report/src/org/jacoco/report/internal/html/table/BarColumn.java
similarity index 96%
rename from org.jacoco.report/src/org/jacoco/report/html/table/BarColumn.java
rename to org.jacoco.report/src/org/jacoco/report/internal/html/table/BarColumn.java
index e73a6b9..abb89e8 100644
--- a/org.jacoco.report/src/org/jacoco/report/html/table/BarColumn.java
+++ b/org.jacoco.report/src/org/jacoco/report/internal/html/table/BarColumn.java
@@ -9,7 +9,7 @@
* Marc R. Hoffmann - initial API and implementation
*
*******************************************************************************/
-package org.jacoco.report.html.table;
+package org.jacoco.report.internal.html.table;
import java.io.IOException;
import java.text.DecimalFormat;
@@ -24,7 +24,7 @@
import org.jacoco.core.analysis.ICoverageNode.CounterEntity;
import org.jacoco.report.ReportOutputFolder;
import org.jacoco.report.html.HTMLElement;
-import org.jacoco.report.html.resources.Resources;
+import org.jacoco.report.internal.html.resources.Resources;
/**
* Column with a graphical bar that represents the total amount of items in with
diff --git a/org.jacoco.report/src/org/jacoco/report/html/table/CounterColumn.java b/org.jacoco.report/src/org/jacoco/report/internal/html/table/CounterColumn.java
similarity index 97%
rename from org.jacoco.report/src/org/jacoco/report/html/table/CounterColumn.java
rename to org.jacoco.report/src/org/jacoco/report/internal/html/table/CounterColumn.java
index 67c6310..3f0e291 100644
--- a/org.jacoco.report/src/org/jacoco/report/html/table/CounterColumn.java
+++ b/org.jacoco.report/src/org/jacoco/report/internal/html/table/CounterColumn.java
@@ -9,7 +9,7 @@
* Marc R. Hoffmann - initial API and implementation
*
*******************************************************************************/
-package org.jacoco.report.html.table;
+package org.jacoco.report.internal.html.table;
import java.io.IOException;
import java.text.DecimalFormat;
@@ -24,7 +24,7 @@
import org.jacoco.core.analysis.ICoverageNode.CounterEntity;
import org.jacoco.report.ReportOutputFolder;
import org.jacoco.report.html.HTMLElement;
-import org.jacoco.report.html.resources.Resources;
+import org.jacoco.report.internal.html.resources.Resources;
/**
* Column that prints the counter values of entities for each item and a summary
diff --git a/org.jacoco.report/src/org/jacoco/report/html/table/IColumnRenderer.java b/org.jacoco.report/src/org/jacoco/report/internal/html/table/IColumnRenderer.java
similarity index 95%
rename from org.jacoco.report/src/org/jacoco/report/html/table/IColumnRenderer.java
rename to org.jacoco.report/src/org/jacoco/report/internal/html/table/IColumnRenderer.java
index 8ba8cf3..34db715 100644
--- a/org.jacoco.report/src/org/jacoco/report/html/table/IColumnRenderer.java
+++ b/org.jacoco.report/src/org/jacoco/report/internal/html/table/IColumnRenderer.java
@@ -9,7 +9,7 @@
* Marc R. Hoffmann - initial API and implementation
*
*******************************************************************************/
-package org.jacoco.report.html.table;
+package org.jacoco.report.internal.html.table;
import java.io.IOException;
import java.util.Comparator;
@@ -18,7 +18,7 @@
import org.jacoco.core.analysis.ICoverageNode;
import org.jacoco.report.ReportOutputFolder;
import org.jacoco.report.html.HTMLElement;
-import org.jacoco.report.html.resources.Resources;
+import org.jacoco.report.internal.html.resources.Resources;
/**
* Renderer for a single column of a coverage table. The methods are always
diff --git a/org.jacoco.report/src/org/jacoco/report/html/table/ITableItem.java b/org.jacoco.report/src/org/jacoco/report/internal/html/table/ITableItem.java
similarity index 95%
rename from org.jacoco.report/src/org/jacoco/report/html/table/ITableItem.java
rename to org.jacoco.report/src/org/jacoco/report/internal/html/table/ITableItem.java
index 4779614..d5fe2ff 100644
--- a/org.jacoco.report/src/org/jacoco/report/html/table/ITableItem.java
+++ b/org.jacoco.report/src/org/jacoco/report/internal/html/table/ITableItem.java
@@ -9,7 +9,7 @@
* Marc R. Hoffmann - initial API and implementation
*
*******************************************************************************/
-package org.jacoco.report.html.table;
+package org.jacoco.report.internal.html.table;
import org.jacoco.core.analysis.ICoverageNode;
import org.jacoco.report.html.ILinkable;
diff --git a/org.jacoco.report/src/org/jacoco/report/html/table/LabelColumn.java b/org.jacoco.report/src/org/jacoco/report/internal/html/table/LabelColumn.java
similarity index 94%
rename from org.jacoco.report/src/org/jacoco/report/html/table/LabelColumn.java
rename to org.jacoco.report/src/org/jacoco/report/internal/html/table/LabelColumn.java
index 904e0f2..113a430 100644
--- a/org.jacoco.report/src/org/jacoco/report/html/table/LabelColumn.java
+++ b/org.jacoco.report/src/org/jacoco/report/internal/html/table/LabelColumn.java
@@ -9,7 +9,7 @@
* Marc R. Hoffmann - initial API and implementation
*
*******************************************************************************/
-package org.jacoco.report.html.table;
+package org.jacoco.report.internal.html.table;
import java.io.IOException;
import java.util.Comparator;
@@ -18,7 +18,7 @@
import org.jacoco.core.analysis.ICoverageNode;
import org.jacoco.report.ReportOutputFolder;
import org.jacoco.report.html.HTMLElement;
-import org.jacoco.report.html.resources.Resources;
+import org.jacoco.report.internal.html.resources.Resources;
/**
* Column for the item label. The implementation is stateless, instances might
diff --git a/org.jacoco.report/src/org/jacoco/report/html/table/PercentageColumn.java b/org.jacoco.report/src/org/jacoco/report/internal/html/table/PercentageColumn.java
similarity index 96%
rename from org.jacoco.report/src/org/jacoco/report/html/table/PercentageColumn.java
rename to org.jacoco.report/src/org/jacoco/report/internal/html/table/PercentageColumn.java
index bfcb3b4..578685c 100644
--- a/org.jacoco.report/src/org/jacoco/report/html/table/PercentageColumn.java
+++ b/org.jacoco.report/src/org/jacoco/report/internal/html/table/PercentageColumn.java
@@ -9,7 +9,7 @@
* Marc R. Hoffmann - initial API and implementation
*
*******************************************************************************/
-package org.jacoco.report.html.table;
+package org.jacoco.report.internal.html.table;
import java.io.IOException;
import java.text.DecimalFormat;
@@ -24,7 +24,7 @@
import org.jacoco.core.analysis.ICoverageNode.CounterEntity;
import org.jacoco.report.ReportOutputFolder;
import org.jacoco.report.html.HTMLElement;
-import org.jacoco.report.html.resources.Resources;
+import org.jacoco.report.internal.html.resources.Resources;
/**
* Column that prints the coverage percentage for each item and the total
diff --git a/org.jacoco.report/src/org/jacoco/report/html/table/SortIndex.java b/org.jacoco.report/src/org/jacoco/report/internal/html/table/SortIndex.java
similarity index 97%
rename from org.jacoco.report/src/org/jacoco/report/html/table/SortIndex.java
rename to org.jacoco.report/src/org/jacoco/report/internal/html/table/SortIndex.java
index 6b7e87a..8332617 100644
--- a/org.jacoco.report/src/org/jacoco/report/html/table/SortIndex.java
+++ b/org.jacoco.report/src/org/jacoco/report/internal/html/table/SortIndex.java
@@ -9,7 +9,7 @@
* Marc R. Hoffmann - initial API and implementation
*
*******************************************************************************/
-package org.jacoco.report.html.table;
+package org.jacoco.report.internal.html.table;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/org.jacoco.report/src/org/jacoco/report/html/table/Table.java b/org.jacoco.report/src/org/jacoco/report/internal/html/table/Table.java
similarity index 97%
rename from org.jacoco.report/src/org/jacoco/report/html/table/Table.java
rename to org.jacoco.report/src/org/jacoco/report/internal/html/table/Table.java
index 92eeae0..35bfc63 100644
--- a/org.jacoco.report/src/org/jacoco/report/html/table/Table.java
+++ b/org.jacoco.report/src/org/jacoco/report/internal/html/table/Table.java
@@ -9,7 +9,7 @@
* Marc R. Hoffmann - initial API and implementation
*
*******************************************************************************/
-package org.jacoco.report.html.table;
+package org.jacoco.report.internal.html.table;
import java.io.IOException;
import java.util.ArrayList;
@@ -20,8 +20,8 @@
import org.jacoco.core.analysis.ICoverageNode;
import org.jacoco.report.ReportOutputFolder;
import org.jacoco.report.html.HTMLElement;
-import org.jacoco.report.html.resources.Resources;
-import org.jacoco.report.html.resources.Styles;
+import org.jacoco.report.internal.html.resources.Resources;
+import org.jacoco.report.internal.html.resources.Styles;
/**
* Renderer for a table of {@link ITableItem}s.
diff --git a/org.jacoco.report/src/org/jacoco/report/html/table/TableItemComparator.java b/org.jacoco.report/src/org/jacoco/report/internal/html/table/TableItemComparator.java
similarity index 95%
rename from org.jacoco.report/src/org/jacoco/report/html/table/TableItemComparator.java
rename to org.jacoco.report/src/org/jacoco/report/internal/html/table/TableItemComparator.java
index 3ea0992..c961d2f 100644
--- a/org.jacoco.report/src/org/jacoco/report/html/table/TableItemComparator.java
+++ b/org.jacoco.report/src/org/jacoco/report/internal/html/table/TableItemComparator.java
@@ -9,7 +9,7 @@
* Marc R. Hoffmann - initial API and implementation
*
*******************************************************************************/
-package org.jacoco.report.html.table;
+package org.jacoco.report.internal.html.table;
import java.util.Comparator;
diff --git a/org.jacoco.report/src/org/jacoco/report/internal/html/table/package-info.java b/org.jacoco.report/src/org/jacoco/report/internal/html/table/package-info.java
new file mode 100644
index 0000000..16c6da8
--- /dev/null
+++ b/org.jacoco.report/src/org/jacoco/report/internal/html/table/package-info.java
@@ -0,0 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Mountainminds GmbH & Co. KG and Contributors
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Marc R. Hoffmann - initial API and implementation
+ *
+ *******************************************************************************/
+
+/**
+ * Internal: Sortable HTML table for coverage node elements.
+ */
+package org.jacoco.report.internal.html.table;
\ No newline at end of file
diff --git a/org.jacoco.report/src/org/jacoco/report/package-info.java b/org.jacoco.report/src/org/jacoco/report/package-info.java
new file mode 100644
index 0000000..338b2bb
--- /dev/null
+++ b/org.jacoco.report/src/org/jacoco/report/package-info.java
@@ -0,0 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Mountainminds GmbH & Co. KG and Contributors
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Marc R. Hoffmann - initial API and implementation
+ *
+ *******************************************************************************/
+
+/**
+ * Common interfaces and utilities for report generation.
+ */
+package org.jacoco.report;
\ No newline at end of file
diff --git a/org.jacoco.report/src/org/jacoco/report/package.html b/org.jacoco.report/src/org/jacoco/report/package.html
deleted file mode 100644
index 75dba50..0000000
--- a/org.jacoco.report/src/org/jacoco/report/package.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<body>
-
-<p>
- Common interfaces and utilities for report generation.
-</p>
-
-</body>
-</html>
diff --git a/org.jacoco.report/src/org/jacoco/report/xml/package-info.java b/org.jacoco.report/src/org/jacoco/report/xml/package-info.java
new file mode 100644
index 0000000..3af818e
--- /dev/null
+++ b/org.jacoco.report/src/org/jacoco/report/xml/package-info.java
@@ -0,0 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 Mountainminds GmbH & Co. KG and Contributors
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Brock Janiczak - initial API and implementation
+ *
+ *******************************************************************************/
+
+/**
+ * XML report implementation.
+ */
+package org.jacoco.report.xml;
\ No newline at end of file
diff --git a/org.jacoco.report/src/org/jacoco/report/xml/package.html b/org.jacoco.report/src/org/jacoco/report/xml/package.html
deleted file mode 100644
index b0b8d69..0000000
--- a/org.jacoco.report/src/org/jacoco/report/xml/package.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<body>
-
-<p>
- XML report implementation.
-</p>
-
-</body>
-</html>
