Add clover ignores

snapscript · Aug 21, 2016 · 422d767 · 422d767
1 parent 1e9430a
commit 422d767
Show file tree

Hide file tree

Showing 21 changed files with 110 additions and 19 deletions.
diff --git a/snap-common/.classpath b/snap-common/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="var" path="CLOVER_RUNTIME"/>
 	<classpathentry kind="src" output="target/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>

diff --git a/snap-common/.gitignore b/snap-common/.gitignore
@@ -1,2 +1,3 @@
 /target
 /.settings
+/.clover/
diff --git a/snap-common/.project b/snap-common/.project
@@ -5,11 +5,21 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>com.atlassian.clover.eclipse.core.prejavabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>com.atlassian.clover.eclipse.core.postjavabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
@@ -19,5 +29,6 @@
 	<natures>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>com.atlassian.clover.eclipse.core.clovernature</nature>
 	</natures>
 </projectDescription>
diff --git a/snap-common/pom.xml b/snap-common/pom.xml
@@ -3,7 +3,7 @@
   <groupId>org.snapscript</groupId>
   <artifactId>snap-common</artifactId>
   <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.0</version>
   <url>http://www.snapscript.org</url>
   <dependencies>
     <dependency>

diff --git a/snap-compile/.classpath b/snap-compile/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="var" path="CLOVER_RUNTIME"/>
 	<classpathentry kind="src" output="target/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>

diff --git a/snap-compile/.gitignore b/snap-compile/.gitignore
@@ -1,3 +1,4 @@
 /target
 /.settings
 /xx..bin
+/.clover/
diff --git a/snap-compile/.project b/snap-compile/.project
@@ -5,11 +5,21 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>com.atlassian.clover.eclipse.core.prejavabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>com.atlassian.clover.eclipse.core.postjavabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
@@ -19,5 +29,6 @@
 	<natures>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>com.atlassian.clover.eclipse.core.clovernature</nature>
 	</natures>
 </projectDescription>
diff --git a/snap-compile/pom.xml b/snap-compile/pom.xml
@@ -3,23 +3,23 @@
   <groupId>org.snapscript</groupId>
   <artifactId>snap-compile</artifactId>
   <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.0</version>
   <url>http://www.snapscript.org</url>
   <dependencies>
     <dependency>
       <groupId>org.snapscript</groupId>
       <artifactId>snap-tree</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.0</version>
     </dependency>  
     <dependency>
       <groupId>org.snapscript</groupId>
       <artifactId>snap-core</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.0</version>
     </dependency>
     <dependency>
       <groupId>org.snapscript</groupId>
       <artifactId>snap-parse</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.0</version>
     </dependency>
         <dependency>
       <groupId>org.simpleframework</groupId>

diff --git a/snap-core/.classpath b/snap-core/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="var" path="CLOVER_RUNTIME"/>
 	<classpathentry kind="src" output="target/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>

diff --git a/snap-core/.gitignore b/snap-core/.gitignore
@@ -1,2 +1,3 @@
 /target
 /.settings
+/.clover/
diff --git a/snap-core/.project b/snap-core/.project
@@ -5,11 +5,21 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>com.atlassian.clover.eclipse.core.prejavabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>com.atlassian.clover.eclipse.core.postjavabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
@@ -19,5 +29,6 @@
 	<natures>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>com.atlassian.clover.eclipse.core.clovernature</nature>
 	</natures>
 </projectDescription>
diff --git a/snap-core/pom.xml b/snap-core/pom.xml
@@ -3,13 +3,13 @@
   <groupId>org.snapscript</groupId>
   <artifactId>snap-core</artifactId>
   <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.0</version>
   <url>http://www.snapscript.org</url>
   <dependencies>
     <dependency>
       <groupId>org.snapscript</groupId>
       <artifactId>snap-common</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.0</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

diff --git a/snap-parse/.classpath b/snap-parse/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="var" path="CLOVER_RUNTIME"/>
 	<classpathentry kind="src" output="target/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>

diff --git a/snap-parse/.gitignore b/snap-parse/.gitignore
@@ -1,2 +1,3 @@
 /target
 /.settings
