From: Mathieu Baudier Date: Fri, 29 Aug 2008 09:42:04 +0000 (+0000) Subject: Revert to Java 5 compatibility X-Git-Tag: argeo-slc-2.1.7~2604 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=3bad82be9a7663094cb42fe4be94d06763021651;p=gpl%2Fargeo-slc.git Revert to Java 5 compatibility git-svn-id: https://svn.argeo.org/slc/trunk@1568 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/org.argeo.slc.core/.classpath b/org.argeo.slc.core/.classpath index 53b02f56c..372e5299e 100644 --- a/org.argeo.slc.core/.classpath +++ b/org.argeo.slc.core/.classpath @@ -1,10 +1,10 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/org.argeo.slc.core/.settings/org.eclipse.jdt.core.prefs b/org.argeo.slc.core/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..93d31747f --- /dev/null +++ b/org.argeo.slc.core/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,12 @@ +#Fri Aug 29 11:10:18 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.core/src/main/java/org/argeo/slc/core/deploy/SimpleExecutables.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/SimpleExecutables.java index 09da07537..5f9894014 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/SimpleExecutables.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/SimpleExecutables.java @@ -16,7 +16,6 @@ public class SimpleExecutables implements InstalledExecutables { private Distribution distribution; - @Override public String getExecutablePath(String key) { String path = paths.get(key); if (path == null) { @@ -31,24 +30,20 @@ public class SimpleExecutables implements InstalledExecutables { return path; } - @Override public String getDeployedSystemId() { // TODO Auto-generated method stub return null; } - @Override public DeploymentData getDeploymentData() { // TODO Auto-generated method stub return null; } - @Override public Distribution getDistribution() { return distribution; } - @Override public TargetData getTargetData() { // TODO Auto-generated method stub return null; diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/logging/Log4jUtils.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/logging/Log4jUtils.java index 6249c6f21..6398e608e 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/logging/Log4jUtils.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/logging/Log4jUtils.java @@ -57,7 +57,8 @@ public class Log4jUtils { private static void overrideLog4jProperties(Properties target, Properties additional) { - for (String key : additional.stringPropertyNames()) { + for (Object obj : additional.keySet()) { + String key = obj.toString(); if (key.startsWith("log4j.")) { if (!key.equals("log4j.configuration")) { String value = SystemPropertyUtils diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeployment.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeployment.java index a8ebcb59d..12036f5e2 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeployment.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeployment.java @@ -9,29 +9,24 @@ import org.argeo.slc.core.deploy.TargetData; public class HttpdServerDeployment implements Deployment { private HttpdServerTargetData targetData; - @Override public void execute() { // TODO Auto-generated method stub } - @Override public DeployedSystem getDeployedSystem() { // TODO Auto-generated method stub return null; } - @Override public void setDeploymentData(DeploymentData deploymentData) { // TODO Auto-generated method stub } - @Override public void setDistribution(Distribution distribution) { } - @Override public void setTargetData(TargetData targetData) { this.targetData = (HttpdServerTargetData) targetData; } diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerManager.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerManager.java index 80905bcf0..570a7b5a7 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerManager.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/support/deploy/HttpdServerManager.java @@ -67,7 +67,6 @@ public class HttpdServerManager implements DeployedSystemManager { } } - @Override public void setDeployedSystem(HttpdServer httpdServer) { this.httpdServer = httpdServer; }