/*******************************************************************************
- * Copyright (c) 2014 Association for Decentralized Information Management in
+ * Copyright (c) 2014, 2017 Association for Decentralized Information Management in
* Industry THTH ry.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
*
* Contributors:
* VTT Technical Research Centre of Finland - initial API and implementation
+ * Semantum Oy - #7313
*******************************************************************************/
package org.simantics.charts.ui;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
-import java.util.Optional;
import java.util.Set;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.simantics.Simantics;
import org.simantics.browsing.ui.common.ErrorLogger;
-import org.simantics.charts.internal.JsonUtils;
-import org.simantics.databoard.type.Datatype;
+import org.simantics.charts.Activator;
+import org.simantics.charts.internal.VariableUtils;
import org.simantics.databoard.util.ObjectUtils;
import org.simantics.db.ReadGraph;
import org.simantics.db.Resource;
import org.simantics.db.exception.DatabaseException;
import org.simantics.db.layer0.SelectionHints;
import org.simantics.db.layer0.adapter.DropActionFactory;
-import org.simantics.db.layer0.request.PossibleActiveVariableFromVariable;
import org.simantics.db.layer0.request.PossibleModel;
import org.simantics.db.layer0.variable.RVI;
-import org.simantics.db.layer0.variable.Variable;
import org.simantics.db.layer0.variable.VariableReference;
-import org.simantics.db.layer0.variable.Variables;
import org.simantics.layer0.Layer0;
import org.simantics.modeling.ModelingResources;
import org.simantics.modeling.PropertyVariables;
@Override
public Runnable create(ReadGraph g, Object target, Object source, int operation) throws DatabaseException {
- //System.out.println("DROP: " + source + " -> " + target);
+ //System.out.println("SUBSCRIPTION DROP: " + source + " -> " + target);
final Resource subscription = ISelectionUtils.getSinglePossibleKey(target, SelectionHints.KEY_MAIN, Resource.class);
if (subscription == null)
if(source instanceof RVI) {
RVI rvi = (RVI)source;
- List<VariableReference> refs = Collections.singletonList(new VariableReference(rvi, getDatatype(g, targetModel, rvi), null));
+ List<VariableReference> refs = Collections.singletonList(new VariableReference(rvi, VariableUtils.getDatatype(g, targetModel, rvi), null));
return addSubscriptions(g, subscription, refs, Collections.<Resource>emptySet());
}
}
if (source instanceof String) {
- // JSON ?
- Optional<Variable> v = JsonUtils.tryParseJsonPropertyVariable(g, (String) source);
- if (v.isPresent()) {
- List<VariableReference> references = g.syncRequest(VariableReferences.variablesToReferences(targetModel, Collections.singletonList(v.get())));
- return addSubscriptions(g, subscription, references, Collections.emptySet());
- }
+ return handleStringDrop(g, subscription, targetModel, (String) source);
}
return null;
}
- private Runnable addSubscriptions(ReadGraph graph, Resource subscription, List<VariableReference> references,
+ private Runnable handleStringDrop(ReadGraph graph, Resource subscription, Resource targetModel, String source) throws DatabaseException {
+ try {
+ List<VariableReference> refs = VariableUtils.getVariableReferencesFromString(graph, targetModel, source);
+ return addSubscriptions(graph, subscription, refs, Collections.emptySet());
+ } catch (DatabaseException e) {
+ Activator.getDefault().getLog().log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, getClass().getSimpleName() + ": Unrecognized String input: " + source));
+ return null;
+ }
+ }
+
+ private Runnable addSubscriptions(ReadGraph graph, Resource subscription, List<VariableReference> references,
Set<Resource> movedSubscriptionItems) throws DatabaseException {
AddVariableToChartAction action = new AddVariableToChartAction(null, subscription, references).init(graph);
return () -> {
};
}
- static Datatype getDatatype(ReadGraph graph, Resource resource, RVI rvi) throws DatabaseException {
- Variable configuration = Variables.getConfigurationContext(graph, resource);
- Variable active = graph.syncRequest(new PossibleActiveVariableFromVariable(configuration));
- Variable var = rvi.resolve(graph, active != null ? active : configuration);
- return var.getDatatype(graph);
- }
-
}