Revision 5221978c
Added by Patrick Plitzner over 6 years ago
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorE4.java | ||
---|---|---|
14 | 14 |
import javax.annotation.PostConstruct; |
15 | 15 |
import javax.inject.Inject; |
16 | 16 |
|
17 |
import org.eclipse.core.runtime.IProgressMonitor; |
|
18 |
import org.eclipse.core.runtime.NullProgressMonitor; |
|
17 | 19 |
import org.eclipse.e4.ui.di.Persist; |
18 | 20 |
import org.eclipse.e4.ui.model.application.ui.MDirtyable; |
19 | 21 |
import org.eclipse.e4.ui.services.EMenuService; |
... | ... | |
42 | 44 |
import eu.etaxonomy.taxeditor.model.IPartContentHasMedia; |
43 | 45 |
import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; |
44 | 46 |
import eu.etaxonomy.taxeditor.store.CdmStore; |
47 |
import eu.etaxonomy.taxeditor.workbench.part.IE4SavablePart; |
|
45 | 48 |
|
46 | 49 |
/** |
47 | 50 |
* |
... | ... | |
50 | 53 |
* |
51 | 54 |
*/ |
52 | 55 |
public class BulkEditorE4 implements IPartContentHasDetails, IConversationEnabled, IPostOperationEnabled, |
53 |
IDirtyMarkable, IDerivedUnitFacadePart, IPartContentHasFactualData, IPartContentHasMedia { |
|
54 |
|
|
55 |
private BulkEditorSearchE4 searchBar = null; |
|
56 |
IDirtyMarkable, IDerivedUnitFacadePart, IPartContentHasFactualData, IPartContentHasMedia, IE4SavablePart { |
|
56 | 57 |
|
57 | 58 |
@Inject |
58 | 59 |
private MDirtyable dirty; |
... | ... | |
77 | 78 |
public void init(AbstractBulkEditorInput<?> input){ |
78 | 79 |
this.input = input; |
79 | 80 |
AbstractBulkEditorInput<?> bulkEditorInput = input; |
80 |
searchBar = new BulkEditorSearchE4(this, topComposite, SWT.NONE); |
|
81 |
BulkEditorSearchE4 searchBar = new BulkEditorSearchE4(this, topComposite, SWT.NONE);
|
|
81 | 82 |
//layout needed because the search bar is added after @PostConstuct method |
82 | 83 |
topComposite.getParent().layout(); |
83 | 84 |
|
... | ... | |
123 | 124 |
|
124 | 125 |
} |
125 | 126 |
|
126 |
@Persist |
|
127 |
public void save() { |
|
127 |
@Override |
|
128 |
@Persist |
|
129 |
public void save(IProgressMonitor monitor) { |
|
128 | 130 |
input.saveModel(); |
129 | 131 |
|
130 | 132 |
// commit the conversation and start a new transaction immediately |
... | ... | |
152 | 154 |
MessageDialog dialog =new MessageDialog(topComposite.getShell(), "Save changes", null, "You have made changes that must be saved before this query can be executed. Would you like to proceed?", MessageDialog.QUESTION,labels, 0); |
153 | 155 |
int result = dialog.open(); |
154 | 156 |
if (result == 0) { |
155 |
save(); |
|
157 |
save(new NullProgressMonitor());
|
|
156 | 158 |
} else if (result == 2){ |
157 | 159 |
return; |
158 | 160 |
} |
... | ... | |
212 | 214 |
*/ |
213 | 215 |
@Override |
214 | 216 |
public void changed(Object element) { |
217 |
dirty.setDirty(true); |
|
215 | 218 |
} |
216 | 219 |
|
217 | 220 |
/** |
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/ConvertPerson2TeamHandlerE4.java | ||
---|---|---|
10 | 10 |
|
11 | 11 |
import javax.inject.Named; |
12 | 12 |
|
13 |
import org.eclipse.core.runtime.NullProgressMonitor; |
|
13 | 14 |
import org.eclipse.e4.core.di.annotations.CanExecute; |
14 | 15 |
import org.eclipse.e4.core.di.annotations.Execute; |
15 | 16 |
import org.eclipse.e4.ui.model.application.ui.basic.MPart; |
... | ... | |
46 | 47 |
boolean proceed = MessageDialog.openQuestion(null, |
47 | 48 |
"Save changes", "You have made changes that must be saved before this query can be executed. Would you like to proceed?"); |
48 | 49 |
if (proceed) { |
49 |
editor.save(); |
|
50 |
editor.save(new NullProgressMonitor());
|
|
50 | 51 |
} else { |
51 | 52 |
return; |
52 | 53 |
} |
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/ConvertTeam2PersonHandlerE4.java | ||
---|---|---|
10 | 10 |
|
11 | 11 |
import javax.inject.Named; |
12 | 12 |
|
13 |
import org.eclipse.core.runtime.NullProgressMonitor; |
|
13 | 14 |
import org.eclipse.e4.core.di.annotations.CanExecute; |
14 | 15 |
import org.eclipse.e4.core.di.annotations.Execute; |
15 | 16 |
import org.eclipse.e4.ui.model.application.ui.basic.MPart; |
... | ... | |
44 | 45 |
boolean proceed = MessageDialog.openQuestion(null, |
45 | 46 |
"Save changes", "You have made changes that must be saved before this query can be executed. Would you like to proceed?"); |
46 | 47 |
if (proceed) { |
47 |
editor.save(); |
|
48 |
editor.save(new NullProgressMonitor());
|
|
48 | 49 |
} else { |
49 | 50 |
return; |
50 | 51 |
} |
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/DeleteHandlerE4.java | ||
---|---|---|
16 | 16 |
import javax.inject.Named; |
17 | 17 |
|
18 | 18 |
import org.eclipse.core.runtime.IStatus; |
19 |
import org.eclipse.core.runtime.NullProgressMonitor; |
|
19 | 20 |
import org.eclipse.e4.core.di.annotations.CanExecute; |
20 | 21 |
import org.eclipse.e4.core.di.annotations.Execute; |
21 | 22 |
import org.eclipse.e4.ui.model.application.ui.basic.MPart; |
... | ... | |
95 | 96 |
boolean proceed = MessageDialog.openQuestion(null, |
96 | 97 |
"Save changes", "You have made changes that must be saved before this query can be executed. Would you like to proceed?"); |
97 | 98 |
if (proceed) { |
98 |
editor.save(); |
|
99 |
editor.save(new NullProgressMonitor());
|
|
99 | 100 |
} else { |
100 | 101 |
return ; |
101 | 102 |
} |
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/MergeGroupHandlerE4.java | ||
---|---|---|
12 | 12 |
|
13 | 13 |
import javax.inject.Named; |
14 | 14 |
|
15 |
import org.eclipse.core.runtime.NullProgressMonitor; |
|
15 | 16 |
import org.eclipse.e4.core.di.annotations.CanExecute; |
16 | 17 |
import org.eclipse.e4.core.di.annotations.Execute; |
17 | 18 |
import org.eclipse.e4.ui.model.application.ui.basic.MPart; |
... | ... | |
51 | 52 |
boolean proceed = MessageDialog.openQuestion(null, |
52 | 53 |
"Save changes", "You have made changes that must be saved before this query can be executed. Would you like to proceed?"); |
53 | 54 |
if (proceed) { |
54 |
editor.save(); |
|
55 |
editor.save(new NullProgressMonitor());
|
|
55 | 56 |
} else { |
56 | 57 |
return ; |
57 | 58 |
} |
Also available in: Unified diff
fix #7000 Enable details view editing for bulke editor