+/.clover/
diff --git a/snap-parse/.project b/snap-parse/.project
@@ -5,11 +5,21 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>com.atlassian.clover.eclipse.core.prejavabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>com.atlassian.clover.eclipse.core.postjavabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
@@ -19,5 +29,6 @@
 	<natures>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>com.atlassian.clover.eclipse.core.clovernature</nature>
 	</natures>
 </projectDescription>
diff --git a/snap-parse/pom.xml b/snap-parse/pom.xml
@@ -3,13 +3,13 @@
   <groupId>org.snapscript</groupId>
   <artifactId>snap-parse</artifactId>
   <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.0</version>
   <url>http://www.snapscript.org</url>
   <dependencies>
     <dependency>
       <groupId>org.snapscript</groupId>
       <artifactId>snap-common</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.0</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

diff --git a/snap-tree/.classpath b/snap-tree/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="var" path="CLOVER_RUNTIME"/>
 	<classpathentry kind="src" output="target/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>

diff --git a/snap-tree/.gitignore b/snap-tree/.gitignore
@@ -1,3 +1,4 @@
 /target
 /.settings
 /xx..bin
+/.clover/
diff --git a/snap-tree/.project b/snap-tree/.project
@@ -5,11 +5,21 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>com.atlassian.clover.eclipse.core.prejavabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>com.atlassian.clover.eclipse.core.postjavabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
@@ -19,5 +29,6 @@
 	<natures>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>com.atlassian.clover.eclipse.core.clovernature</nature>
 	</natures>
 </projectDescription>
diff --git a/snap-tree/pom.xml b/snap-tree/pom.xml
@@ -3,18 +3,18 @@
   <groupId>org.snapscript</groupId>
   <artifactId>snap-tree</artifactId>
   <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.0</version>
   <url>http://www.snapscript.org</url>
   <dependencies>
     <dependency>
       <groupId>org.snapscript</groupId>
       <artifactId>snap-core</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.0</version>
     </dependency>
     <dependency>
       <groupId>org.snapscript</groupId>
       <artifactId>snap-parse</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.0</version>
     </dependency>
         <dependency>
       <groupId>org.simpleframework</groupId>
@@ -29,6 +29,32 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <reporting>
+  <plugins>
+	<!-- Normally, we take off the dependency report, saves time. -->
+	<plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-project-info-reports-plugin</artifactId>
+		<version>2.7</version>
+		<configuration>
+			<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+		</configuration>
+	</plugin>
+
+	<plugin>
+		<groupId>org.codehaus.mojo</groupId>
+		<artifactId>cobertura-maven-plugin</artifactId>
+		<version>2.6</version>
+		<configuration>
+			<formats>
+				<format>html</format>
+				<format>xml</format>
+			</formats>
+		</configuration>
+	</plugin>
+
+   </plugins>
+</reporting>
   <build>
     <plugins>
       <plugin>

diff --git a/snap-tree/src/main/java/org/snapscript/tree/define/InstanceAllocator.java b/snap-tree/src/main/java/org/snapscript/tree/define/InstanceAllocator.java
@@ -25,16 +25,16 @@ public InstanceAllocator(Initializer initializer, Invocation invocation, Type ty
    @Override
    public Instance allocate(Scope scope, Instance base, Object... list) throws Exception {
       Type real = (Type)list[0];
-      Instance object = builder.create(scope, base, real);// we need to pass the base type up!!
-      State state = object.getState();
+      Instance instance = builder.create(scope, base, real);// we need to pass the base type up!!
+      State state = instance.getState();
       Value value = state.getValue(TYPE_THIS);
 
-      if(object != base) { // false if this(...) called
-         initializer.execute(object, real);
+      if(instance != base) { // false if this(...) is called
+         initializer.execute(instance, real);
       }
-      value.setValue(object); // set the 'this' variable
-      invocation.invoke(object, object, list);
+      value.setValue(instance); // set the 'this' variable
+      invocation.invoke(instance, instance, list);
 
-      return object;    
+      return instance;    
    }
 }