summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaspar De Groot2011-11-21 04:01:11 (EST)
committerCaspar De Groot2011-11-21 04:01:11 (EST)
commitb027e3854ce939977741c70760fb5edaa67ab66b (patch)
treeb1b6fc3840bba1758fd3f6a27b87a1f72e632623
parent35eaeebf332255ce6a83ffb8df417305a8c04263 (diff)
downloadcdo-b027e3854ce939977741c70760fb5edaa67ab66b.zip
cdo-b027e3854ce939977741c70760fb5edaa67ab66b.tar.gz
cdo-b027e3854ce939977741c70760fb5edaa67ab66b.tar.bz2
Fixed some warnings
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerBrowser.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/AbstractCapabilityTest.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java2
-rw-r--r--plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java1
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/FiniteStateMachine.java4
5 files changed, 3 insertions, 6 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerBrowser.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerBrowser.java
index 5a72db2..b6aaeed 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerBrowser.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerBrowser.java
@@ -709,7 +709,6 @@ public class CDOServerBrowser extends Worker
{
if (versionsBuilder != null)
{
- @SuppressWarnings("resource")
PrintStream out = out();
out.println("<tr>");
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/AbstractCapabilityTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/AbstractCapabilityTest.java
index c261281..d820df9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/AbstractCapabilityTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/capabilities/AbstractCapabilityTest.java
@@ -50,7 +50,6 @@ public abstract class AbstractCapabilityTest extends TestCase
Connection transaction1 = provider.getConnection();
transaction1.setAutoCommit(false);
- @SuppressWarnings("resource")
Statement tx1stmt = transaction1.createStatement();
tx1stmt.executeUpdate("update status_table set status = 'changed' where trans = 'transaction1'");
msg("Read value (transaction 1) is "
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java
index c49ccdd..d65f315 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java
@@ -104,7 +104,7 @@ public class CDOXATransactionImpl implements InternalCDOXATransaction
* <p>
* Contact the authors if you want to have this executed in parallel.
*/
- private static final boolean SEQUENTIAL_EXECUTION = true;
+ private static boolean SEQUENTIAL_EXECUTION = true;
private List<InternalCDOTransaction> transactions = new ArrayList<InternalCDOTransaction>();
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 78f9af6..0aa5005 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
@@ -237,7 +237,6 @@ public final class DBUtil
{
try
{
- @SuppressWarnings("resource")
Statement statement = resultSet.getStatement();
if (statement != null && statement.getMaxRows() != 0)
{
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/FiniteStateMachine.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/FiniteStateMachine.java
index e3f0fc9..81f4ae0 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/FiniteStateMachine.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/FiniteStateMachine.java
@@ -35,10 +35,10 @@ import java.text.MessageFormat;
*/
public abstract class FiniteStateMachine<STATE extends Enum<?>, EVENT extends Enum<?>, SUBJECT> extends Lifecycle
{
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings({ "rawtypes", "deprecation" })
public static final ITransition IGNORE = new IgnoreTransition();
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings({ "rawtypes", "deprecation" })
public static final ITransition FAIL = new FailTransition();
private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, FiniteStateMachine.class);