Fixed diagram profile monitor DnD regression.

[simantics/platform.git] / bundles / org.simantics.charts / src / org / simantics / charts / editor / SubscriptionDropParticipant.java

diff --git a/bundles/org.simantics.charts/src/org/simantics/charts/editor/SubscriptionDropParticipant.java b/bundles/org.simantics.charts/src/org/simantics/charts/editor/SubscriptionDropParticipant.java
index 861d220ea701638d80d606d7f1a8912b94e52601..9b08eacbc26d297c1ecf6ac90c7b6fb5a00b90be 100644 (file)
--- a/bundles/org.simantics.charts/src/org/simantics/charts/editor/SubscriptionDropParticipant.java
+++ b/bundles/org.simantics.charts/src/org/simantics/charts/editor/SubscriptionDropParticipant.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
 /*******************************************************************************

- * Copyright (c) 2007, 2016 Association for Decentralized Information Management in
+ * Copyright (c) 2007, 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
  * 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


@@ -8,7 +8,7 @@
  *
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation

- *     Semantum Oy - JSON plain text input support
+ *     Semantum Oy - JSON plain text input support, #7313

  *******************************************************************************/
 package org.simantics.charts.editor;
 
  *******************************************************************************/
 package org.simantics.charts.editor;
 


@@ -32,6 +32,7 @@ import java.util.stream.Collectors;
 import org.eclipse.jface.viewers.ISelection;
 import org.simantics.Simantics;
 import org.simantics.charts.internal.JsonUtils;
 import org.eclipse.jface.viewers.ISelection;
 import org.simantics.Simantics;
 import org.simantics.charts.internal.JsonUtils;

+import org.simantics.charts.internal.VariableUtils;

 import org.simantics.charts.query.AddChartItem;
 import org.simantics.charts.query.ChartItemDescriptor;
 import org.simantics.charts.ui.AddVariableToChartAction;
 import org.simantics.charts.query.AddChartItem;
 import org.simantics.charts.query.ChartItemDescriptor;
 import org.simantics.charts.ui.AddVariableToChartAction;


@@ -49,7 +50,6 @@ 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.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.g2d.diagram.participant.AbstractDiagramParticipant;
 import org.simantics.g2d.dnd.DragItem;
 import org.simantics.g2d.dnd.IDnDContext;
 import org.simantics.g2d.diagram.participant.AbstractDiagramParticipant;
 import org.simantics.g2d.dnd.DragItem;
 import org.simantics.g2d.dnd.IDnDContext;


@@ -149,7 +149,7 @@ public class SubscriptionDropParticipant extends AbstractDiagramParticipant impl
                 VariableReferenceDragItem vrdi = new VariableReferenceDragItem(session.sync(new UnaryRead<RVI, VariableReference>((RVI)data) {
                     @Override
                     public VariableReference perform(ReadGraph graph) throws DatabaseException {
                 VariableReferenceDragItem vrdi = new VariableReferenceDragItem(session.sync(new UnaryRead<RVI, VariableReference>((RVI)data) {
                     @Override
                     public VariableReference perform(ReadGraph graph) throws DatabaseException {

-                        return new VariableReference(parameter, Variables.getDatatype(graph, model, parameter), null);
+                        return new VariableReference(parameter, VariableUtils.getDatatype(graph, model, parameter), null);

                     }
                 }));
                 items.add( vrdi );
                     }
                 }));
                 items.add( vrdi );