Task #233 creating of the import target selection page.

de.dlr.sc.virsat.model.extension.cefx.ui/src/de/dlr/sc/virsat/model/extension/cefx/ui/importWizards/CometImportWizard.java

@@ -22,6 +22,7 @@
 
 import java.util.List;
 
+import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
@@ -37,6 +38,8 @@ public class CometImportWizard extends Wizard implements IImportWizard {
 
     private CometImportWizardPage mainPage; 
     private SelectedElementsPage selectedElementsPage;
+    private ImportTargetSelection targetSelectionPage;
+    private IContainer model;
 
     public CometImportWizard() {
         super();
@@ -46,9 +49,12 @@ public CometImportWizard() {
 
     @Override
     public void init(IWorkbench workbench, IStructuredSelection selection) {
+    	this.model = ResourcesPlugin.getWorkspace().getRoot();
         mainPage = new CometImportWizardPage("Configure Comet Server");
+        targetSelectionPage = new ImportTargetSelection(model);
         selectedElementsPage = new SelectedElementsPage("Selected Elements");
         addPage(mainPage);
+        addPage(targetSelectionPage);
         addPage(selectedElementsPage);
     }
 
@@ -88,9 +94,9 @@ public void saveConfigurationTree(ConfigurationTree configurationTree) {
         }
 
         // Ensure that the rootInstance is associated with a resource
-        if (rootInstance.eResource() == null) {
-	            throw new IllegalStateException("StructuralElementInstance's resource is null.");
-        }
+//        if (rootInstance.eResource() == null) {
+//	            throw new IllegalStateException("StructuralElementInstance's resource is null.");
+//        }
 
         // Check if editing domain retrieval is successful
         VirSatTransactionalEditingDomain editingDomain = VirSatEditingDomainRegistry.INSTANCE.getEd(rootInstance);
@@ -99,7 +105,7 @@ public void saveConfigurationTree(ConfigurationTree configurationTree) {
         }
 
         try {
-            Command addCommand = AddCommand.create(editingDomain, rootInstance.eResource(), rootInstance.eResource().getContents(), rootInstance);
+            Command addCommand = AddCommand.create(editingDomain, ,);
             editingDomain.getCommandStack().execute(addCommand);
             editingDomain.saveAll();
 
@@ -112,14 +118,14 @@ public void saveConfigurationTree(ConfigurationTree configurationTree) {
 
     @Override
     public IWizardPage getNextPage(IWizardPage page) {
-        if (page == mainPage) {
-            // Get the selected TreeItems from the mainPage
-            List<TreeItem> checkedItems = mainPage.getCheckedItems();
-
-            // Pass the selected items to the SelectedElementsPage
-            selectedElementsPage.setSelectedElements(checkedItems);
-            return selectedElementsPage;
-        }
+//        if (page == mainPage) {
+//            // Get the selected TreeItems from the mainPage
+//            List<TreeItem> checkedItems = mainPage.getCheckedItems();
+//            
+//            // Pass the selected items to the SelectedElementsPage
+//            selectedElementsPage.setSelectedElements(checkedItems);
+//            return selectedElementsPage;
+//        }
         return super.getNextPage(page);
     }
 

de.dlr.sc.virsat.model.extension.cefx.ui/src/de/dlr/sc/virsat/model/extension/cefx/ui/importWizards/ImportTargetSelection.java

@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2008-2019 German Aerospace Center (DLR), Simulation and Software Technology, Germany.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package de.dlr.sc.virsat.model.extension.cefx.ui.importWizards;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+
+import de.dlr.sc.virsat.model.dvlm.structural.StructuralElementInstance;
+import de.dlr.sc.virsat.model.extension.ps.model.ConfigurationTree;
+import de.dlr.sc.virsat.model.extension.ps.model.ElementConfiguration;
+import de.dlr.sc.virsat.project.ui.contentProvider.VirSatFilteredWrappedTreeContentProvider;
+import de.dlr.sc.virsat.uiengine.ui.wizard.AImportExportPage;
+
+public class ImportTargetSelection extends AImportExportPage {
+
+	protected ImportTargetSelection(String pageName) {
+		super(pageName);
+
+	}
+	protected ImportTargetSelection(IContainer iContainer) {
+		super("Select import target's element", SWT.OPEN);
+		setModel(iContainer);
+		setDescription("Please select a tree to import to and a file to import.");
+	}
+
+
+	@Override
+	public void createControl(Composite parent) {
+		super.createControl(parent);
+		createTreeViewer();
+
+		Label label = new Label((Composite) getControl(), SWT.NONE);
+		label.setText("All Geometry files will be imported into the documents folder of the containing model element.");
+	}
+
+	/**
+	 * Create a tree viewer with filters to show only relevant tree elements for CAD
+	 * import /export
+	 */
+	protected void createTreeViewer() {
+		TreeViewer treeViewer = createTreeUI();
+		VirSatFilteredWrappedTreeContentProvider filteredCp = (VirSatFilteredWrappedTreeContentProvider) treeViewer
+				.getContentProvider();
+		filteredCp.addStructuralElementIdFilter(ConfigurationTree.FULL_QUALIFIED_STRUCTURAL_ELEMENT_NAME);
+		filteredCp.addStructuralElementIdFilter(ElementConfiguration.FULL_QUALIFIED_STRUCTURAL_ELEMENT_NAME);
+	}
+
+	@Override
+	public boolean isSelectionValid() {
+		Object selection = getSelection();
+		return selection instanceof StructuralElementInstance;
+	}
+
+	/**
+	 * Checks if the page has been sufficiently filled with user data
+	 * 
+	 * @return true iff the page is complete
+	 */
+	public boolean isComplete() {
+		return isSelectionValid();
+	}
+}