Project

General

Profile

« Previous | Next » 

Revision 30023bc4

Added by Katja Luther over 2 years ago

ref #6774: fix export wizard for owl export

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/owl/OwlTermExportComposite.java
16 16
import org.eclipse.swt.widgets.Text;
17 17

  
18 18
import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermSorter;
19
import eu.etaxonomy.taxeditor.editor.definedterm.TermTreeViewerComparator;
20 19
import eu.etaxonomy.taxeditor.editor.definedterm.RootElementsOnlyTreeContentProvider;
21 20
import eu.etaxonomy.taxeditor.editor.definedterm.TermDtoLabelProvider;
21
import eu.etaxonomy.taxeditor.editor.definedterm.TermTreeViewerComparator;
22 22
import eu.etaxonomy.taxeditor.model.ImageResources;
23 23
import eu.etaxonomy.taxeditor.preference.wizard.CheckBoxTreeComposite;
24 24
import eu.etaxonomy.taxeditor.termtree.TermTreeLabelProvider;
......
51 51
        selectFeatureTreeComposite.getViewer().setComparator(new TermTreeViewerComparator());
52 52
        selectFeatureTreeComposite.setLayoutData(layoutData);
53 53

  
54
        txtExportDirectory = new Text(this, style);
54
        txtExportDirectory = new Text(this, SWT.BORDER);
55 55
        txtExportDirectory.setEditable(false);
56 56
        txtExportDirectory.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
57 57

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/owl/OwlTermExportWizard.java
56 56
    public boolean performFinish() {
57 57
        configurator.setFeatureTreeUuids(exportPage.getSelectedTrees());
58 58
        configurator.setVocabularyUuids(exportPage.getSelectedVocabularies());
59
        configurator.setDestination(new File(exportPage.getExportDirectory() + File.separator+ "export.owl"));
59 60

  
60 61
        if(exportPage.getExportDirectory()!=null){
61 62
            // create job
62
            Job job = CdmStore.getExportManager().createIOServiceJob(configurator, new File(exportPage.getExportDirectory()));
63
            Job job = CdmStore.getExportManager().createIOServiceJob(configurator, new File(exportPage.getExportDirectory()+ File.separator+ "export.owl"));
63 64
            // configure the job
64 65
            job.setProperty(IProgressConstants.KEEP_PROPERTY, true);
65 66
            job.setUser(true);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/owl/OwlTermExportWizardPage.java
19 19
import org.eclipse.swt.events.SelectionAdapter;
20 20
import org.eclipse.swt.events.SelectionEvent;
21 21
import org.eclipse.swt.widgets.Composite;
22
import org.eclipse.swt.widgets.FileDialog;
22
import org.eclipse.swt.widgets.DirectoryDialog;
23 23

  
24 24
import eu.etaxonomy.cdm.api.service.ITermTreeService;
25 25
import eu.etaxonomy.cdm.api.service.IVocabularyService;
......
27 27
import eu.etaxonomy.cdm.model.term.TermTree;
28 28
import eu.etaxonomy.cdm.model.term.TermType;
29 29
import eu.etaxonomy.cdm.persistence.dto.TermVocabularyDto;
30
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
30 31
import eu.etaxonomy.taxeditor.store.CdmStore;
31 32

  
32 33
/**
......
36 37
public class OwlTermExportWizardPage extends WizardPage {
37 38

  
38 39
    private OwlTermExportComposite composite;
39

  
40
    private DirectoryDialog folderDialog;
41
    private static final String EXPORT_FOLDER ="EXPORT_FOLDER";
40 42
    protected OwlTermExportWizardPage(String pageName) {
41 43
        super(pageName);
42 44
        setTitle("OWL Term Export");
......
61 63
        composite.getSelectFeatureTreeComposite().getViewer().setInput(trees);
62 64
        composite.getSelectFeatureTreeComposite().getViewer().addCheckStateListener(e->updateButtons());
63 65

  
64

  
66
        folderDialog = new DirectoryDialog(parent.getShell());
67
        String exportFolder = PreferencesUtil.getStringValue(EXPORT_FOLDER, true);
68
        folderDialog.setFilterPath(exportFolder);
65 69
        composite.getBtnSelectDirectory().addSelectionListener(new SelectionAdapter() {
66 70
            @Override
67 71
            public void widgetSelected(SelectionEvent e) {
68
                FileDialog dialog = new FileDialog(parent.getShell());
69
                String[] filterNames = {
70
                        "Web Ontology Language (*.owl)",
71
                        "Extensible Markup Language (*.xml)",
72
                        "All files (*.*)"
73
                        };
74
                String[] filterExtensions = { "*.owl", "*.xml", "*.*"};
75

  
76
                dialog.setOverwrite(true);
77
                dialog.setFilterNames(filterNames);
78
                dialog.setFilterExtensions(filterExtensions);
79
                String fileString = dialog.open();
80
                if(fileString!=null){
81
                    composite.getTxtExportDirectory().setText(fileString);
72
                super.widgetSelected(e);
73

  
74
                String path = folderDialog.open();
75
                if (path != null) { // a folder was selected
76
                    composite.getTxtExportDirectory().setText(path);
77
                    PreferencesUtil.setStringValue(EXPORT_FOLDER, path);
82 78
                    updateButtons();
83 79
                }
80

  
81

  
82
//                FileDialog dialog = new FileDialog(parent.getShell());
83
//                String[] filterNames = {
84
//                        "Web Ontology Language (*.owl)",
85
//                        "Extensible Markup Language (*.xml)",
86
//                        "All files (*.*)"
87
//                        };
88
//                String[] filterExtensions = { "*.owl", "*.xml", "*.*"};
89
//
90
//                dialog.setOverwrite(true);
91
//                dialog.setFilterNames(filterNames);
92
//                dialog.setFilterExtensions(filterExtensions);
93
//                String fileString = dialog.open();
94
//                if(fileString!=null){
95
//                    composite.getTxtExportDirectory().setText(fileString);
96
//
97
//                }
84 98
            }
85 99
        });
86 100
        setControl(composite);

Also available in: Unified diff