catch up with branch development
Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/org.eclipse.osbp.utils.ui/src/org/eclipse/osbp/utils/vaadin/SelectDialog.java b/org.eclipse.osbp.utils.ui/src/org/eclipse/osbp/utils/vaadin/SelectDialog.java
index c057bc6..d867aa2 100644
--- a/org.eclipse.osbp.utils.ui/src/org/eclipse/osbp/utils/vaadin/SelectDialog.java
+++ b/org.eclipse.osbp.utils.ui/src/org/eclipse/osbp/utils/vaadin/SelectDialog.java
@@ -15,8 +15,10 @@
import java.util.Map;
-import org.eclipse.e4.core.services.events.IEventBroker;
-import org.eclipse.osbp.eventbroker.EventBrokerMsg;
+import org.eclipse.osbp.runtime.common.event.EventDispatcherEvent;
+import org.eclipse.osbp.runtime.common.event.EventDispatcherEvent.EventDispatcherCommand;
+import org.eclipse.osbp.runtime.common.event.EventDispatcherEvent.EventDispatcherDataTag;
+import org.eclipse.osbp.runtime.common.event.IEventDispatcher;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
@@ -25,16 +27,17 @@
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
-public class SelectDialog extends Window {
+public class SelectDialog extends Window { //NOSONAR
/**
*
*/
private static final long serialVersionUID = 3461161019240158996L;
- private IEventBroker eventBroker;
private Label label;
private ComboBox combo;
private Button ok;
- private String uuid;
+ private transient IEventDispatcher eventDispatcher;
+ private String sender;
+ private String topic;
public SelectDialog() {
super();
@@ -57,20 +60,19 @@
@Override
public void buttonClick(ClickEvent event) {
- if(eventBroker!=null) {
- EventBrokerMsg msg = new EventBrokerMsg(EventBrokerMsg.QUERY_OK);
- msg.setName((String) combo.getValue());
- eventBroker.send(EventBrokerMsg.QUERY_ANSWER+uuid, msg);
- }
+ EventDispatcherEvent evnt = new EventDispatcherEvent(EventDispatcherCommand.OK, topic, sender);
+ evnt.addItem(EventDispatcherDataTag.OBJECT, combo.getValue());
+ eventDispatcher.sendEvent(evnt);
}
});
subContent.addComponent(ok);
center();
}
- public SelectDialog init(IEventBroker eventBroker, Map<String, String> list, String selectedItem, String messageText, String okText, String uuid) {
- this.eventBroker = eventBroker;
- this.uuid = uuid;
+ public SelectDialog init(IEventDispatcher eventDispatcher, String sender, String topic, Map<String, String> list, String selectedItem, String messageText, String okText) {
+ this.eventDispatcher = eventDispatcher;
+ this.sender = sender;
+ this.topic = topic;
label.setCaption(messageText);
ok.setCaption(okText);
for(String item:list.keySet()) {
