From 021156c3625d21992024bc659503b4ea56c2b630 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 29 Aug 2008 09:41:49 +0000
Subject: [PATCH] Revert to Java 5 compatibility

git-svn-id: https://svn.argeo.org/slc/trunk@1564 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 org.argeo.slc.server/.classpath                      |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs             | 12 ++++++++++++
 .../slc/web/mvc/XsltMarshallerViewResolver.java      |  1 -
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 org.argeo.slc.server/.settings/org.eclipse.jdt.core.prefs

diff --git a/org.argeo.slc.server/.classpath b/org.argeo.slc.server/.classpath
index fe6837c7e..372e5299e 100644
--- a/org.argeo.slc.server/.classpath
+++ b/org.argeo.slc.server/.classpath
@@ -5,6 +5,6 @@
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="src" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.argeo.slc.server/.settings/org.eclipse.jdt.core.prefs b/org.argeo.slc.server/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..e71a107e6
--- /dev/null
+++ b/org.argeo.slc.server/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Fri Aug 29 11:25:17 CEST 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerViewResolver.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerViewResolver.java
index 9acbc94cd..62af08ea6 100644
--- a/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerViewResolver.java
+++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerViewResolver.java
@@ -41,7 +41,6 @@ public class XsltMarshallerViewResolver extends XsltViewResolver implements
 		this.marshaller = marshaller;
 	}
 
-	@Override
 	public Source resolve(String href, String base) throws TransformerException {
 		if (log.isTraceEnabled())
 			log.trace("Resolve URI for href=" + href + " base=" + base);
-- 
2.39.5