Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2013-07-27 07:51:37 -0400
committerEike Stepper2013-07-27 07:51:37 -0400
commit91844ac25fcb13c17b1ea6c7346bc4b60f10fde2 (patch)
tree71c7d6bc80afd81a5ff40fd161ea6817a0594556
parent1e497dc2257ceadc584a82c03f713b218f7c95fd (diff)
downloadcdo-91844ac25fcb13c17b1ea6c7346bc4b60f10fde2.tar.gz
cdo-91844ac25fcb13c17b1ea6c7346bc4b60f10fde2.tar.xz
cdo-91844ac25fcb13c17b1ea6c7346bc4b60f10fde2.zip
Fix resource leak warnings
-rw-r--r--features/org.eclipse.emf.cdo.releng.version-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.releng.version.headless-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.releng.version.sdk-feature/feature.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.ecore.retrofit/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/AuthenticationIndication.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.apireports/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/AssembleScripts.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/java/MakeHrefsRelative.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/java/MovePackageDescriptions.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/java/SortListItems.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup.edit/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/model/Configuration.xmi4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/Preferences.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/helper/OS.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.version/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.version/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.version/src/org/eclipse/emf/cdo/releng/version/VersionUtil.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/hudson/workspace.zipbin70173 -> 66395 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/GenerateExampleBuilders.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.security.edit/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.security.editor/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.security/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.uml/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.repository/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.ui/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.workspace.ui/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.workspace/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF32
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/transfer/RepositoryPluginDropAdapter.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/transfer/RepositoryTransferDragListener.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/.settings/org.eclipse.jdt.core.prefs6
-rw-r--r--plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java1
-rw-r--r--plugins/org.eclipse.net4j.http.server/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.net4j.http.server/META-INF/MANIFEST.MF10
-rw-r--r--plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/Net4jTransportServlet.java1
-rw-r--r--plugins/org.eclipse.net4j.http.tests/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.net4j.http.tests/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.net4j.http.tests/src/org/eclipse/net4j/http/tests/HTTPTest.java1
-rw-r--r--plugins/org.eclipse.net4j.http.tests/src/org/eclipse/net4j/http/tests/Net4jEchoTestServlet.java1
-rw-r--r--plugins/org.eclipse.net4j.tests/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExpectedIOTest.java2
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExtendedIOTest.java1
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/StreamWrapperTest.java1
-rw-r--r--plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF30
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/DNDTransfer.java1
-rw-r--r--plugins/org.eclipse.net4j.util/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedIOUtil.java22
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/GZIPStreamWrapper.java1
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/NIOUtil.java1
57 files changed, 130 insertions, 88 deletions
diff --git a/features/org.eclipse.emf.cdo.releng.version-feature/feature.xml b/features/org.eclipse.emf.cdo.releng.version-feature/feature.xml
index 433afa0e83..c9f1f275dd 100644
--- a/features/org.eclipse.emf.cdo.releng.version-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.releng.version-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.releng.version"
label="%featureName"
- version="1.1.0.qualifier"
+ version="1.1.100.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.emf.cdo.releng.version.headless-feature/feature.xml b/features/org.eclipse.emf.cdo.releng.version.headless-feature/feature.xml
index d5f490939a..d80a06a676 100644
--- a/features/org.eclipse.emf.cdo.releng.version.headless-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.releng.version.headless-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.releng.version.headless"
label="%featureName"
- version="1.1.0.qualifier"
+ version="1.1.100.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.emf.cdo.releng.version.sdk-feature/feature.xml b/features/org.eclipse.emf.cdo.releng.version.sdk-feature/feature.xml
index 351dc44d00..1dac37d7be 100644
--- a/features/org.eclipse.emf.cdo.releng.version.sdk-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.releng.version.sdk-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.releng.version.sdk"
label="%featureName"
- version="1.1.0.qualifier"
+ version="1.1.100.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/plugins/org.eclipse.emf.cdo.ecore.retrofit/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.ecore.retrofit/.settings/org.eclipse.jdt.core.prefs
index bd25301295..0c056ad1ba 100644
--- a/plugins/org.eclipse.emf.cdo.ecore.retrofit/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.ecore.retrofit/.settings/org.eclipse.jdt.core.prefs
@@ -67,7 +67,7 @@ org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
diff --git a/plugins/org.eclipse.emf.cdo.net4j/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.net4j/META-INF/MANIFEST.MF
index 3036f89a78..8855190fa0 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.net4j/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.net4j; singleton:=true
-Bundle-Version: 4.1.100.qualifier
+Bundle-Version: 4.1.200.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -10,17 +10,17 @@ Bundle-Activator: org.eclipse.emf.cdo.internal.net4j.bundle.OM$Activator
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
org.eclipse.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.internal.net4j;version="4.1.100";
+Export-Package: org.eclipse.emf.cdo.internal.net4j;version="4.1.200";
x-friends:="org.eclipse.emf.cdo.tests,
org.eclipse.emf.cdo.defs,
org.eclipse.emf.cdo.ui,
org.eclipse.emf.cdo.examples",
- org.eclipse.emf.cdo.internal.net4j.bundle;version="4.1.100";x-friends:="org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.internal.net4j.messages;version="4.1.100";x-internal:=true,
- org.eclipse.emf.cdo.internal.net4j.protocol;version="4.1.100";
+ org.eclipse.emf.cdo.internal.net4j.bundle;version="4.1.200";x-friends:="org.eclipse.emf.cdo.tests",
+ org.eclipse.emf.cdo.internal.net4j.messages;version="4.1.200";x-internal:=true,
+ org.eclipse.emf.cdo.internal.net4j.protocol;version="4.1.200";
x-friends:="org.eclipse.emf.cdo.tests,
org.eclipse.emf.cdo.defs,
org.eclipse.emf.cdo.ui,
org.eclipse.emf.cdo.examples",
- org.eclipse.emf.cdo.net4j;version="4.1.100"
+ org.eclipse.emf.cdo.net4j;version="4.1.200"
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/AuthenticationIndication.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/AuthenticationIndication.java
index a83ace98b1..20e6600778 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/AuthenticationIndication.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/AuthenticationIndication.java
@@ -92,6 +92,7 @@ public class AuthenticationIndication extends IndicationWithMonitoring
}
ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ @SuppressWarnings("resource")
ExtendedDataOutputStream stream = new ExtendedDataOutputStream(baos);
stream.writeString(userID);
stream.writeString(password);
diff --git a/plugins/org.eclipse.emf.cdo.releng.apireports/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.releng.apireports/.settings/org.eclipse.jdt.core.prefs
index 98c0358583..c3bbffe21b 100644
--- a/plugins/org.eclipse.emf.cdo.releng.apireports/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.releng.apireports/.settings/org.eclipse.jdt.core.prefs
@@ -94,7 +94,7 @@ org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.releng.doc/META-INF/MANIFEST.MF
index 43c12147f1..95b32dd578 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: CDO Release Engineering Documentation
Bundle-SymbolicName: org.eclipse.emf.cdo.releng.doc;singleton:=true
-Bundle-Version: 4.1.100.qualifier
+Bundle-Version: 4.1.200.qualifier
Bundle-Vendor: Eclipse Modeling Project
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.osgi.util;bundle-version="[3.0.0,4.0.0)",
@@ -10,9 +10,9 @@ Require-Bundle: org.eclipse.osgi.util;bundle-version="[3.0.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)",
org.eclipse.emf.cdo.releng.doc.supplemental;bundle-version="[1.0.0,2.0.0)";resolution:=optional
-Export-Package: org.eclipse.emf.cdo.releng.doc;version="4.1.100";x-internal:=true,
- org.eclipse.emf.cdo.releng.doc.article;version="4.1.100";x-internal:=true,
- org.eclipse.emf.cdo.releng.doc.article.impl;version="4.1.100";x-internal:=true,
- org.eclipse.emf.cdo.releng.doc.article.util;version="4.1.100";x-internal:=true,
- org.eclipse.emf.cdo.releng.doc.java;version="4.1.100";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.releng.doc;version="4.1.200";x-internal:=true,
+ org.eclipse.emf.cdo.releng.doc.article;version="4.1.200";x-internal:=true,
+ org.eclipse.emf.cdo.releng.doc.article.impl;version="4.1.200";x-internal:=true,
+ org.eclipse.emf.cdo.releng.doc.article.util;version="4.1.200";x-internal:=true,
+ org.eclipse.emf.cdo.releng.doc.java;version="4.1.200";x-internal:=true
Bundle-ClassPath: .
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/AssembleScripts.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/AssembleScripts.java
index 0cd4e89e0c..57634c2acc 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/AssembleScripts.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/AssembleScripts.java
@@ -519,6 +519,7 @@ public class AssembleScripts
System.out.println("Generating " + target.getCanonicalPath());
out = new FileWriter(target);
+ @SuppressWarnings("resource")
BufferedWriter writer = new BufferedWriter(out);
List<JavaDoc> javaDocs = (List<JavaDoc>)getJavaDocsSortedByDependencies();
@@ -553,6 +554,7 @@ public class AssembleScripts
System.out.println("Generating " + target.getCanonicalPath());
out = new FileWriter(target);
+ @SuppressWarnings("resource")
BufferedWriter writer = new BufferedWriter(out);
List<JavaDoc> javaDocs = new ArrayList<JavaDoc>(getJavaDocsSortedByDependencies());
@@ -726,6 +728,7 @@ public class AssembleScripts
try
{
out = new FileWriter(packageInfo);
+ @SuppressWarnings("resource")
BufferedWriter writer = new BufferedWriter(out);
writer.write("/*" + NL);
@@ -883,6 +886,7 @@ public class AssembleScripts
try
{
in = new FileReader(new File(releng, "buildTemplate.ant"));
+ @SuppressWarnings("resource")
BufferedReader reader = new BufferedReader(in);
String line;
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/java/MakeHrefsRelative.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/java/MakeHrefsRelative.java
index fc89f02886..8bd90bc7b7 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/java/MakeHrefsRelative.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/java/MakeHrefsRelative.java
@@ -66,6 +66,7 @@ public class MakeHrefsRelative
try
{
in = new FileReader(file);
+ @SuppressWarnings("resource")
BufferedReader reader = new BufferedReader(in);
String line;
@@ -98,6 +99,7 @@ public class MakeHrefsRelative
try
{
out = new FileWriter(file);
+ @SuppressWarnings("resource")
BufferedWriter writer = new BufferedWriter(out);
for (String line : lines)
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/java/MovePackageDescriptions.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/java/MovePackageDescriptions.java
index a1bef9a4ad..13d077f2d0 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/java/MovePackageDescriptions.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/java/MovePackageDescriptions.java
@@ -100,6 +100,7 @@ public class MovePackageDescriptions
try
{
out = new FileWriter(file);
+ @SuppressWarnings("resource")
BufferedWriter writer = new BufferedWriter(out);
writer.write(keepProlog);
writer.write("<A NAME=\"package_description\"><!-- --></A>" + NL);
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/java/SortListItems.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/java/SortListItems.java
index 2d391d9d7d..799e73a404 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/java/SortListItems.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/java/SortListItems.java
@@ -74,6 +74,7 @@ public class SortListItems
try
{
in = new FileReader(file);
+ @SuppressWarnings("resource")
BufferedReader reader = new BufferedReader(in);
String line;
@@ -128,6 +129,7 @@ public class SortListItems
try
{
out = new FileWriter(file);
+ @SuppressWarnings("resource")
BufferedWriter writer = new BufferedWriter(out);
for (String line : lines)
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.releng.setup.edit/.settings/org.eclipse.jdt.core.prefs
index b3af741094..33616536a2 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/.settings/org.eclipse.jdt.core.prefs
@@ -97,7 +97,7 @@ org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/model/Configuration.xmi b/plugins/org.eclipse.emf.cdo.releng.setup/model/Configuration.xmi
index fecb64d55f..ee7675b154 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/model/Configuration.xmi
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/model/Configuration.xmi
@@ -21,13 +21,13 @@
<projects name="CDO">
<directorCalls>
<installableUnits id="org.eclipse.pde.api.tools.ee.feature.feature.group"/>
- <installableUnits id="org.eclipse.emf.cdo.releng.workingsets.feature.group"/>
<installableUnits id="org.eclipse.emf.cdo.releng.launches.feature.group"/>
<installableUnits id="org.eclipse.emf.cdo.releng.manifests.feature.group"/>
<installableUnits id="org.eclipse.emf.cdo.releng.projectcopy.feature.group"/>
<installableUnits id="org.eclipse.emf.cdo.releng.relativepaths.feature.group"/>
<installableUnits id="org.eclipse.emf.cdo.releng.tasks.feature.group"/>
<installableUnits id="org.eclipse.emf.cdo.releng.version.feature.group"/>
+ <installableUnits id="org.eclipse.emf.cdo.releng.workingsets.feature.group"/>
<installableUnits id="org.eclipse.emf.sdk.feature.group"/>
<installableUnits id="org.eclipse.emf.ecoretools.sdk.feature.group"/>
<installableUnits id="org.eclipse.mylyn.github.feature.feature.group"/>
@@ -47,6 +47,8 @@
</directorCalls>
<toolPreferences key="instance/org.eclipse.ui.ide/EXIT_PROMPT_ON_CLOSE_LAST_WINDOW" value="false"/>
<toolPreferences key="instance/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="ignore"/>
+ <toolPreferences key="instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.unclosedCloseable" value="ignore"/>
+ <toolPreferences key="instance/org.eclipse.pde/compilers.f.unresolved-features" value="2"/>
<branches name="master" apiBaseline="//@projects.1/@apiBaselines.0" mspecFilePath="cdo/plugins/org.eclipse.emf.cdo.releng/local.mspec" cloneVariableName="git.clone">
<directorCalls>
<installableUnits id="org.eclipse.emf.sdk.feature.group"/>
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/Preferences.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/Preferences.java
index ecd618b313..d5ec50bfe5 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/Preferences.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/Preferences.java
@@ -35,8 +35,10 @@ import java.io.File;
*/
public interface Preferences extends ToolInstallation
{
+ public static final String PREFERENCES_NAME = "setup-eclipse.xmi";
+
public static final URI PREFERENCES_URI = URI.createFileURI(new File(System.getProperty("user.home", "."),
- "setup-eclipse.xmi").getAbsolutePath());
+ PREFERENCES_NAME).getAbsolutePath());
/**
* Returns the value of the '<em><b>User Name</b></em>' attribute.
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/helper/OS.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/helper/OS.java
index 258243f304..8495e48132 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/helper/OS.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/helper/OS.java
@@ -71,6 +71,7 @@ public abstract class OS
{
out = new FileOutputStream(file);
Writer writer = new OutputStreamWriter(out);
+ @SuppressWarnings("resource")
BufferedWriter bufferedWriter = new BufferedWriter(writer);
for (String line : lines)
diff --git a/plugins/org.eclipse.emf.cdo.releng.version/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.releng.version/.settings/org.eclipse.jdt.core.prefs
index fefca84a81..f4a56bc04a 100644
--- a/plugins/org.eclipse.emf.cdo.releng.version/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.releng.version/.settings/org.eclipse.jdt.core.prefs
@@ -94,7 +94,7 @@ org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
diff --git a/plugins/org.eclipse.emf.cdo.releng.version/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.releng.version/META-INF/MANIFEST.MF
index a85ced56a7..18e53b2128 100644
--- a/plugins/org.eclipse.emf.cdo.releng.version/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.releng.version/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.releng.version;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.100.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -12,6 +12,6 @@ Bundle-ClassPath: .
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
org.eclipse.pde.core;bundle-version="[3.5.0,4.0.0)"
-Export-Package: org.eclipse.emf.cdo.releng.internal.version;version="1.1.0";x-friends:="org.eclipse.emf.cdo.releng.version.ui",
- org.eclipse.emf.cdo.releng.version;version="1.1.0"
+Export-Package: org.eclipse.emf.cdo.releng.internal.version;version="1.1.100";x-friends:="org.eclipse.emf.cdo.releng.version.ui",
+ org.eclipse.emf.cdo.releng.version;version="1.1.100"
Eclipse-BuddyPolicy: dependent
diff --git a/plugins/org.eclipse.emf.cdo.releng.version/src/org/eclipse/emf/cdo/releng/version/VersionUtil.java b/plugins/org.eclipse.emf.cdo.releng.version/src/org/eclipse/emf/cdo/releng/version/VersionUtil.java
index 9d89127965..62346e9c7e 100644
--- a/plugins/org.eclipse.emf.cdo.releng.version/src/org/eclipse/emf/cdo/releng/version/VersionUtil.java
+++ b/plugins/org.eclipse.emf.cdo.releng.version/src/org/eclipse/emf/cdo/releng/version/VersionUtil.java
@@ -166,6 +166,7 @@ public final class VersionUtil
{
inputStream = file.getContents();
String encoding = file.getCharset();
+ @SuppressWarnings("resource")
Reader reader = encoding == null ? new InputStreamReader(inputStream) : new InputStreamReader(inputStream,
encoding);
char[] text = new char[4048];
diff --git a/plugins/org.eclipse.emf.cdo.releng/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.releng/.settings/org.eclipse.jdt.core.prefs
index fefca84a81..f4a56bc04a 100644
--- a/plugins/org.eclipse.emf.cdo.releng/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.releng/.settings/org.eclipse.jdt.core.prefs
@@ -94,7 +94,7 @@ org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
diff --git a/plugins/org.eclipse.emf.cdo.releng/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.releng/META-INF/MANIFEST.MF
index 67041751c4..9326719933 100644
--- a/plugins/org.eclipse.emf.cdo.releng/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.releng/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: CDO Release Engineering
Bundle-SymbolicName: org.eclipse.emf.cdo.releng
-Bundle-Version: 4.2.0.qualifier
+Bundle-Version: 4.2.100.qualifier
Bundle-Vendor: Eclipse Modeling Project
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .
-Export-Package: org.eclipse.emf.cdo.releng;version="4.2.0";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.releng;version="4.2.100";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.releng/hudson/workspace.zip b/plugins/org.eclipse.emf.cdo.releng/hudson/workspace.zip
index c4c114f7b7..cccba0b932 100644
--- a/plugins/org.eclipse.emf.cdo.releng/hudson/workspace.zip
+++ b/plugins/org.eclipse.emf.cdo.releng/hudson/workspace.zip
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/GenerateExampleBuilders.java b/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/GenerateExampleBuilders.java
index e605bfdc12..0e700c7217 100644
--- a/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/GenerateExampleBuilders.java
+++ b/plugins/org.eclipse.emf.cdo.releng/src/org/eclipse/emf/cdo/releng/GenerateExampleBuilders.java
@@ -179,6 +179,7 @@ public class GenerateExampleBuilders
try
{
out = new FileWriter(file);
+ @SuppressWarnings("resource")
BufferedWriter writer = new BufferedWriter(out);
writer.write(content);
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.security.edit/.settings/org.eclipse.jdt.core.prefs
index d6400b3d06..8380acd460 100644
--- a/plugins/org.eclipse.emf.cdo.security.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.security.edit/.settings/org.eclipse.jdt.core.prefs
@@ -103,7 +103,7 @@ org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
diff --git a/plugins/org.eclipse.emf.cdo.security.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.security.editor/.settings/org.eclipse.jdt.core.prefs
index fa05e8dc94..303d2d75e1 100644
--- a/plugins/org.eclipse.emf.cdo.security.editor/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.security.editor/.settings/org.eclipse.jdt.core.prefs
@@ -103,7 +103,7 @@ org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
diff --git a/plugins/org.eclipse.emf.cdo.security/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.security/.settings/org.eclipse.jdt.core.prefs
index fa05e8dc94..303d2d75e1 100644
--- a/plugins/org.eclipse.emf.cdo.security/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.security/.settings/org.eclipse.jdt.core.prefs
@@ -103,7 +103,7 @@ org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java
index 0e60b529f2..e88c991807 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java
@@ -403,6 +403,7 @@ public class SessionManager extends Container<ISession> implements InternalSessi
}
ByteArrayInputStream baos = new ByteArrayInputStream(authenticationServer.handleResponse(response));
+ @SuppressWarnings("resource")
ExtendedDataInputStream stream = new ExtendedDataInputStream(baos);
String userID = stream.readString();
char[] password = stream.readString().toCharArray();
diff --git a/plugins/org.eclipse.emf.cdo.tests.uml/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.tests.uml/.settings/org.eclipse.jdt.core.prefs
index 39dc7123cc..25e1f12044 100644
--- a/plugins/org.eclipse.emf.cdo.tests.uml/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.tests.uml/.settings/org.eclipse.jdt.core.prefs
@@ -94,7 +94,7 @@ org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
diff --git a/plugins/org.eclipse.emf.cdo.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.tests/.settings/org.eclipse.jdt.core.prefs
index 39dc7123cc..25e1f12044 100644
--- a/plugins/org.eclipse.emf.cdo.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.tests/.settings/org.eclipse.jdt.core.prefs
@@ -94,7 +94,7 @@ org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java
index c50865cc36..1be2dd801d 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java
@@ -642,6 +642,7 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf
try
{
out = new FileOutputStream("multi-view-commit.log", true);
+ @SuppressWarnings("resource")
PrintStream stream = new PrintStream(out);
stream.println(getCurrentTest().getCodeLink());
stream.flush();
diff --git a/plugins/org.eclipse.emf.cdo.transfer.repository/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.transfer.repository/.settings/org.eclipse.jdt.core.prefs
index b0a439e044..cc4a56b6c5 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.repository/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.transfer.repository/.settings/org.eclipse.jdt.core.prefs
@@ -103,7 +103,7 @@ org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
diff --git a/plugins/org.eclipse.emf.cdo.transfer.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.transfer.ui/.settings/org.eclipse.jdt.core.prefs
index b0a439e044..cc4a56b6c5 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.transfer.ui/.settings/org.eclipse.jdt.core.prefs
@@ -103,7 +103,7 @@ org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
diff --git a/plugins/org.eclipse.emf.cdo.transfer.workspace.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.transfer.workspace.ui/.settings/org.eclipse.jdt.core.prefs
index b0a439e044..cc4a56b6c5 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.workspace.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.transfer.workspace.ui/.settings/org.eclipse.jdt.core.prefs
@@ -103,7 +103,7 @@ org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
diff --git a/plugins/org.eclipse.emf.cdo.transfer.workspace/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.transfer.workspace/.settings/org.eclipse.jdt.core.prefs
index b0a439e044..cc4a56b6c5 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.workspace/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.transfer.workspace/.settings/org.eclipse.jdt.core.prefs
@@ -103,7 +103,7 @@ org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
diff --git a/plugins/org.eclipse.emf.cdo.transfer/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.transfer/.settings/org.eclipse.jdt.core.prefs
index b0a439e044..cc4a56b6c5 100644
--- a/plugins/org.eclipse.emf.cdo.transfer/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.transfer/.settings/org.eclipse.jdt.core.prefs
@@ -103,7 +103,7 @@ org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
diff --git a/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF
index 726a92585e..232325f898 100644
--- a/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.ui;singleton:=true
-Bundle-Version: 4.2.0.qualifier
+Bundle-Version: 4.2.100.qualifier
Bundle-Activator: org.eclipse.emf.cdo.internal.ui.bundle.OM$Activator
Bundle-Vendor: %providerName
Bundle-ClassPath: .
@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)";reso
org.eclipse.emf.cdo.transfer.ui;bundle-version="[4.2.0,5.0.0)";visibility:=reexport,
org.eclipse.emf.cdo.transfer.repository;bundle-version="[4.2.0,5.0.0)";visibility:=reexport,
org.eclipse.emf.cdo.ui.shared;bundle-version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.emf.cdo.internal.ui;version="4.2.0";
+Export-Package: org.eclipse.emf.cdo.internal.ui;version="4.2.100";
x-friends:="org.eclipse.emf.cdo.ui.defs,
org.eclipse.emf.cdo.ui.ide,
org.eclipse.emf.cdo.ui.location,
@@ -32,15 +32,15 @@ Export-Package: org.eclipse.emf.cdo.internal.ui;version="4.2.0";
org.eclipse.emf.cdo.explorer,
org.eclipse.emf.cdo.ui.team,
org.eclipse.emf.cdo.ui.compare",
- org.eclipse.emf.cdo.internal.ui.actions;version="4.2.0";
+ org.eclipse.emf.cdo.internal.ui.actions;version="4.2.100";
x-friends:="org.eclipse.emf.cdo.ui.defs,
org.eclipse.emf.cdo.ui.ide,
org.eclipse.emf.cdo.ui.location,
org.eclipse.emf.cdo.tests.ui,
org.eclipse.emf.cdo.dawn.ui,
org.eclipse.emf.cdo.explorer",
- org.eclipse.emf.cdo.internal.ui.bundle;version="4.2.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.ui.dialogs;version="4.2.0";
+ org.eclipse.emf.cdo.internal.ui.bundle;version="4.2.100";x-internal:=true,
+ org.eclipse.emf.cdo.internal.ui.dialogs;version="4.2.100";
x-friends:="org.eclipse.emf.cdo.ui.defs,
org.eclipse.emf.cdo.ui.ide,
org.eclipse.emf.cdo.ui.location,
@@ -48,56 +48,56 @@ Export-Package: org.eclipse.emf.cdo.internal.ui;version="4.2.0";
org.eclipse.emf.cdo.dawn.ui,
org.eclipse.emf.cdo.explorer,
org.eclipse.emf.cdo.ui.compare",
- org.eclipse.emf.cdo.internal.ui.dnd;version="4.2.0";
+ org.eclipse.emf.cdo.internal.ui.dnd;version="4.2.100";
x-friends:="org.eclipse.emf.cdo.ui.defs,
org.eclipse.emf.cdo.ui.ide,
org.eclipse.emf.cdo.ui.location,
org.eclipse.emf.cdo.tests.ui,
org.eclipse.emf.cdo.dawn.ui,
org.eclipse.emf.cdo.explorer",
- org.eclipse.emf.cdo.internal.ui.editor;version="4.2.0";
+ org.eclipse.emf.cdo.internal.ui.editor;version="4.2.100";
x-friends:="org.eclipse.emf.cdo.ui.defs,
org.eclipse.emf.cdo.ui.ide,
org.eclipse.emf.cdo.ui.location,
org.eclipse.emf.cdo.tests.ui,
org.eclipse.emf.cdo.dawn.ui,
org.eclipse.emf.cdo.explorer",
- org.eclipse.emf.cdo.internal.ui.filters;version="4.2.0";
+ org.eclipse.emf.cdo.internal.ui.filters;version="4.2.100";
x-friends:="org.eclipse.emf.cdo.ui.defs,
org.eclipse.emf.cdo.ui.ide,
org.eclipse.emf.cdo.ui.location,
org.eclipse.emf.cdo.tests.ui,
org.eclipse.emf.cdo.dawn.ui,
org.eclipse.emf.cdo.explorer",
- org.eclipse.emf.cdo.internal.ui.history;version="4.2.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.ui.messages;version="4.2.0";x-friends:="org.eclipse.emf.cdo.tests.ui",
- org.eclipse.emf.cdo.internal.ui.perspectives;version="4.2.0";
+ org.eclipse.emf.cdo.internal.ui.history;version="4.2.100";x-internal:=true,
+ org.eclipse.emf.cdo.internal.ui.messages;version="4.2.100";x-friends:="org.eclipse.emf.cdo.tests.ui",
+ org.eclipse.emf.cdo.internal.ui.perspectives;version="4.2.100";
x-friends:="org.eclipse.emf.cdo.ui.defs,
org.eclipse.emf.cdo.ui.ide,
org.eclipse.emf.cdo.ui.location,
org.eclipse.emf.cdo.tests.ui,
org.eclipse.emf.cdo.dawn.ui,
org.eclipse.emf.cdo.explorer",
- org.eclipse.emf.cdo.internal.ui.preferences;version="4.2.0";
+ org.eclipse.emf.cdo.internal.ui.preferences;version="4.2.100";
x-friends:="org.eclipse.emf.cdo.ui.defs,
org.eclipse.emf.cdo.ui.ide,
org.eclipse.emf.cdo.ui.location,
org.eclipse.emf.cdo.tests.ui,
org.eclipse.emf.cdo.dawn.ui,
org.eclipse.emf.cdo.explorer",
- org.eclipse.emf.cdo.internal.ui.transfer;version="4.2.0";
+ org.eclipse.emf.cdo.internal.ui.transfer;version="4.2.100";
x-friends:="org.eclipse.emf.cdo.ui.defs,
org.eclipse.emf.cdo.ui.ide,
org.eclipse.emf.cdo.ui.location,
org.eclipse.emf.cdo.tests.ui,
org.eclipse.emf.cdo.dawn.ui,
org.eclipse.emf.cdo.explorer",
- org.eclipse.emf.cdo.internal.ui.views;version="4.2.0";
+ org.eclipse.emf.cdo.internal.ui.views;version="4.2.100";
x-friends:="org.eclipse.emf.cdo.ui.defs,
org.eclipse.emf.cdo.ui.ide,
org.eclipse.emf.cdo.ui.location,
org.eclipse.emf.cdo.tests.ui,
org.eclipse.emf.cdo.dawn.ui,
org.eclipse.emf.cdo.explorer",
- org.eclipse.emf.cdo.ui;version="4.2.0",
- org.eclipse.emf.cdo.ui.widgets;version="4.2.0"
+ org.eclipse.emf.cdo.ui;version="4.2.100",
+ org.eclipse.emf.cdo.ui.widgets;version="4.2.100"
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/transfer/RepositoryPluginDropAdapter.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/transfer/RepositoryPluginDropAdapter.java
index b7e0504745..11e571f744 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/transfer/RepositoryPluginDropAdapter.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/transfer/RepositoryPluginDropAdapter.java
@@ -104,6 +104,7 @@ public class RepositoryPluginDropAdapter implements IDropActionDelegate
try
{
ByteArrayInputStream bais = new ByteArrayInputStream((byte[])source);
+ @SuppressWarnings("resource")
ExtendedDataInputStream in = new ExtendedDataInputStream(bais);
int viewID = in.readInt();
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/transfer/RepositoryTransferDragListener.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/transfer/RepositoryTransferDragListener.java
index bad276f42b..fc8921c56c 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/transfer/RepositoryTransferDragListener.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/transfer/RepositoryTransferDragListener.java
@@ -71,6 +71,7 @@ public class RepositoryTransferDragListener extends DragSourceAdapter
try
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ @SuppressWarnings("resource")
ExtendedDataOutputStream out = new ExtendedDataOutputStream(baos);
CDOView view = null;
diff --git a/plugins/org.eclipse.emf.cdo/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo/.settings/org.eclipse.jdt.core.prefs
index e370c203f2..283058f162 100644
--- a/plugins/org.eclipse.emf.cdo/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo/.settings/org.eclipse.jdt.core.prefs
@@ -17,6 +17,7 @@ org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
@@ -80,6 +81,7 @@ org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warni
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
org.eclipse.jdt.core.compiler.problem.nullReference=warning
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
@@ -100,11 +102,12 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
@@ -123,6 +126,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
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.5
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java
index 8c8b69fa5d..bbddeb55ef 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java
@@ -940,6 +940,7 @@ public final class DBUtil
return update(connection, sql);
}
+ @SuppressWarnings("resource")
public static int select(Connection connection, IDBRowHandler rowHandler, String where, IDBField... fields)
throws DBException
{
diff --git a/plugins/org.eclipse.net4j.http.server/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.http.server/.settings/org.eclipse.jdt.core.prefs
index 357ed72bd3..0f586d4b61 100644
--- a/plugins/org.eclipse.net4j.http.server/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.http.server/.settings/org.eclipse.jdt.core.prefs
@@ -103,7 +103,7 @@ org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
diff --git a/plugins/org.eclipse.net4j.http.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.http.server/META-INF/MANIFEST.MF
index 063ad10138..85dc788238 100644
--- a/plugins/org.eclipse.net4j.http.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.http.server/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.net4j.http.server;singleton:=true
-Bundle-Version: 4.0.200.qualifier
+Bundle-Version: 4.0.300.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resoluti
org.eclipse.equinox.http.registry;bundle-version="[1.0.0,2.0.0)"
Import-Package: javax.servlet;version="[2.3.0,3.0.0)",
javax.servlet.http;version="[2.3.0,3.0.0)"
-Export-Package: org.eclipse.net4j.http.internal.server;version="4.0.200";x-friends:="org.eclipse.net4j.http.tests,org.eclipse.net4j.defs",
- org.eclipse.net4j.http.internal.server.bundle;version="4.0.200";x-internal:=true,
- org.eclipse.net4j.http.internal.server.messages;version="4.0.200";x-internal:=true,
- org.eclipse.net4j.http.server;version="4.0.200"
+Export-Package: org.eclipse.net4j.http.internal.server;version="4.0.300";x-friends:="org.eclipse.net4j.http.tests,org.eclipse.net4j.defs",
+ org.eclipse.net4j.http.internal.server.bundle;version="4.0.300";x-internal:=true,
+ org.eclipse.net4j.http.internal.server.messages;version="4.0.300";x-internal:=true,
+ org.eclipse.net4j.http.server;version="4.0.300"
diff --git a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/Net4jTransportServlet.java b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/Net4jTransportServlet.java
index 3cfa174082..c41516741e 100644
--- a/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/Net4jTransportServlet.java
+++ b/plugins/org.eclipse.net4j.http.server/src/org/eclipse/net4j/http/internal/server/Net4jTransportServlet.java
@@ -76,6 +76,7 @@ public class Net4jTransportServlet extends HttpServlet implements INet4jTranspor
doRequest(req, resp);
}
+ @SuppressWarnings("resource")
protected void doRequest(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
{
if (requestHandler == null)
diff --git a/plugins/org.eclipse.net4j.http.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.http.tests/.settings/org.eclipse.jdt.core.prefs
index fefca84a81..f4a56bc04a 100644
--- a/plugins/org.eclipse.net4j.http.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.http.tests/.settings/org.eclipse.jdt.core.prefs
@@ -94,7 +94,7 @@ org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
diff --git a/plugins/org.eclipse.net4j.http.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.http.tests/META-INF/MANIFEST.MF
index a3b6151c8a..df58a88772 100644
--- a/plugins/org.eclipse.net4j.http.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.http.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.net4j.http.tests;singleton:=true
-Bundle-Version: 4.0.200.qualifier
+Bundle-Version: 4.0.300.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -17,4 +17,4 @@ Import-Package: javax.servlet;version="[2.3.0,3.0.0)",
javax.servlet.http;version="[2.3.0,3.0.0)",
org.apache.commons.httpclient;version="[3.0.1,4.0.0)",
org.apache.commons.httpclient.methods;version="[3.0.1,4.0.0)"
-Export-Package: org.eclipse.net4j.http.tests;version="4.0.200";x-internal:=true
+Export-Package: org.eclipse.net4j.http.tests;version="4.0.300";x-internal:=true
diff --git a/plugins/org.eclipse.net4j.http.tests/src/org/eclipse/net4j/http/tests/HTTPTest.java b/plugins/org.eclipse.net4j.http.tests/src/org/eclipse/net4j/http/tests/HTTPTest.java
index 0dda7ad89b..e175844d5b 100644
--- a/plugins/org.eclipse.net4j.http.tests/src/org/eclipse/net4j/http/tests/HTTPTest.java
+++ b/plugins/org.eclipse.net4j.http.tests/src/org/eclipse/net4j/http/tests/HTTPTest.java
@@ -97,6 +97,7 @@ public class HTTPTest extends AbstractTransportTest
client.executeMethod(method);
InputStream responseBody = method.getResponseBodyAsStream();
+ @SuppressWarnings("resource")
ExtendedDataInputStream in = new ExtendedDataInputStream(responseBody);
int count = in.readInt();
for (int i = 0; i < count; i++)
diff --git a/plugins/org.eclipse.net4j.http.tests/src/org/eclipse/net4j/http/tests/Net4jEchoTestServlet.java b/plugins/org.eclipse.net4j.http.tests/src/org/eclipse/net4j/http/tests/Net4jEchoTestServlet.java
index 958b834d73..7021eed36f 100644
--- a/plugins/org.eclipse.net4j.http.tests/src/org/eclipse/net4j/http/tests/Net4jEchoTestServlet.java
+++ b/plugins/org.eclipse.net4j.http.tests/src/org/eclipse/net4j/http/tests/Net4jEchoTestServlet.java
@@ -46,6 +46,7 @@ public class Net4jEchoTestServlet extends HttpServlet
doRequest(req, resp);
}
+ @SuppressWarnings("resource")
protected void doRequest(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
{
ServletInputStream servletInputStream = req.getInputStream();
diff --git a/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.jdt.core.prefs
index 39dc7123cc..25e1f12044 100644
--- a/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.tests/.settings/org.eclipse.jdt.core.prefs
@@ -94,7 +94,7 @@ org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExpectedIOTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExpectedIOTest.java
index 7b649d61f0..1395655f59 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExpectedIOTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExpectedIOTest.java
@@ -238,6 +238,7 @@ public class ExpectedIOTest extends AbstractOMTest
Thread consumer = new Thread("CONSUMER")
{
+ @SuppressWarnings("resource")
@Override
public void run()
{
@@ -334,6 +335,7 @@ public class ExpectedIOTest extends AbstractOMTest
Thread consumer = new Thread("CONSUMER")
{
+ @SuppressWarnings("resource")
@Override
public void run()
{
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExtendedIOTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExtendedIOTest.java
index 4294c8e2fc..03a23d4da6 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExtendedIOTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExtendedIOTest.java
@@ -22,6 +22,7 @@ import java.util.HashMap;
/**
* @author Eike Stepper
*/
+@SuppressWarnings("resource")
public class ExtendedIOTest extends AbstractOMTest
{
@SuppressWarnings("unchecked")
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/StreamWrapperTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/StreamWrapperTest.java
index 5b31d65838..387d3fa4b0 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/StreamWrapperTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/StreamWrapperTest.java
@@ -24,6 +24,7 @@ import java.io.PrintStream;
*/
public class StreamWrapperTest extends AbstractOMTest
{
+ @SuppressWarnings("resource")
public void testXORStreams() throws Exception
{
int[] key = { 1, 2, 3, 4 };
diff --git a/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF
index a534050abb..77ab8f743c 100644
--- a/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.net4j.util.ui;singleton:=true
-Bundle-Version: 3.3.0.qualifier
+Bundle-Version: 3.3.100.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
@@ -15,17 +15,17 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
org.eclipse.net4j.ui.shared;bundle-version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.net4j.util.internal.ui;version="3.3.0";x-internal:=true,
- org.eclipse.net4j.util.internal.ui.actions;version="3.3.0";x-internal:=true,
- org.eclipse.net4j.util.internal.ui.bundle;version="3.3.0";x-internal:=true,
- org.eclipse.net4j.util.internal.ui.messages;version="3.3.0";x-internal:=true,
- org.eclipse.net4j.util.internal.ui.views;version="3.3.0";x-internal:=true,
- org.eclipse.net4j.util.ui;version="3.3.0",
- org.eclipse.net4j.util.ui.actions;version="3.3.0",
- org.eclipse.net4j.util.ui.container;version="3.3.0",
- org.eclipse.net4j.util.ui.dnd;version="3.3.0",
- org.eclipse.net4j.util.ui.prefs;version="3.3.0",
- org.eclipse.net4j.util.ui.proposals;version="3.3.0",
- org.eclipse.net4j.util.ui.security;version="3.3.0",
- org.eclipse.net4j.util.ui.views;version="3.3.0",
- org.eclipse.net4j.util.ui.widgets;version="3.3.0"
+Export-Package: org.eclipse.net4j.util.internal.ui;version="3.3.100";x-internal:=true,
+ org.eclipse.net4j.util.internal.ui.actions;version="3.3.100";x-internal:=true,
+ org.eclipse.net4j.util.internal.ui.bundle;version="3.3.100";x-internal:=true,
+ org.eclipse.net4j.util.internal.ui.messages;version="3.3.100";x-internal:=true,
+ org.eclipse.net4j.util.internal.ui.views;version="3.3.100";x-internal:=true,
+ org.eclipse.net4j.util.ui;version="3.3.100",
+ org.eclipse.net4j.util.ui.actions;version="3.3.100",
+ org.eclipse.net4j.util.ui.container;version="3.3.100",
+ org.eclipse.net4j.util.ui.dnd;version="3.3.100",
+ org.eclipse.net4j.util.ui.prefs;version="3.3.100",
+ org.eclipse.net4j.util.ui.proposals;version="3.3.100",
+ org.eclipse.net4j.util.ui.security;version="3.3.100",
+ org.eclipse.net4j.util.ui.views;version="3.3.100",
+ org.eclipse.net4j.util.ui.widgets;version="3.3.100"
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/DNDTransfer.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/DNDTransfer.java
index ac22a8ed04..ccfbd40a8e 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/DNDTransfer.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/DNDTransfer.java
@@ -74,6 +74,7 @@ public abstract class DNDTransfer<TYPE> extends ByteArrayTransfer
}
}
+ @SuppressWarnings("resource")
@Override
protected Object nativeToJava(TransferData transferData)
{
diff --git a/plugins/org.eclipse.net4j.util/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.util/.settings/org.eclipse.jdt.core.prefs
index fefca84a81..f4a56bc04a 100644
--- a/plugins/org.eclipse.net4j.util/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.util/.settings/org.eclipse.jdt.core.prefs
@@ -94,7 +94,7 @@ org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedIOUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedIOUtil.java
index f9c9634626..60814014a7 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedIOUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedIOUtil.java
@@ -91,14 +91,15 @@ public final class ExtendedIOUtil
public static void writeObject(final DataOutput out, Object object) throws IOException
{
- ObjectOutput wrapper = null;
+ ObjectOutput objectOutput = null;
if (out instanceof ObjectOutput)
{
- wrapper = (ObjectOutput)out;
+ objectOutput = (ObjectOutput)out;
}
else
{
- wrapper = new ObjectOutputStream(new OutputStream()
+ @SuppressWarnings("resource")
+ ObjectOutputStream wrapper = new ObjectOutputStream(new OutputStream()
{
@Override
public void write(int b) throws IOException
@@ -106,9 +107,11 @@ public final class ExtendedIOUtil
out.writeByte((b & 0xff) + Byte.MIN_VALUE);
}
});
+
+ objectOutput = wrapper;
}
- wrapper.writeObject(object);
+ objectOutput.writeObject(object);
}
public static Object readObject(final DataInput in) throws IOException
@@ -123,14 +126,15 @@ public final class ExtendedIOUtil
public static Object readObject(final DataInput in, final ClassResolver classResolver) throws IOException
{
- ObjectInput wrapper = null;
+ ObjectInput objectInput = null;
if (in instanceof ObjectInput)
{
- wrapper = (ObjectInput)in;
+ objectInput = (ObjectInput)in;
}
else
{
- wrapper = new ObjectInputStream(new InputStream()
+ @SuppressWarnings("resource")
+ ObjectInputStream wrapper = new ObjectInputStream(new InputStream()
{
@Override
public int read() throws IOException
@@ -159,11 +163,13 @@ public final class ExtendedIOUtil
return super.resolveClass(desc);
}
};
+
+ objectInput = wrapper;
}
try
{
- return wrapper.readObject();
+ return objectInput.readObject();
}
catch (ClassNotFoundException ex)
{
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/GZIPStreamWrapper.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/GZIPStreamWrapper.java
index 1b064a05d3..74f2c025bf 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/GZIPStreamWrapper.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/GZIPStreamWrapper.java
@@ -64,6 +64,7 @@ public class GZIPStreamWrapper implements IStreamWrapper
public static void main(String[] args) throws Exception
{
final PipedOutputStream pos = new PipedOutputStream();
+ @SuppressWarnings("resource")
final PipedInputStream pis = new PipedInputStream(pos);
final GZIPOutputStream gos = new GZIPOutputStream(pos);
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/NIOUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/NIOUtil.java
index cdcb6b6240..eb710dc29b 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/NIOUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/NIOUtil.java
@@ -30,6 +30,7 @@ public final class NIOUtil
/**
* TODO Look at {@link #copy(File, File, boolean)}
*/
+ @SuppressWarnings("resource")
public static void copyFile(File source, File target)
{
// http://www.javalobby.org/java/forums/t17036.html

Back to the top