Revision e3619281
Added by Patrick Plitzner almost 7 years ago
eu.etaxonomy.taxeditor.editor/fragment.e4xmi | ||
---|---|---|
54 | 54 |
<children xsi:type="menu:HandledMenuItem" xmi:id="_wg0-oDulEeeOtqC_3qh40A" elementId="eu.etaxonomy.taxeditor.editor.handledmenuitem.commandlabel54" label="%command.label.54" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.editor/icons/deep-delete-16x16-32.png" command="_fKT-wDulEeeOtqC_3qh40A"/> |
55 | 55 |
</menus> |
56 | 56 |
</elements> |
57 |
<elements xsi:type="basic:PartDescriptor" xmi:id="_R7vxEECaEeeL5JDzMOYK6g" elementId="eu.etaxonomy.taxeditor.editor.workingSet.FeatureTreeBuilderViewPart" label="FeatureTreeBuilder" closeable="true" dirtyable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.workingSet.FeatureTreeBuilderViewPart"/>
|
|
57 |
<elements xsi:type="basic:PartDescriptor" xmi:id="_R7vxEECaEeeL5JDzMOYK6g" elementId="eu.etaxonomy.taxeditor.editor.workingSet.FeatureTreeBuilderViewPart" label="Character Editor" closeable="true" dirtyable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.workingSet.FeatureTreeBuilderViewPart"/>
|
|
58 | 58 |
</fragments> |
59 | 59 |
<fragments xsi:type="fragment:StringModelFragment" xmi:id="__mwtMDVpEee_b7RlBzTDRw" featurename="commands" parentElementId="xpath:/"> |
60 | 60 |
<elements xsi:type="commands:Command" xmi:id="_BjF3ADVqEee_b7RlBzTDRw" elementId="eu.etaxonomy.taxeditor.editor.command.specimeneditor.create_field_unit" commandName="%command.commandname.1"/> |
... | ... | |
73 | 73 |
<elements xsi:type="commands:Command" xmi:id="_YPp1wDvREeeOtqC_3qh40A" elementId="eu.etaxonomy.taxeditor.editor.derivate.delete" commandName="Delete"/> |
74 | 74 |
</fragments> |
75 | 75 |
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_pZmusEalEeeXMc6kSYO7Xg" featurename="children" parentElementId="eu.etaxonomy.taxeditor.menu.showView"> |
76 |
<elements xsi:type="menu:HandledMenuItem" xmi:id="_tvph4EalEeeXMc6kSYO7Xg" elementId="eu.etaxonomy.taxeditor.editor.handledmenuitem.featuretreeeditor" label="FeatureTree Editor" command="_WPjpoDSnEeek0dKsFNy--Q">
|
|
76 |
<elements xsi:type="menu:HandledMenuItem" xmi:id="_tvph4EalEeeXMc6kSYO7Xg" elementId="eu.etaxonomy.taxeditor.editor.handledmenuitem.featuretreeeditor" label="Character Editor" command="_WPjpoDSnEeek0dKsFNy--Q">
|
|
77 | 77 |
<parameters xmi:id="_wJkmoEalEeeXMc6kSYO7Xg" elementId="eu.etaxonomy.taxeditor.editor.parameter.0" name="eu.etaxonomy.taxeditor.workbench.commandparameter.partName" value="eu.etaxonomy.taxeditor.editor.workingSet.FeatureTreeBuilderViewPart"/> |
78 | 78 |
</elements> |
79 | 79 |
</fragments> |
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/FeatureTreeBuilderViewPart.java | ||
---|---|---|
13 | 13 |
|
14 | 14 |
import javax.annotation.PostConstruct; |
15 | 15 |
import javax.annotation.PreDestroy; |
16 |
import javax.inject.Named; |
|
16 | 17 |
|
17 | 18 |
import org.eclipse.e4.ui.di.Focus; |
19 |
import org.eclipse.e4.ui.services.IServiceConstants; |
|
18 | 20 |
import org.eclipse.jface.viewers.TreeViewer; |
19 | 21 |
import org.eclipse.swt.SWT; |
22 |
import org.eclipse.swt.custom.SashForm; |
|
20 | 23 |
import org.eclipse.swt.dnd.DND; |
21 | 24 |
import org.eclipse.swt.dnd.Transfer; |
22 |
import org.eclipse.swt.layout.FillLayout; |
|
25 |
import org.eclipse.swt.layout.GridData; |
|
26 |
import org.eclipse.swt.layout.GridLayout; |
|
23 | 27 |
import org.eclipse.swt.widgets.Composite; |
28 |
import org.eclipse.swt.widgets.Display; |
|
29 |
import org.eclipse.swt.widgets.Shell; |
|
30 |
import org.eclipse.ui.forms.widgets.FormToolkit; |
|
24 | 31 |
|
25 | 32 |
import eu.etaxonomy.cdm.api.service.IFeatureTreeService; |
26 | 33 |
import eu.etaxonomy.cdm.model.description.FeatureTree; |
27 | 34 |
import eu.etaxonomy.taxeditor.featuretree.FeatureNodeTransfer; |
28 | 35 |
import eu.etaxonomy.taxeditor.featuretree.FeatureTreeContentProvider; |
29 | 36 |
import eu.etaxonomy.taxeditor.featuretree.FeatureTreeLabelProvider; |
37 |
import eu.etaxonomy.taxeditor.featuretree.e4.FeatureTreeEditor; |
|
30 | 38 |
import eu.etaxonomy.taxeditor.store.CdmStore; |
31 | 39 |
|
32 | 40 |
/** |
... | ... | |
40 | 48 |
private TreeViewer treeViewerCharacters; |
41 | 49 |
private TreeViewer treeViewerProperties; |
42 | 50 |
private TreeViewer treeViewerStructures; |
51 |
private FeatureTreeEditor editor; |
|
52 |
private final FormToolkit formToolkit = new FormToolkit(Display.getDefault()); |
|
43 | 53 |
|
44 | 54 |
public FeatureTreeBuilderViewPart() { |
45 | 55 |
} |
... | ... | |
48 | 58 |
* Create contents of the view part. |
49 | 59 |
*/ |
50 | 60 |
@PostConstruct |
51 |
public void createControls(Composite parent) { |
|
52 |
parent.setLayout(new FillLayout(SWT.HORIZONTAL));
|
|
61 |
public void createControls(Composite parent, @Named(IServiceConstants.ACTIVE_SHELL)Shell shell) {
|
|
62 |
parent.setLayout(new GridLayout(1, false));
|
|
53 | 63 |
|
54 |
treeViewerStructures = new TreeViewer(parent, SWT.BORDER); |
|
64 |
SashForm sashForm = new SashForm(parent, SWT.NONE); |
|
65 |
sashForm.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1)); |
|
66 |
formToolkit.adapt(sashForm); |
|
67 |
formToolkit.paintBordersFor(sashForm); |
|
55 | 68 |
|
56 |
treeViewerProperties = new TreeViewer(parent, SWT.BORDER);
|
|
69 |
treeViewerStructures = new TreeViewer(sashForm, SWT.BORDER);
|
|
57 | 70 |
|
58 |
treeViewerCharacters = new TreeViewer(parent, SWT.BORDER); |
|
71 |
treeViewerProperties = new TreeViewer(sashForm, SWT.BORDER); |
|
72 |
|
|
73 |
// editor = new FeatureTreeEditor(shell); |
|
74 |
// editor.createControl(sashForm, shell); |
|
75 |
treeViewerCharacters = new TreeViewer(sashForm, SWT.BORDER); |
|
76 |
sashForm.setWeights(new int[] {1, 1, 1}); |
|
59 | 77 |
|
60 | 78 |
init(); |
61 | 79 |
} |
... | ... | |
64 | 82 |
int dndOperations = DND.DROP_COPY | DND.DROP_MOVE; |
65 | 83 |
Transfer[] transfers = new Transfer[] { FeatureNodeTransfer.getInstance() }; |
66 | 84 |
|
67 |
FeatureTree structureFeatureTree = CdmStore.getService(IFeatureTreeService.class).load(UUID.fromString("63d15e75-5f47-47c0-9540-cebe2697f37e"));
|
|
85 |
FeatureTree structureFeatureTree = CdmStore.getService(IFeatureTreeService.class).load(UUID.fromString("546e9c1e-d186-4e3b-838d-7e44586d1b39"));
|
|
68 | 86 |
treeViewerStructures.setContentProvider(new FeatureTreeContentProvider()); |
69 | 87 |
treeViewerStructures.setLabelProvider(new FeatureTreeLabelProvider()); |
70 | 88 |
treeViewerStructures.setInput(structureFeatureTree); |
71 | 89 |
|
72 |
FeatureTree propertiesFeatureTree = CdmStore.getService(IFeatureTreeService.class).load(UUID.fromString("87680e5d-1026-451f-9a18-02d8e80fdaa0"));
|
|
90 |
FeatureTree propertiesFeatureTree = CdmStore.getService(IFeatureTreeService.class).load(UUID.fromString("07543f00-1572-4ba8-b633-4fdb83fb32dd"));
|
|
73 | 91 |
treeViewerProperties.setContentProvider(new FeatureTreeContentProvider()); |
74 | 92 |
treeViewerProperties.setLabelProvider(new FeatureTreeLabelProvider()); |
75 | 93 |
treeViewerProperties.addDragSupport(dndOperations, transfers, new CharacterDragListener(treeViewerStructures, treeViewerProperties)); |
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF | ||
---|---|---|
15 | 15 |
eu.etaxonomy.taxeditor.editor.definedterm, |
16 | 16 |
eu.etaxonomy.taxeditor.editor.definedterm.input, |
17 | 17 |
eu.etaxonomy.taxeditor.featuretree, |
18 |
eu.etaxonomy.taxeditor.featuretree.e4, |
|
18 | 19 |
eu.etaxonomy.taxeditor.handler, |
19 | 20 |
eu.etaxonomy.taxeditor.handler.defaultHandler, |
20 | 21 |
eu.etaxonomy.taxeditor.io, |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeEditor.java | ||
---|---|---|
109 | 109 |
|
110 | 110 |
label_title = new Label(composite_treeTitle, SWT.NULL); |
111 | 111 |
label_title.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1)); |
112 |
label_title.setText("Title");
|
|
112 |
label_title.setText("Feature Tree");
|
|
113 | 113 |
|
114 | 114 |
text_title = new Text(composite_treeTitle, SWT.BORDER); |
115 | 115 |
text_title.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); |
Also available in: Unified diff
minor changes