From f343b1b565b6c7bab092b33a74a2cf5765382bcb Mon Sep 17 00:00:00 2001
From: Patrick Plitzner
Date: Mon, 7 Sep 2015 13:19:47 +0200
Subject: [PATCH] Close conversation when closing DerivateSearchView
---
.../derivateSearch/DerivateSearchView.java | 34 ++++++-------------
1 file changed, 10 insertions(+), 24 deletions(-)
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java
index 9f950fa3f..93c229adf 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java
@@ -39,9 +39,6 @@ public class DerivateSearchView extends ViewPart implements IContextListener {
CdmStore.getContextManager().addContextListener(this);
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
- */
@Override
public void createPartControl(Composite parent) {
derivateSearchCompositeController = new DerivateSearchCompositeController(parent, this);
@@ -56,9 +53,6 @@ public class DerivateSearchView extends ViewPart implements IContextListener {
control.setMenu(menu);
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
- */
@Override
public void setFocus() {
derivateSearchCompositeController.setFocus();
@@ -68,33 +62,21 @@ public class DerivateSearchView extends ViewPart implements IContextListener {
}
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.model.IContextListener#contextAboutToStop(org.eclipse.ui.IMemento, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public void contextAboutToStop(IMemento memento, IProgressMonitor monitor) {
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.model.IContextListener#contextStop(org.eclipse.ui.IMemento, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public void contextStop(IMemento memento, IProgressMonitor monitor) {
derivateSearchCompositeController.setEnabled(false);
derivateSearchCompositeController.reset();
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.model.IContextListener#contextStart(org.eclipse.ui.IMemento, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public void contextStart(IMemento memento, IProgressMonitor monitor) {
derivateSearchCompositeController.setEnabled(true);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.model.IContextListener#contextRefresh(org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public void contextRefresh(IProgressMonitor monitor) {
initConversation();
@@ -107,20 +89,24 @@ public class DerivateSearchView extends ViewPart implements IContextListener {
}
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.model.IContextListener#workbenchShutdown(org.eclipse.ui.IMemento, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public void workbenchShutdown(IMemento memento, IProgressMonitor monitor) {
}
- /**
- * @return the conversationHolder
- */
public ConversationHolder getConversationHolder() {
if(CdmStore.isActive() && conversationHolder==null){
initConversation();
}
return conversationHolder;
}
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void dispose() {
+ if(conversationHolder!=null){
+ conversationHolder.close();
+ }
+ }
}
--
2.34.1