From d7114d30a29cc46ababfebfce09c6f7f2b3f2fbc Mon Sep 17 00:00:00 2001
From: lempinen <lempinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Thu, 5 May 2011 12:38:10 +0000
Subject: [PATCH] Removed context menu and added buttons to external function
 file handling. Selections for the context menu were not reliable.

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@20779 ac1ea38d-2e2b-0410-8846-a27921b304fc
---
 org.simantics.sysdyn.ui/plugin.xml            | 20 ----
 .../ExportExternalFunctionFilesHandler.java   |  5 +-
 .../sysdyn/ui/handlers/RemoveNodeHandler.java |  2 +-
 .../ui/properties/ExternalFilesTab.java       | 97 +++++++++++++++++--
 4 files changed, 96 insertions(+), 28 deletions(-)

diff --git a/org.simantics.sysdyn.ui/plugin.xml b/org.simantics.sysdyn.ui/plugin.xml
index cb235536..49de4a69 100644
--- a/org.simantics.sysdyn.ui/plugin.xml
+++ b/org.simantics.sysdyn.ui/plugin.xml
@@ -512,26 +512,6 @@
       </menuContribution>
       <menuContribution
             locationURI="popup:#ExternalFunctionFileBrowser?after=wbStart">
-         <command
-               commandId="org.simantics.sysdyn.ui.importExternalFunctionFile"
-               label="Import Files"
-               style="push">
-         </command>
-         <command
-               commandId="org.simantics.sysdyn.ui.exportExternalFunctionFile"
-               label="Export Files"
-               style="push">
-         </command>
-         <command
-               commandId="org.simantics.sysdyn.ui.removeNode"
-               icon="icons/cross.png"
-               id="org.simantics.sysdyn.ui.browser.remove"
-               label="Remove"
-               style="push">
-            <visibleWhen
-                  checkEnabled="true">
-            </visibleWhen>
-         </command>
       </menuContribution>
    </extension>
    <extension
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/ExportExternalFunctionFilesHandler.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/ExportExternalFunctionFilesHandler.java
index 84573763..727bb8be 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/ExportExternalFunctionFilesHandler.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/ExportExternalFunctionFilesHandler.java
@@ -44,6 +44,10 @@ public class ExportExternalFunctionFilesHandler extends AbstractHandler {
 		if (resources.length < 1)
 			return null;
 
+		return exportFiles(shell, resources);
+	}
+	
+	public static Object exportFiles(Shell shell, final Resource[] resources) {
 		DirectoryDialog dd = new DirectoryDialog(shell);
 		dd.setFilterPath(Platform.getLocation().toOSString());
 		dd.setText("Export files to...");
@@ -72,7 +76,6 @@ public class ExportExternalFunctionFilesHandler extends AbstractHandler {
 				
 			}
 		});
-
 		return null;
 	}
 
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/RemoveNodeHandler.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/RemoveNodeHandler.java
index 0391d90b..e2ee3669 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/RemoveNodeHandler.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/RemoveNodeHandler.java
@@ -50,7 +50,7 @@ public class RemoveNodeHandler extends AbstractHandler {
         return null;
     }
 
