X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db%2Fsrc%2Forg%2Fsimantics%2Fdb%2FDisposable.java;h=a413837fd3ed4310d32f57b78c39dd6d550f0ea6;hb=b2bb3ff110b5bf929b6d676f0122a15a43358440;hp=62dd7d3500608197a98ee0edb8b5c1570864db3e;hpb=969bd23cab98a79ca9101af33334000879fb60c5;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db/src/org/simantics/db/Disposable.java b/bundles/org.simantics.db/src/org/simantics/db/Disposable.java
index 62dd7d350..a413837fd 100644
--- a/bundles/org.simantics.db/src/org/simantics/db/Disposable.java
+++ b/bundles/org.simantics.db/src/org/simantics/db/Disposable.java
@@ -1,30 +1,40 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2010 Association for Decentralized Information Management
- * in Industry THTH ry.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     VTT Technical Research Centre of Finland - initial API and implementation
- *******************************************************************************/
-package org.simantics.db;
-
-
-/**
- * An interface that services registered via {@link ServiceLocator} can
- * implement to signal the ServiceLocator implementation that they need to be
- * disposed during ServiceLocator disposal.
- * 
- * The {@link #dispose()} method may get called several times which it must be
- * able to handle properly which in most cases means just disposing once with
- * proper synchronization and ignoring any further dispose requests.
- * 
- * @author Tuukka Lehtonen
- */
-public interface Disposable {
-
-    void dispose();
-
-}
+/*******************************************************************************
+ * Copyright (c) 2007, 2010 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.db;
+
+
+/**
+ * An interface that services registered via {@link ServiceLocator} can
+ * implement to signal the ServiceLocator implementation that they need to be
+ * disposed during ServiceLocator disposal.
+ * 
+ * The {@link #dispose()} method may get called several times which it must be
+ * able to handle properly which in most cases means just disposing once with
+ * proper synchronization and ignoring any further dispose requests.
+ * 
+ * @author Tuukka Lehtonen
+ */
+public interface Disposable {
+
+    void dispose();
+
+    static void safeDispose(Disposable d) {
+        if (d != null)
+            d.dispose();
+    }
+
+    static void safeDispose(Object o) {
+        if (o instanceof Disposable)
+            ((Disposable) o).dispose();
+    }
+
+}