Increase version to 1.0.0; add xhtml namespace to stylesheet (AIS)

scientific-tool-set · Sep 3, 2015 · b04932a · b04932a
1 parent f6f74d6
commit b04932a
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 28 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.hmx</groupId>
 	<artifactId>scitos</artifactId>
-	<version>0.9.1</version>
+	<version>1.0.0</version>
 	<packaging>pom</packaging>
 	<name>scitos</name>
 	<description>parent project of SciToS</description>
@@ -17,7 +17,7 @@
 	</modules>
 
 	<properties>
-		<scitos.version>0.9.1</scitos.version>
+		<scitos.version>1.0.0</scitos.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 	<build>

diff --git a/scitos.ais/pom.xml b/scitos.ais/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.hmx</groupId>
 		<artifactId>scitos</artifactId>
-		<version>0.9.1</version>
+		<version>1.0.0</version>
 	</parent>
 	<artifactId>scitos.ais</artifactId>
 	<packaging>pom</packaging>

diff --git a/scitos.ais/scitos.ais.core/pom.xml b/scitos.ais/scitos.ais.core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.hmx</groupId>
 		<artifactId>scitos.ais</artifactId>
-		<version>0.9.1</version>
+		<version>1.0.0</version>
 	</parent>
 	<artifactId>scitos.ais.core</artifactId>
 	<name>scitos.ais.core</name>

diff --git a/scitos.ais/scitos.ais.core/src/main/resources/org/hmx/scitos/ais/stylesheet.xsl b/scitos.ais/scitos.ais.core/src/main/resources/org/hmx/scitos/ais/stylesheet.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
+<xsl:stylesheet version="1.0" xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 	<xsl:template match="AisProject">
 		<html>

diff --git a/scitos.ais/scitos.ais.domain/pom.xml b/scitos.ais/scitos.ais.domain/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.hmx</groupId>
     <artifactId>scitos.ais</artifactId>
-    <version>0.9.1</version>
+    <version>1.0.0</version>
   </parent>
   <artifactId>scitos.ais.domain</artifactId>
 	<build>

diff --git a/scitos.ais/scitos.ais.view/pom.xml b/scitos.ais/scitos.ais.view/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.hmx</groupId>
 		<artifactId>scitos.ais</artifactId>
-		<version>0.9.1</version>
+		<version>1.0.0</version>
 	</parent>
 	<artifactId>scitos.ais.view</artifactId>
 	<name>scitos.ais.view</name>

diff --git a/scitos.core/pom.xml b/scitos.core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.hmx</groupId>
 		<artifactId>scitos</artifactId>
-		<version>0.9.1</version>
+		<version>1.0.0</version>
 	</parent>
 	<artifactId>scitos.core</artifactId>
 	<name>scitos.core</name>

diff --git a/scitos.distribution/pom.xml b/scitos.distribution/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.hmx</groupId>
 		<artifactId>scitos</artifactId>
-		<version>0.9.1</version>
+		<version>1.0.0</version>
 	</parent>
 	<artifactId>scitos.distribution</artifactId>
 

diff --git a/scitos.domain/pom.xml b/scitos.domain/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.hmx</groupId>
 		<artifactId>scitos</artifactId>
-		<version>0.9.1</version>
+		<version>1.0.0</version>
 	</parent>
 	<artifactId>scitos.domain</artifactId>
 	<name>scitos.domain</name>

diff --git a/scitos.domain/src/main/java/org/hmx/scitos/domain/util/ComparisonUtil.java b/scitos.domain/src/main/java/org/hmx/scitos/domain/util/ComparisonUtil.java
@@ -115,15 +115,7 @@ public static <T extends Comparable<T>> int compareNullAware(final T targetOne,
      * @return if the given collection contains the given instance (not just an equal object)
      */
     public static <T> boolean containsInstance(final Collection<? extends T> collection, final T instance) {
-        if (collection == null || collection.isEmpty()) {
-            return false;
-        }
-        for (final T collectionElement : collection) {
-            if (collectionElement == instance) {
-                return true;
-            }
-        }
-        return false;
+        return -1 != ComparisonUtil.indexOfInstance(collection, instance);
     }
 
     /**
@@ -145,15 +137,14 @@ public static <T> boolean containsInstance(final Collection<? extends T> collect
      * @return position of the given instance in the collection (not just of an equal object)
      */
     public static <T> int indexOfInstance(final Collection<? extends T> collection, final T instance) {
-        if (collection == null || collection.isEmpty()) {
-            return -1;
-        }
-        int index = 0;
-        for (final T collectionElement : collection) {
-            if (collectionElement == instance) {
-                return index;
+        if (collection != null && !collection.isEmpty()) {
+            int index = 0;
+            for (final T collectionElement : collection) {
+                if (collectionElement == instance) {
+                    return index;
+                }
+                index++;
             }
-            index++;
         }
         return -1;
     }

diff --git a/scitos.view/pom.xml b/scitos.view/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.hmx</groupId>
 		<artifactId>scitos</artifactId>
-		<version>0.9.1</version>
+		<version>1.0.0</version>
 	</parent>
 	<artifactId>scitos.view</artifactId>
 	<name>scitos.view</name>