-    private void deleteItem(final Resource[] resources) {
+    public static void deleteItem(final Resource[] resources) {
         try {
             SimanticsUI.getSession().syncRequest(new WriteRequest() {
                 @Override
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ExternalFilesTab.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ExternalFilesTab.java
index b965ed6a..407ea60c 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ExternalFilesTab.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ExternalFilesTab.java
@@ -11,14 +11,22 @@
  *******************************************************************************/
 package org.simantics.sysdyn.ui.properties;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.ui.IWorkbenchSite;
+import org.simantics.browsing.ui.swt.AdaptableHintContext;
 import org.simantics.browsing.ui.swt.SingleSelectionInputSource;
 import org.simantics.browsing.ui.swt.widgets.Button;
 import org.simantics.browsing.ui.swt.widgets.GraphExplorerComposite;
@@ -30,7 +38,9 @@ import org.simantics.db.WriteGraph;
 import org.simantics.db.common.request.WriteRequest;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.management.ISessionContext;
+import org.simantics.sysdyn.ui.handlers.ExportExternalFunctionFilesHandler;
 import org.simantics.sysdyn.ui.handlers.ImportExternalFunctionFilesHandler;
+import org.simantics.sysdyn.ui.handlers.RemoveNodeHandler;
 import org.simantics.ui.SimanticsUI;
 import org.simantics.utils.datastructures.ArrayMap;
 import org.simantics.utils.datastructures.Pair;
@@ -38,7 +48,7 @@ import org.simantics.utils.datastructures.Pair;
 public class ExternalFilesTab extends LabelPropertyTabContributor implements Widget {
 
 	GraphExplorerComposite externalFilesExplorer;
-	Button importButton; 
+	Button importButton, exportButton, removeButton; 
 	
 	@Override
 	public void createControls(Composite body, IWorkbenchSite site,
@@ -67,7 +77,12 @@ public class ExternalFilesTab extends LabelPropertyTabContributor implements Wid
 		if (c instanceof Tree)
 			((Tree) c).setLinesVisible(true);
 		
-		importButton = new Button(composite, support, SWT.NONE);
+		
+		Composite buttonRow = new Composite(composite, SWT.NONE);
+		GridLayoutFactory.fillDefaults().numColumns(3).applyTo(buttonRow);
+		GridDataFactory.fillDefaults().grab(true, false).applyTo(buttonRow);
+		
+		importButton = new Button(buttonRow, support, SWT.NONE);
 		importButton.setText("Import");
 		importButton.addSelectionListener(new SelectionListenerImpl<Resource>(context) {
 
@@ -84,7 +99,7 @@ public class ExternalFilesTab extends LabelPropertyTabContributor implements Wid
 						final Pair<String, String[]> importedFiles = ImportExternalFunctionFilesHandler.importFiles(shell, "Import files", ImportExternalFunctionFilesHandler.C_EXTENSIONS);
 						
 						SimanticsUI.getSession().asyncRequest(new WriteRequest() {
-							
+
 							@Override
 							public void perform(WriteGraph graph) throws DatabaseException {
 								ImportExternalFunctionFilesHandler.addFilesToFunction(graph, input, importedFiles);
@@ -92,11 +107,65 @@ public class ExternalFilesTab extends LabelPropertyTabContributor implements Wid
 						});
 					}
 				});
-				
-				
+
+
+			}
+		});
+
+		exportButton = new Button(buttonRow, support, SWT.NONE);
+		exportButton.setText("Export");
+		exportButton.addSelectionListener(new SelectionListenerImpl<Resource>(context) {
+
+			@Override
+			public void apply(WriteGraph graph, final Resource input)
+			throws DatabaseException {
+
+				exportButton.getWidget().getDisplay().asyncExec(new Runnable() {
+
+					@Override
+					public void run() {
+						Shell shell = exportButton.getWidget().getShell();
+						List<Resource> resourceList = getSelectedResources(externalFilesExplorer);
+						Resource[] resources = resourceList.toArray(new Resource[resourceList.size()]);
+						if (resources.length > 0)
+							ExportExternalFunctionFilesHandler.exportFiles(shell, resources);
+					}
+				});
+
+
+			}
+		});
+
+		removeButton = new Button(buttonRow, support, SWT.NONE);
+		removeButton.setText("Remove");
+		removeButton.addSelectionListener(new SelectionListenerImpl<Resource>(context) {
+
+			@Override
+			public void apply(WriteGraph graph, final Resource input)
+			throws DatabaseException {
+
+				removeButton.getWidget().getDisplay().asyncExec(new Runnable() {
+
+					@Override
+					public void run() {
+						Shell shell = removeButton.getWidget().getShell();
+
+						List<Resource> resourceList = getSelectedResources(externalFilesExplorer);
+						Resource[] resources = resourceList.toArray(new Resource[resourceList.size()]);
+						if(resources.length > 0) {
+							MessageDialog dialog = new MessageDialog(shell, resources.length > 1 ? "Remove selected items" : "Remove selected item" , null, "Are you sure?", 0,
+									new String[] { "OK", "Cancel" }, 0);
+							dialog.create();
+							if (dialog.open() == 0) {
+								RemoveNodeHandler.deleteItem(resources);
+							}
+						}
+					}
+				});
+
+
 			}
 		});
-		
 	}
 
 	@Override
@@ -104,5 +173,21 @@ public class ExternalFilesTab extends LabelPropertyTabContributor implements Wid
 		externalFilesExplorer.setInput(context, input);
 	}
 
+	private List<Resource> getSelectedResources(GraphExplorerComposite explorer) {
+		List<Resource> result = new ArrayList<Resource>();
+		
+		ISelection selection = ((ISelectionProvider) explorer
+				.getAdapter(ISelectionProvider.class)).getSelection();
+		if (selection == null)
+			return result;
+		IStructuredSelection iss = (IStructuredSelection) selection;
+		@SuppressWarnings("unchecked")
+		List<AdaptableHintContext> selections = iss.toList();
+		for(AdaptableHintContext ahc : selections) {
+			Resource resource = (Resource) ahc.getAdapter(Resource.class);
+			result.add(resource);
+		}
+		return result;
+	}
 
 }
-- 
2.47.1