/*******************************************************************************
- * 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
*
* 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;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.action.IStatusLineManager;
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;
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) {
formatSelectionToClipboardText(event);
final Resource[] rs = ResourceAdaptionUtils.toResources(selection);
Job job = new Job("Copy resources") {
-
@Override
protected IStatus run(IProgressMonitor monitor) {
monitor.beginTask("Copy resources to clipboard", 1);
copyResourcesToClipboard(rs, selection, SubMonitor.convert(monitor, 1));
- return null;
+ return Status.OK_STATUS;
}
};
job.setUser(true);
setCopyMessage(builder.getContents().size(), "variable");
return null;
}
- setCopyMessage(0, "");
+ setCopyMessage(0, ""); //$NON-NLS-1$
return null;
}
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;