From a83223db79edc64d76cefbc8e2f8ebed07908812 Mon Sep 17 00:00:00 2001
From: Andreas <afdiax@gmail.com>
Date: Sat, 7 May 2016 22:35:53 +0200
Subject: [PATCH] Revert "+mbassador eventbus to reduce coupling between
 components"

This reverts commit b0f751fd52d63e2918ad8e65e4a455cad54ae012.
---
 pom.xml                                       |  5 -----
 umlet-eclipse-plugin/.classpath               |  1 -
 umlet-eclipse-plugin/META-INF/MANIFEST.MF     |  3 +--
 umlet-standalone/pom.xml                      |  4 ----
 umlet-swing/pom.xml                           |  4 ----
 .../com/baselet/control/events/EventBus.java  | 19 -------------------
 6 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 umlet-swing/src/main/java/com/baselet/control/events/EventBus.java

diff --git a/pom.xml b/pom.xml
index 23ba91f8c..339c7c9d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,11 +84,6 @@
 				<artifactId>slf4j-log4j12</artifactId>
 				<version>1.7.13</version>
 			</dependency>
-			<dependency>
-				<groupId>net.engio</groupId>
-				<artifactId>mbassador</artifactId>
-				<version>1.2.4.2</version>
-			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
diff --git a/umlet-eclipse-plugin/.classpath b/umlet-eclipse-plugin/.classpath
index 9eb5b91b6..d2466c687 100644
--- a/umlet-eclipse-plugin/.classpath
+++ b/umlet-eclipse-plugin/.classpath
@@ -26,6 +26,5 @@
 	<classpathentry exported="true" kind="lib" path="lib/autocomplete.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jlibeps.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/slf4j-api.jar"/>
-	<classpathentry kind="lib" path="lib/mbassador.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/umlet-eclipse-plugin/META-INF/MANIFEST.MF b/umlet-eclipse-plugin/META-INF/MANIFEST.MF
index 8f6ec41e7..9f4b986b7 100644
--- a/umlet-eclipse-plugin/META-INF/MANIFEST.MF
+++ b/umlet-eclipse-plugin/META-INF/MANIFEST.MF
@@ -10,8 +10,7 @@ Bundle-ClassPath: .,lib/umlet-elements.jar,lib/smtp.jar,lib/bcel.jar,l
  .jar,lib/batik-awt-util.jar,lib/batik-svggen.jar,lib/itextpdf.jar,lib
  /batik-dom.jar,lib/batik-util.jar,lib/batik-ext.jar,lib/ecj.jar,lib/r
  syntaxtextarea.jar,lib/mailapi.jar,lib/slf4j-log4j12.jar,lib/autocomp
- lete.jar,lib/jlibeps.jar,lib/slf4j-api.jar,lib/mbassador.jar,lib/umle
- t-swing.jar
+ lete.jar,lib/jlibeps.jar,lib/slf4j-api.jar,lib/umlet-swing.jar
 Bundle-Activator: com.baselet.plugin.MainPlugin
 Export-Package: com.baselet.plugin,com.baselet.plugin.gui,com.baselet.
  plugin.wizard
diff --git a/umlet-standalone/pom.xml b/umlet-standalone/pom.xml
index 4c181e3f3..abbec9e38 100644
--- a/umlet-standalone/pom.xml
+++ b/umlet-standalone/pom.xml
@@ -26,10 +26,6 @@
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>net.engio</groupId>
-			<artifactId>mbassador</artifactId>
-		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/umlet-swing/pom.xml b/umlet-swing/pom.xml
index 4225f7ee7..16e80f08e 100644
--- a/umlet-swing/pom.xml
+++ b/umlet-swing/pom.xml
@@ -156,10 +156,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>net.engio</groupId>
-			<artifactId>mbassador</artifactId>
-		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/umlet-swing/src/main/java/com/baselet/control/events/EventBus.java b/umlet-swing/src/main/java/com/baselet/control/events/EventBus.java
deleted file mode 100644
index 5d46ede19..000000000
--- a/umlet-swing/src/main/java/com/baselet/control/events/EventBus.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.baselet.control.events;
-
-import net.engio.mbassy.bus.MBassador;
-
-/**
- * Umlet currently uses a single synchronous event bus.
- * MBassador uses weak references for subscribers, therefore unsubscribing is not necessary
- */
-public class EventBus {
-	private static MBassador<Object> bus = new MBassador<Object>();
-
-	public static void publish(Object event) {
-		bus.publish(event);
-	}
-
-	public static void subscribe(Object listener) {
-		bus.subscribe(listener);
-	}
-}