Remove redundant modifiers in interfaces (#768)

17 files changed, 55 insertions, 56 deletions

diff --git a/org.jacoco.core/src/org/jacoco/core/analysis/IBundleCoverage.java b/org.jacoco.core/src/org/jacoco/core/analysis/IBundleCoverage.java
index afcdc1aa..c678ff46 100644
--- a/org.jacoco.core/src/org/jacoco/core/analysis/IBundleCoverage.java
+++ b/org.jacoco.core/src/org/jacoco/core/analysis/IBundleCoverage.java
@@ -25,6 +25,6 @@ public interface IBundleCoverage extends ICoverageNode {
 	 * 
 	 * @return all packages
 	 */
-	public Collection<IPackageCoverage> getPackages();
+	Collection<IPackageCoverage> getPackages();
 
 }
\ No newline at end of file
diff --git a/org.jacoco.core/src/org/jacoco/core/analysis/IClassCoverage.java b/org.jacoco.core/src/org/jacoco/core/analysis/IClassCoverage.java
index f72b7a85..45db04a2 100644
--- a/org.jacoco.core/src/org/jacoco/core/analysis/IClassCoverage.java
+++ b/org.jacoco.core/src/org/jacoco/core/analysis/IClassCoverage.java
@@ -27,7 +27,7 @@ public interface IClassCoverage extends ISourceNode {
 	 * 
 	 * @return class identifier
 	 */
-	public long getId();
+	long getId();
 
 	/**
 	 * Returns if the the analyzed class does match the execution data provided.
@@ -37,14 +37,14 @@ public interface IClassCoverage extends ISourceNode {
 	 * @return <code>true</code> if this class does not match to the provided
 	 *         execution data.
 	 */
-	public boolean isNoMatch();
+	boolean isNoMatch();
 
 	/**
 	 * Returns the VM signature of the class.
 	 * 
 	 * @return VM signature of the class (may be <code>null</code>)
 	 */
-	public String getSignature();
+	String getSignature();
 
 	/**
 	 * Returns the VM name of the superclass.
@@ -52,34 +52,34 @@ public interface IClassCoverage extends ISourceNode {
 	 * @return VM name of the super class (may be <code>null</code>, i.e.
 	 *         <code>java/lang/Object</code>)
 	 */
-	public String getSuperName();
+	String getSuperName();
 
 	/**
 	 * Returns the VM names of implemented/extended interfaces.
 	 * 
 	 * @return VM names of implemented/extended interfaces
 	 */
-	public String[] getInterfaceNames();
+	String[] getInterfaceNames();
 
 	/**
 	 * Returns the VM name of the package this class belongs to.
 	 * 
 	 * @return VM name of the package
 	 */
-	public String getPackageName();
+	String getPackageName();
 
 	/**
 	 * Returns the optional name of the corresponding source file.
 	 * 
 	 * @return name of the corresponding source file
 	 */
-	public String getSourceFileName();
+	String getSourceFileName();
 
 	/**
 	 * Returns the methods included in this class.
 	 * 
 	 * @return methods of this class
 	 */
-	public Collection<IMethodCoverage> getMethods();
+	Collection<IMethodCoverage> getMethods();
 
 }
\ No newline at end of file
diff --git a/org.jacoco.core/src/org/jacoco/core/analysis/ICounter.java b/org.jacoco.core/src/org/jacoco/core/analysis/ICounter.java
index 5f30e02b..6124e281 100644
--- a/org.jacoco.core/src/org/jacoco/core/analysis/ICounter.java
+++ b/org.jacoco.core/src/org/jacoco/core/analysis/ICounter.java
@@ -20,7 +20,7 @@ public interface ICounter {
 	/**
 	 * Different values provided by a counter.
 	 */
-	public enum CounterValue {
+	enum CounterValue {
 
 		/** Total number of items */
 		TOTALCOUNT,
@@ -41,22 +41,22 @@ public interface ICounter {
 	/**
 	 * Status flag for no items (value is 0x00).
 	 */
-	public static final int EMPTY = 0x00;
+	int EMPTY = 0x00;
 
 	/**
 	 * Status flag when all items are not covered (value is 0x01).
 	 */
-	public static final int NOT_COVERED = 0x01;
+	int NOT_COVERED = 0x01;
 
 	/**
 	 * Status flag when all items are covered (value is 0x02).
 	 */
-	public static final int FULLY_COVERED = 0x02;
+	int FULLY_COVERED = 0x02;
 
 	/**
 	 * Status flag when items are partly covered (value is 0x03).
 	 */
-	public static final int PARTLY_COVERED = NOT_COVERED | FULLY_COVERED;
+	int PARTLY_COVERED = NOT_COVERED | FULLY_COVERED;
 
 	/**
 	 * Returns the counter value of the given type.
@@ -65,28 +65,28 @@ public interface ICounter {
 	 *            value type to return
 	 * @return counter value
 	 */
-	public double getValue(CounterValue value);
+	double getValue(CounterValue value);
 
 	/**
 	 * Returns the total count of items.
 	 * 
 	 * @return total count of items
 	 */
-	public int getTotalCount();
+	int getTotalCount();
 
 	/**
 	 * Returns the count of covered items.
 	 * 
 	 * @return count of covered items
 	 */
-	public int getCoveredCount();
+	int getCoveredCount();
 
 	/**
 	 * Returns the count of missed items.
 	 * 
 	 * @return count of missed items
 	 */
-	public int getMissedCount();
+	int getMissedCount();
 
 	/**
 	 * Calculates the ratio of covered to total count items. If total count
@@ -94,7 +94,7 @@ public interface ICounter {
 	 * 
 	 * @return ratio of covered to total count items
 	 */
-	public double getCoveredRatio();
+	double getCoveredRatio();
 
 	/**
 	 * Calculates the ratio of missed to total count items. If total count items
@@ -102,7 +102,7 @@ public interface ICounter {
 	 * 
 	 * @return ratio of missed to total count items
 	 */
-	public double getMissedRatio();
+	double getMissedRatio();
 
 	/**
 	 * Returns the coverage status of this counter.
@@ -114,6 +114,6 @@ public interface ICounter {
 	 * 
 	 * @return status of this line
 	 */
-	public int getStatus();
+	int getStatus();
 
 }
diff --git a/org.jacoco.core/src/org/jacoco/core/analysis/ICoverageNode.java b/org.jacoco.core/src/org/jacoco/core/analysis/ICoverageNode.java
index 0756f410..f7605278 100644
--- a/org.jacoco.core/src/org/jacoco/core/analysis/ICoverageNode.java
+++ b/org.jacoco.core/src/org/jacoco/core/analysis/ICoverageNode.java
@@ -20,7 +20,7 @@ public interface ICoverageNode {
 	/**
 	 * Type of a Java element represented by a {@link ICoverageNode} instance.
 	 */
-	public enum ElementType {
+	enum ElementType {
 
 		/** Method */
 		METHOD,
@@ -45,7 +45,7 @@ public interface ICoverageNode {
 	/**
 	 * Different counter types supported by JaCoCo.
 	 */
-	public enum CounterEntity {
+	enum CounterEntity {
 
 		/** Counter for instructions */
 		INSTRUCTION,
@@ -71,56 +71,56 @@ public interface ICoverageNode {
 	 * 
 	 * @return type of this node
 	 */
-	public abstract ElementType getElementType();
+	ElementType getElementType();
 
 	/**
 	 * Returns the name of this node.
 	 * 
 	 * @return name of this node
 	 */
-	public String getName();
+	String getName();
 
 	/**
 	 * Returns the counter for byte code instructions.
 	 * 
 	 * @return counter for instructions
 	 */
-	public abstract ICounter getInstructionCounter();
+	ICounter getInstructionCounter();
 
 	/**
 	 * Returns the counter for branches.
 	 * 
 	 * @return counter for branches
 	 */
-	public ICounter getBranchCounter();
+	ICounter getBranchCounter();
 
 	/**
 	 * Returns the counter for lines.
 	 * 
 	 * @return counter for lines
 	 */
-	public ICounter getLineCounter();
+	ICounter getLineCounter();
 
 	/**
 	 * Returns the counter for cyclomatic complexity.
 	 * 
 	 * @return counter for complexity
 	 */
-	public ICounter getComplexityCounter();
+	ICounter getComplexityCounter();
 
 	/**
 	 * Returns the counter for methods.
 	 * 
 	 * @return counter for methods
 	 */
-	public ICounter getMethodCounter();
+	ICounter getMethodCounter();
 
 	/**
 	 * Returns the counter for classes.
 	 * 
 	 * @return counter for classes
 	 */
-	public ICounter getClassCounter();
+	ICounter getClassCounter();
 
 	/**
 	 * Generic access to the the counters.
@@ -129,7 +129,7 @@ public interface ICoverageNode {
 	 *            entity we're we want to have the counter for
 	 * @return counter for the given entity
 	 */
-	public ICounter getCounter(CounterEntity entity);
+	ICounter getCounter(CounterEntity entity);
 
 	/**
 	 * Creates a plain copy of this node. While {@link ICoverageNode}
@@ -139,6 +139,6 @@ public interface ICoverageNode {
 	 * 
 	 * @return copy with counters only
 	 */
-	public ICoverageNode getPlainCopy();
+	ICoverageNode getPlainCopy();
 
 }
\ No newline at end of file
diff --git a/org.jacoco.core/src/org/jacoco/core/analysis/ICoverageVisitor.java b/org.jacoco.core/src/org/jacoco/core/analysis/ICoverageVisitor.java
index 5a71859f..e516f858 100644
--- a/org.jacoco.core/src/org/jacoco/core/analysis/ICoverageVisitor.java
+++ b/org.jacoco.core/src/org/jacoco/core/analysis/ICoverageVisitor.java
@@ -23,6 +23,6 @@ public interface ICoverageVisitor {
 	 * @param coverage
 	 *            coverage data for a class
 	 */
-	public void visitCoverage(IClassCoverage coverage);
+	void visitCoverage(IClassCoverage coverage);
 
 }
diff --git a/org.jacoco.core/src/org/jacoco/core/analysis/ILine.java b/org.jacoco.core/src/org/jacoco/core/analysis/ILine.java
index cdd91eba..1728aa39 100644
--- a/org.jacoco.core/src/org/jacoco/core/analysis/ILine.java
+++ b/org.jacoco.core/src/org/jacoco/core/analysis/ILine.java
@@ -22,14 +22,14 @@ public interface ILine {
 	 * 
 	 * @return instruction counter
 	 */
-	public ICounter getInstructionCounter();
+	ICounter getInstructionCounter();
 
 	/**
 	 * Returns the branches counter for this line.
 	 * 
 	 * @return branches counter
 	 */
-	public ICounter getBranchCounter();
+	ICounter getBranchCounter();
 
 	/**
 	 * Returns the coverage status of this line, calculated from the
@@ -42,6 +42,6 @@ public interface ILine {
 	 * 
 	 * @return status of this line
 	 */
-	public int getStatus();
+	int getStatus();
 
 }
diff --git a/org.jacoco.core/src/org/jacoco/core/analysis/IMethodCoverage.java b/org.jacoco.core/src/org/jacoco/core/analysis/IMethodCoverage.java
index 3bd75169..5442f987 100644
--- a/org.jacoco.core/src/org/jacoco/core/analysis/IMethodCoverage.java
+++ b/org.jacoco.core/src/org/jacoco/core/analysis/IMethodCoverage.java
@@ -22,13 +22,13 @@ public interface IMethodCoverage extends ISourceNode {
 	 * 
 	 * @return descriptor
 	 */
-	public String getDesc();
+	String getDesc();
 
 	/**
 	 * Returns the generic signature of the method if defined.
 	 * 
 	 * @return generic signature or <code>null</code>
 	 */
-	public String getSignature();
+	String getSignature();
 
 }
\ No newline at end of file
diff --git a/org.jacoco.core/src/org/jacoco/core/analysis/IPackageCoverage.java b/org.jacoco.core/src/org/jacoco/core/analysis/IPackageCoverage.java
index 8ff1a184..759e3672 100644
--- a/org.jacoco.core/src/org/jacoco/core/analysis/IPackageCoverage.java
+++ b/org.jacoco.core/src/org/jacoco/core/analysis/IPackageCoverage.java
@@ -28,13 +28,13 @@ public interface IPackageCoverage extends ICoverageNode {
 	 * 
 	 * @return all classes
 	 */
-	public Collection<IClassCoverage> getClasses();
+	Collection<IClassCoverage> getClasses();
 
 	/**
 	 * Returns all source files in this package.
 	 * 
 	 * @return all source files
 	 */
-	public Collection<ISourceFileCoverage> getSourceFiles();
+	Collection<ISourceFileCoverage> getSourceFiles();
 
 }
\ No newline at end of file
diff --git a/org.jacoco.core/src/org/jacoco/core/analysis/ISourceFileCoverage.java b/org.jacoco.core/src/org/jacoco/core/analysis/ISourceFileCoverage.java
index 6a49490b..9aa98aba 100644
--- a/org.jacoco.core/src/org/jacoco/core/analysis/ISourceFileCoverage.java
+++ b/org.jacoco.core/src/org/jacoco/core/analysis/ISourceFileCoverage.java
@@ -22,6 +22,6 @@ public interface ISourceFileCoverage extends ISourceNode {
 	 * 
 	 * @return package name
 	 */
-	public String getPackageName();
+	String getPackageName();
 
 }
\ No newline at end of file
diff --git a/org.jacoco.core/src/org/jacoco/core/analysis/ISourceNode.java b/org.jacoco.core/src/org/jacoco/core/analysis/ISourceNode.java
index d6c90e5a..2deb23f6 100644
--- a/org.jacoco.core/src/org/jacoco/core/analysis/ISourceNode.java
+++ b/org.jacoco.core/src/org/jacoco/core/analysis/ISourceNode.java
@@ -18,7 +18,7 @@ package org.jacoco.core.analysis;
 public interface ISourceNode extends ICoverageNode {
 
 	/** Place holder for unknown lines (no debug information) */
-	public static int UNKNOWN_LINE = -1;
+	int UNKNOWN_LINE = -1;
 
 	/**
 	 * The number of the first line coverage information is available for. If no
@@ -26,7 +26,7 @@ public interface ISourceNode extends ICoverageNode {
 	 * 
 	 * @return number of the first line or {@link #UNKNOWN_LINE}
 	 */
-	public int getFirstLine();
+	int getFirstLine();
 
 	/**
 	 * The number of the last line coverage information is available for. If no
@@ -34,7 +34,7 @@ public interface ISourceNode extends ICoverageNode {
 	 * 
 	 * @return number of the last line or {@link #UNKNOWN_LINE}
 	 */
-	public int getLastLine();
+	int getLastLine();
 
 	/**
 	 * Returns the line information for given line.
@@ -43,6 +43,6 @@ public interface ISourceNode extends ICoverageNode {
 	 *            line number of interest
 	 * @return line information
 	 */
-	public ILine getLine(int nr);
+	ILine getLine(int nr);
 
 }
diff --git a/org.jacoco.core/src/org/jacoco/core/data/IExecutionDataVisitor.java b/org.jacoco.core/src/org/jacoco/core/data/IExecutionDataVisitor.java
index b2bccd6c..1499c337 100644
--- a/org.jacoco.core/src/org/jacoco/core/data/IExecutionDataVisitor.java
+++ b/org.jacoco.core/src/org/jacoco/core/data/IExecutionDataVisitor.java
@@ -24,6 +24,6 @@ public interface IExecutionDataVisitor {
 	 * @param data
 	 *            execution data for a class
 	 */
-	public void visitClassExecution(ExecutionData data);
+	void visitClassExecution(ExecutionData data);
 
 }
diff --git a/org.jacoco.core/src/org/jacoco/core/data/ISessionInfoVisitor.java b/org.jacoco.core/src/org/jacoco/core/data/ISessionInfoVisitor.java
index 23e7711d..38799057 100644
--- a/org.jacoco.core/src/org/jacoco/core/data/ISessionInfoVisitor.java
+++ b/org.jacoco.core/src/org/jacoco/core/data/ISessionInfoVisitor.java
@@ -25,6 +25,6 @@ public interface ISessionInfoVisitor {
 	 * @param info
 	 *            session information
 	 */
-	public void visitSessionInfo(final SessionInfo info);
+	void visitSessionInfo(SessionInfo info);
 
 }
diff --git a/org.jacoco.core/src/org/jacoco/core/internal/flow/IFrame.java b/org.jacoco.core/src/org/jacoco/core/internal/flow/IFrame.java
index 09e99064..80ac5fcf 100644
--- a/org.jacoco.core/src/org/jacoco/core/internal/flow/IFrame.java
+++ b/org.jacoco.core/src/org/jacoco/core/internal/flow/IFrame.java
@@ -24,6 +24,6 @@ public interface IFrame {
 	 * @param mv
 	 *            method visitor to emit frame event to
 	 */
-	void accept(final MethodVisitor mv);
+	void accept(MethodVisitor mv);
 
 }
diff --git a/org.jacoco.core/src/org/jacoco/core/internal/instr/IProbeInserter.java b/org.jacoco.core/src/org/jacoco/core/internal/instr/IProbeInserter.java
index e6c8dc59..e50b2915 100644
--- a/org.jacoco.core/src/org/jacoco/core/internal/instr/IProbeInserter.java
+++ b/org.jacoco.core/src/org/jacoco/core/internal/instr/IProbeInserter.java
@@ -23,6 +23,6 @@ interface IProbeInserter {
 	 * @param id
 	 *            id of the probe to insert
 	 */
-	public void insertProbe(final int id);
+	void insertProbe(int id);
 
 }
diff --git a/org.jacoco.core/src/org/jacoco/core/runtime/IExecutionDataAccessorGenerator.java b/org.jacoco.core/src/org/jacoco/core/runtime/IExecutionDataAccessorGenerator.java
index 00783121..852f8aa1 100644
--- a/org.jacoco.core/src/org/jacoco/core/runtime/IExecutionDataAccessorGenerator.java
+++ b/org.jacoco.core/src/org/jacoco/core/runtime/IExecutionDataAccessorGenerator.java
@@ -45,7 +45,7 @@ public interface IExecutionDataAccessorGenerator {
 	 * @return additional stack size required by the implementation, including
 	 *         the instance pushed to the stack
 	 */
-	public int generateDataAccessor(final long classid, final String classname,
-			final int probecount, MethodVisitor mv);
+	int generateDataAccessor(long classid, String classname, int probecount,
+			MethodVisitor mv);
 
 }
diff --git a/org.jacoco.core/src/org/jacoco/core/runtime/IRemoteCommandVisitor.java b/org.jacoco.core/src/org/jacoco/core/runtime/IRemoteCommandVisitor.java
index c4b12f1c..c50f992a 100644
--- a/org.jacoco.core/src/org/jacoco/core/runtime/IRemoteCommandVisitor.java
+++ b/org.jacoco.core/src/org/jacoco/core/runtime/IRemoteCommandVisitor.java
@@ -28,7 +28,6 @@ public interface IRemoteCommandVisitor {
 	 * @throws IOException
 	 *             in case of problems with the remote connection
 	 */
-	public void visitDumpCommand(final boolean dump, final boolean reset)
-			throws IOException;
+	void visitDumpCommand(boolean dump, boolean reset) throws IOException;
 
 }
diff --git a/org.jacoco.core/src/org/jacoco/core/runtime/IRuntime.java b/org.jacoco.core/src/org/jacoco/core/runtime/IRuntime.java
index 9eee8fba..adeba569 100644
--- a/org.jacoco.core/src/org/jacoco/core/runtime/IRuntime.java
+++ b/org.jacoco.core/src/org/jacoco/core/runtime/IRuntime.java
@@ -26,12 +26,12 @@ public interface IRuntime extends IExecutionDataAccessorGenerator {
 	 * @throws Exception
 	 *             any internal problem during startup
 	 */
-	public void startup(RuntimeData data) throws Exception;
+	void startup(RuntimeData data) throws Exception;
 
 	/**
 	 * Allows the coverage runtime to cleanup internals. This class should be
 	 * called when classes instrumented for this runtime are not used any more.
 	 */
-	public void shutdown();
+	void shutdown();
 
 }