Merged genesys2/anno-swt into master

anno-gui/pom.xml

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.genesys2</groupId>
@@ -8,6 +9,14 @@
 	<artifactId>anno-gui</artifactId>
 	<name>Data annotator GUI</name>
 
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+		<maven.compiler.target>1.6</maven.compiler.target>
+		<maven.compiler.source>1.6</maven.compiler.source>
+	</properties>
+
 	<repositories>
 		<repository>
 			<id>my-local-repo</id>
@@ -39,7 +48,7 @@
 		</dependency>
 		<dependency>
 			<groupId>xerces</groupId>
-			<artifactId>xerces</artifactId>
+			<artifactId>xercesImpl</artifactId>
 			<version>2.4.0</version>
 		</dependency>
 		<dependency>
@@ -52,27 +61,27 @@
 			<artifactId>swing2swt</artifactId>
 			<version>1.0</version>
 		</dependency>
-        <dependency>
-            <groupId>
+		<dependency>
+			<groupId>
 				org.eclipse.swt.org.eclipse.swt.cocoa.macosx.x86_64.4.3.swt
             </groupId>
 			<artifactId>org.eclipse.swt.cocoa.macosx.x86_64</artifactId>
-            <version>4.3</version>
+			<version>4.3</version>
 			<scope>provided</scope>
-        </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.eclipse.swt.gtk.linux</groupId>-->
-            <!--<artifactId>x86_64</artifactId>-->
-            <!--<version>3.3.0-v3346</version>-->
-        <!--</dependency>-->
+		</dependency>
+		<!--<dependency> -->
+		<!--<groupId>org.eclipse.swt.gtk.linux</groupId> -->
+		<!--<artifactId>x86_64</artifactId> -->
+		<!--<version>3.3.0-v3346</version> -->
+		<!--</dependency> -->
 
-        <dependency>
+		<dependency>
 			<groupId>net.sf.supercsv</groupId>
 			<artifactId>super-csv</artifactId>
 			<version>2.2.0</version>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.commons</groupId>
+			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
 			<version>1.3.2</version>
 		</dependency>
@@ -150,11 +159,11 @@
 			<artifactId>jackson-databind</artifactId>
 			<version>2.4.1.1</version>
 		</dependency>
-        <dependency>
-            <groupId>org.json</groupId>
-            <artifactId>json</artifactId>
-            <version>20090211</version>
-        </dependency>
+		<dependency>
+			<groupId>org.json</groupId>
+			<artifactId>json</artifactId>
+			<version>20090211</version>
+		</dependency>
 		<dependency>
 			<groupId>org.genesys2</groupId>
 			<artifactId>genesys-client-api</artifactId>
@@ -176,16 +185,17 @@
 			<version>1.7.7</version>
 		</dependency>
 
-    </dependencies>
+	</dependencies>
 	<build>
 		<plugins>
-
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.1</version>
 				<configuration>
 					<source>1.6</source>
 					<target>1.6</target>
+					<forceJavacCompilerUse>true</forceJavacCompilerUse>
+					<encoding>UTF-8</encoding>
 				</configuration>
 			</plugin>
 

anno-gui/src/main/java/org/genesys2/anno/util/ConnectionUtils.java

@@ -5,7 +5,9 @@ import java.sql.Driver;
 import java.sql.DriverManager;
 import java.sql.DriverPropertyInfo;
 import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
 import java.util.Properties;
+import java.util.logging.Logger;
 
 import org.genesys2.anno.gui.ExtraClassLoader;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,7 +54,7 @@ public class ConnectionUtils {
 		}
 	}
 
-	private static class DriverShim implements Driver {
+	public static class DriverShim implements Driver {
 
 		private Driver driver;
 
@@ -89,6 +91,9 @@ public class ConnectionUtils {
 		public boolean jdbcCompliant() {
 			return driver.jdbcCompliant();
 		}
-
+		
+		public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+			throw new SQLFeatureNotSupportedException("getParentLogger() is Java 7");
+		}
 	}
 }

anno-gui/src/test/java/org/genesys2/anno/CsvFileTest.java

@@ -27,10 +27,12 @@ import java.util.List;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.ArrayUtils;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.supercsv.io.CsvListReader;
 import org.supercsv.prefs.CsvPreference;
 
+@Ignore
 public class CsvFileTest {
 	@Test
 	public void test1() {

anno-gui/src/test/java/org/genesys2/anno/XlsFileTest.java

@@ -26,8 +26,10 @@ import org.apache.commons.lang3.ArrayUtils;
 import org.genesys2.anno.reader.StopParsingException;
 import org.genesys2.anno.reader.XSSFReadWrite;
 import org.genesys2.anno.reader.XSSFRowReader;
+import org.junit.Ignore;
 import org.junit.Test;
 
+@Ignore
 public class XlsFileTest {
 	@Test
 	public void test1() {