Fixed StandardCutHandler IllegalThreadAccess problem

[simantics/platform.git] / bundles / org.simantics.modeling.ui / src / org / simantics / modeling / ui / modelBrowser / handlers / StandardCopyHandler.java

diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/modelBrowser/handlers/StandardCopyHandler.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/modelBrowser/handlers/StandardCopyHandler.java
index 1ce5b2d3698ddee5ce7989059dc58de5d6a9fe04..05a698a1339629efb1f98fe049f629c358780b1d 100644 (file)
--- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/modelBrowser/handlers/StandardCopyHandler.java
+++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/modelBrowser/handlers/StandardCopyHandler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007 VTT Technical Research Centre of Finland and others.
+ * Copyright (c) 2007, 2018 VTT Technical Research Centre of Finland and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,11 +7,11 @@
  *
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
+ *     Semantum Oy - gitlab simantics/platform#133
  *******************************************************************************/
 package org.simantics.modeling.ui.modelBrowser.handlers;
 
-import gnu.trove.set.hash.THashSet;
-
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
@@ -44,7 +44,6 @@ import org.simantics.browsing.ui.NodeContext;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.common.request.ReadRequest;
-import org.simantics.db.common.utils.Logger;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.SelectionHints;
 import org.simantics.db.layer0.adapter.CopyHandler;
@@ -57,9 +56,15 @@ import org.simantics.utils.ui.ISelectionUtils;
 import org.simantics.utils.ui.SWTUtils;
 import org.simantics.utils.ui.SWTUtils.ControlFilter;
 import org.simantics.utils.ui.workbench.WorkbenchUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gnu.trove.set.hash.THashSet;
 
 public class StandardCopyHandler extends AbstractHandler {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(StandardCopyHandler.class);
+
     private static IStatusLineManager status;
 
     private static List<Variable> getVariables(ISelection selection) {
@@ -125,7 +130,7 @@ public class StandardCopyHandler extends AbstractHandler {
                 setCopyMessage(builder.getContents().size(), "variable");
                 return null;
             }
-            setCopyMessage(0, "");
+            setCopyMessage(0, ""); //$NON-NLS-1$
             return null;
         }
 
@@ -143,7 +148,7 @@ public class StandardCopyHandler extends AbstractHandler {
             Simantics.setClipboard(builder);
             setCopyMessage(builder.getContents().size(), "resource");
         } catch (DatabaseException e) {
-            Logger.defaultLogError(e);
+            LOGGER.error("Failed to copy {} resources to clipboard: {}", rs.length, Arrays.toString(rs), e); //$NON-NLS-1$
         }
 
         return null;