Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2017-01-15 14:10:24 -0500
committerStephan Herrmann2017-01-15 14:10:24 -0500
commit4727ebeff44519512d62b2d30bfd96513063259f (patch)
treef03031ca2a2d319b91967173983ae40975e48139
parent269d33d636b2d7eee044fdaa4bc133df0c5b72d5 (diff)
downloadorg.eclipse.objectteams-4727ebeff44519512d62b2d30bfd96513063259f.tar.gz
org.eclipse.objectteams-4727ebeff44519512d62b2d30bfd96513063259f.tar.xz
org.eclipse.objectteams-4727ebeff44519512d62b2d30bfd96513063259f.zip
Merge: need 1.7 for recent change (back ported)
-rw-r--r--plugins/org.eclipse.objectteams.otredyn/.classpath2
-rw-r--r--plugins/org.eclipse.objectteams.otredyn/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/AsmWritableBoundClass.java19
4 files changed, 12 insertions, 18 deletions
diff --git a/plugins/org.eclipse.objectteams.otredyn/.classpath b/plugins/org.eclipse.objectteams.otredyn/.classpath
index ad32c83a7..098194ca4 100644
--- a/plugins/org.eclipse.objectteams.otredyn/.classpath
+++ b/plugins/org.eclipse.objectteams.otredyn/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <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/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.eclipse.objectteams.otredyn/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.objectteams.otredyn/.settings/org.eclipse.jdt.core.prefs
index fd5749da1..173168bbd 100644
--- a/plugins/org.eclipse.objectteams.otredyn/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.objectteams.otredyn/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,10 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -97,5 +98,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.objectteams.otdt.compiler.option.pure_java=enabled
diff --git a/plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF
index a5cbf85e2..ac28b33b8 100644
--- a/plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Export-Package: org.eclipse.objectteams.otredyn.bytecode,
org.eclipse.objectteams.otredyn.transformer.jplis,
org.eclipse.objectteams.otredyn.transformer.names,
org.eclipse.objectteams.otredyn.util
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ClassPath: .
Require-Bundle: org.eclipse.objectteams.runtime;bundle-version="[2.5.0,3.0.0)",
org.objectweb.asm;bundle-version="5.0.1",
diff --git a/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/AsmWritableBoundClass.java b/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/AsmWritableBoundClass.java
index eee863b1b..cd55bcca5 100644
--- a/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/AsmWritableBoundClass.java
+++ b/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/AsmWritableBoundClass.java
@@ -324,22 +324,15 @@ class AsmWritableBoundClass extends AsmBoundClass {
if (!dumping)
return;
- FileOutputStream fos = null;
- try {
- String name = getName().replaceAll("/", ".");
- File dir = new File("otdyn");
- if (!dir.exists())
- dir.mkdir();
- String filename = "otdyn/" + name + ".class";
- fos = new FileOutputStream(filename);
+ String name = getName().replaceAll("/", ".");
+ File dir = new File("otdyn");
+ if (!dir.exists())
+ dir.mkdir();
+ String filename = "otdyn/" + name + ".class";
+ try (FileOutputStream fos = new FileOutputStream(filename)) {
fos.write(allocateAndGetBytecode());
} catch (Exception e) {
e.printStackTrace();
- } finally {
- if (fos != null)
- try {
- fos.close();
- } catch (IOException e) { /* ignore */}
}
}

Back to the top