Merge pull request #47 from nicksavers/master

Support for Coveralls (code coverage)

.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

.travis.yml

@@ -1 +1,4 @@
 language: java
+
+after_success:
+  - mvn clean antlr4:antlr4 cobertura:cobertura coveralls:cobertura

README.md

@@ -1,5 +1,5 @@
-# Ethereum Java Implementation [![Build Status](https://travis-ci.org/ethereum/ethereumj.svg?branch=master)](https://travis-ci.org/ethereum/ethereumj)
+# Ethereum Java Implementation 
-
+[![Build Status](https://travis-ci.org/ethereum/ethereumj.svg?branch=master)](https://travis-ci.org/ethereum/ethereumj) [![Coverage Status](https://coveralls.io/repos/ethereum/ethereumj/badge.png?branch=master)](https://coveralls.io/r/ethereum/ethereumj?branch=master)
 
 :small_orange_diamond: By **Roman Mandeleil** @romanman 2014.   
  * Based on a design by **Vitalik Buterin** @vbuterin. 

ethereumj-core/pom.xml

@@ -16,6 +16,21 @@
  mvn antlr4:antlr4
 -->
 
+	<developers>
+		<developer>
+			<name>Roman Mandeleil</name>
+		</developer>
+		<developer>
+			<name>Nick Savers</name>
+		</developer>
+	</developers>
+
+	<scm>
+		<connection>scm:git:git://github.com/ethereum/ethereumj.git</connection>
+		<developerConnection>scm:git:git://github.com/ethereum/ethereumj.git</developerConnection>
+		<url>https://github.com/ethereum/ethereumj</url>
+	</scm>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<!-- Third-party dependencies -->
@@ -221,6 +236,22 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.eluder.coveralls</groupId>
+				<artifactId>coveralls-maven-plugin</artifactId>
+				<version>2.2.0</version>
+			</plugin>
+			<plugin>
+			    <groupId>org.codehaus.mojo</groupId>
+			    <artifactId>cobertura-maven-plugin</artifactId>
+			    <version>2.6</version>
+			    <configuration>
+			        <format>xml</format>
+			        <maxmem>256m</maxmem>
+			        <!-- aggregated reports for multi-module projects -->
+			        <aggregate>true</aggregate>
+			    </configuration>
+			</plugin>
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <version>1.3</version>

ethereumj-core/src/main/java/org/ethereum/gui/DialogWorker.java

@@ -1,7 +1,6 @@
 package org.ethereum.gui;
 
 import org.ethereum.core.Transaction;
-import org.ethereum.manager.MainData;
 import org.ethereum.manager.WorldManager;
 import org.ethereum.net.submit.TransactionExecutor;
 import org.ethereum.net.submit.TransactionTask;
@@ -22,7 +21,7 @@ import static org.ethereum.config.SystemProperties.CONFIG;
  * @author: Roman Mandeleil
  * Created on: 26/05/2014 12:27
  */
-public class DialogWorker extends SwingWorker {
+public class DialogWorker extends SwingWorker<Transaction, Object> {
 
 	private static Logger logger = LoggerFactory.getLogger(DialogWorker.class);
 	
@@ -35,7 +34,7 @@ public class DialogWorker extends SwingWorker {
     }
 
     @Override
-    protected Object doInBackground() throws Exception {
+    protected Transaction doInBackground() throws Exception {
         TransactionTask transactionTask = new TransactionTask(tx);
         Future<Transaction> future = TransactionExecutor.instance.submitTransaction(transactionTask);
         dialog.infoStatusMsg("Transaction sent to the network, waiting for approve");

ethereumj-core/src/main/java/org/ethereum/net/message/StaticMessages.java

@@ -29,7 +29,7 @@ public class StaticMessages {
         byte[] peerIdBytes = HashUtil.randomPeerId();
 
         return new HelloMessage((byte) 0x14, (byte) 0x00,
-                "EthereumJ [v0.5.1]  by RomanJ", (byte) 0b00000111,
+                "EthereumJ [v0.5.1]  by RomanJ", Byte.parseByte("00000111", 2),
                 (short) 30303, peerIdBytes);
     }
 }