Fixed multiple issues causing dangling references to discarded queries

[simantics/platform.git] / bundles / org.simantics.image.ui / src / org / simantics / image / ui / ImportImagesActionFactory.java

diff --git a/bundles/org.simantics.image.ui/src/org/simantics/image/ui/ImportImagesActionFactory.java b/bundles/org.simantics.image.ui/src/org/simantics/image/ui/ImportImagesActionFactory.java
index a0e966f98f947df987e5f0842eab0a630be68260..80e8d5b68a7018feee45be4711d333df7ea096ae 100644 (file)
--- a/bundles/org.simantics.image.ui/src/org/simantics/image/ui/ImportImagesActionFactory.java
+++ b/bundles/org.simantics.image.ui/src/org/simantics/image/ui/ImportImagesActionFactory.java
@@ -22,9 +22,9 @@ import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
+import org.simantics.Simantics;
 import org.simantics.db.Resource;
 import org.simantics.db.layer0.adapter.ActionFactory;
-import org.simantics.ui.SimanticsUI;
 import org.simantics.utils.FileUtils;
 import org.simantics.utils.ui.AdaptionUtils;
 
@@ -49,17 +49,17 @@ public class ImportImagesActionFactory implements ActionFactory {
                 if (files.isEmpty())
                     return;
 
-                SimanticsUI.getSession().markUndoPoint();
-                SimanticsUI.getSession().asyncRequest( new CreateImages(container, files) );
+                Simantics.getSession().markUndoPoint();
+                Simantics.getSession().asyncRequest( new CreateImages(container, files) );
             }
         };
     }
 
     public static Collection<File> requestImportedImages(Shell parentShell) {
         FileDialog dialog = new FileDialog(parentShell, SWT.MULTI);
-        dialog.setText("Choose image to be imported");
-        dialog.setFilterExtensions( new String[] {"*.jpg;*.png;*.gif;*.svg", "*.jpg;*.jpeg", "*.png", "*.gif", "*.svg"} );
-        dialog.setFilterNames( new String[] {"All Images", "JPEG Image", "PNG Image", "GIF Image", "SVG Image"} );
+        dialog.setText(Messages.ImportImagesActionFactory_ChooseImageToBeImported);
+        dialog.setFilterExtensions( new String[] {"*.jpg;*.png;*.gif;*.svg", "*.jpg;*.jpeg", "*.png", "*.gif", "*.svg"} ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+        dialog.setFilterNames( new String[] {Messages.ImportImagesActionFactory_FilterAllImage, Messages.ImportImagesActionFactory_FilterJPEGImage, Messages.ImportImagesActionFactory_FilterPNGImage, Messages.ImportImagesActionFactory_FilterGIFImages, Messages.ImportImagesActionFactory_FilterSVGImage} );
         //dialog.setFilterExtensions( new String[] {"*.jpg", "*.png", "*.gif"} );
         final String filename = dialog.open();
         if (filename == null)