Fix compile bug in vaadin

diff --git a/pom.xml b/pom.xml
index 4d3755730cfde93acaa1b35788b0b220420e602e..a76780350851675a548a6aa2c4369009cd60e100 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -444,148 +444,6 @@
       <version>4.11</version>
       <scope>test</scope>
     </dependency>
-    <!-- unitils dependencies - start -->
-<!--     <dependency> -->
-<!--       <groupId>org.unitils</groupId> -->
-<!--       <artifactId>unitils-core</artifactId> -->
-<!--       <version>${unitils.version}</version> -->
-<!--       <scope>test</scope> -->
-<!--     </dependency> -->
-<!--     <dependency> -->
-<!--       <groupId>org.unitils</groupId> -->
-<!--       <artifactId>unitils-database</artifactId> -->
-<!--       <version>${unitils.version}</version> -->
-<!--       <scope>test</scope> -->
-<!--       <exclusions> -->
-<!--         <exclusion> -->
-<!--           <groupId>org.springframework</groupId> -->
-<!--           <artifactId>spring-jdbc</artifactId> -->
-<!--         </exclusion> -->
-<!--       </exclusions> -->
-<!--     </dependency> -->
-<!--     <dependency> -->
-<!--       <groupId>org.unitils</groupId> -->
-<!--       <artifactId>unitils-dbmaintainer</artifactId> -->
-<!--       <version>${unitils.version}</version> -->
-<!--       <scope>test</scope> -->
-<!--       <exclusions> -->
-<!--         <exclusion> -->
-<!--           <groupId>org.hibernate</groupId> -->
-<!--           <artifactId>hibernate</artifactId> -->
-<!--         </exclusion> -->
-<!--       </exclusions> -->
-<!--     </dependency> -->
-<!--     <dependency> -->
-<!--       <groupId>org.unitils</groupId> -->
-<!--       <artifactId>unitils-dbunit</artifactId> -->
-<!--       <version>${unitils.version}</version> -->
-<!--       <scope>test</scope> -->
-<!--       <exclusions> -->
-<!--         <exclusion> -->
-<!--           <groupId>org.springframework</groupId> -->
-<!--           <artifactId>spring-core</artifactId> -->
-<!--         </exclusion> -->
-<!--         <exclusion> -->
-<!--           <groupId>org.springframework</groupId> -->
-<!--           <artifactId>spring-jdbc</artifactId> -->
-<!--         </exclusion> -->
-<!--         <exclusion> -->
-<!--           <groupId>org.springframework</groupId> -->
-<!--           <artifactId>spring-beans</artifactId> -->
-<!--         </exclusion> -->
-<!--       </exclusions> -->
-<!--     </dependency> -->
-<!--     <dependency> -->
-<!--       <groupId>org.unitils</groupId> -->
-<!--       <artifactId>unitils-easymock</artifactId> -->
-<!--       <version>${unitils.version}</version> -->
-<!--       <scope>test</scope> -->
-<!--     </dependency> -->
-<!--     <dependency> -->
-<!--       <groupId>org.unitils</groupId> -->
-<!--       <artifactId>unitils-mock</artifactId> -->
-<!--       <version>${unitils.version}</version> -->
-<!--       <scope>test</scope> -->
-<!--     </dependency> -->
-<!--     <dependency> -->
-<!--       <groupId>org.unitils</groupId> -->
-<!--       <artifactId>unitils-inject</artifactId> -->
-<!--       <version>${unitils.version}</version> -->
-<!--       <scope>test</scope> -->
-<!--     </dependency> -->
-<!--     <dependency> -->
-<!--       <groupId>org.unitils</groupId> -->
-<!--       <artifactId>unitils-orm</artifactId> -->
-<!--       <version>${unitils.version}</version> -->
-<!--        <scope>test</scope> -->
-<!--       <exclusions> -->
-<!--      <exclusion> -->
-<!--        <artifactId>*</artifactId> -->
-<!--        <groupId>org.springframework</groupId> -->
-<!--      </exclusion> -->
-<!--      <exclusion> -->
-<!--        <artifactId>persistence-api</artifactId> -->
-<!--        <groupId>javax.persistence</groupId> -->
-<!--      </exclusion> -->
-<!--      <exclusion> -->
-<!--        <artifactId>hibernate</artifactId> -->
-<!--        <groupId>org.hibernate</groupId> -->
-<!--      </exclusion> -->
-<!--    </exclusions> -->
-<!--     </dependency>  -->
-<!--     <dependency> -->
-<!--       <groupId>org.unitils</groupId> -->
-<!--       <artifactId>unitils-spring</artifactId> -->
-<!--       <version>${unitils.version}</version> -->
-<!--       <scope>test</scope> -->
-<!--       <exclusions> -->
-<!--         <exclusion> -->
-<!--           <groupId>org.springframework</groupId> -->
-<!--           <artifactId>spring-core</artifactId> -->
-<!--         </exclusion> -->
-<!--         <exclusion> -->
-<!--           <groupId>org.springframework</groupId> -->
-<!--           <artifactId>spring-context</artifactId> -->
-<!--         </exclusion> -->
-<!--         <exclusion> -->
-<!--           <groupId>org.springframework</groupId> -->
-<!--           <artifactId>spring-beans</artifactId> -->
-<!--         </exclusion> -->
-<!--         <exclusion> -->
-<!--           <groupId>org.springframework</groupId> -->
-<!--           <artifactId>spring-test</artifactId> -->
-<!--         </exclusion> -->
-<!--         <exclusion> -->
-<!--           <groupId>org.springframework</groupId> -->
-<!--           <artifactId>spring-tx</artifactId> -->
-<!--         </exclusion> -->
-<!--       </exclusions> -->
-<!--     </dependency> -->
-<!--     <dependency> -->
-<!--       <groupId>org.easymock</groupId> -->
-<!--       <artifactId>easymock</artifactId> -->
-<!--       <version>3.1</version> -->
-<!--       <scope>test</scope> -->
-<!--     </dependency> -->
-<!--     <dependency> -->
-<!--       <groupId>xmlunit</groupId> -->
-<!--       <artifactId>xmlunit</artifactId> -->
-<!--       <version>1.4</version> -->
-<!--       <scope>test</scope> -->
-<!--     </dependency> -->
-<!--     <dependency> -->
-<!--       <groupId>org.dbunit</groupId> -->
-<!--       <artifactId>dbunit</artifactId> -->
-<!--       <version>2.4.9</version> -->
-<!--       <scope>test</scope> -->
-<!--     </dependency> -->
-<!--     <dependency> -->
-<!--       <groupId>commons-dbcp</groupId> -->
-<!--       <artifactId>commons-dbcp</artifactId> -->
-<!--       <version>1.4</version> -->
-<!--       <scope>test</scope> -->
-<!--     </dependency> -->
-    <!-- unitils dependencies - end -->
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/presenter/dbstatus/DistributionSelectionPresenter.java b/src/main/java/eu/etaxonomy/cdm/vaadin/presenter/dbstatus/DistributionSelectionPresenter.java
index 21bf9a1c29db12425859b085f5b610ad21f93503..4c5d1337f61ec3c5b129b71275cf8bf4d3365fc1 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/presenter/dbstatus/DistributionSelectionPresenter.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/presenter/dbstatus/DistributionSelectionPresenter.java
@@ -5,8 +5,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.bcel.generic.ARRAYLENGTH;
-
 import com.vaadin.server.VaadinSession;
 import com.vaadin.ui.UI;