From 69095d0d414243e0af8da77e1819a38a2b425f12 Mon Sep 17 00:00:00 2001
From: Stephane Dallongeville <stephane@outlook.com>
Date: Mon, 14 Sep 2020 17:39:36 +0200
Subject: [PATCH] Fixed merging from mavenization.
---
src/main/java/plugins/adufour/protocols/Protocols.java | 2 +-
src/main/java/plugins/adufour/protocols/gui/ProtocolPanel.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/plugins/adufour/protocols/Protocols.java b/src/main/java/plugins/adufour/protocols/Protocols.java
index 4abbff1..7d9cd6a 100644
--- a/src/main/java/plugins/adufour/protocols/Protocols.java
+++ b/src/main/java/plugins/adufour/protocols/Protocols.java
@@ -362,7 +362,7 @@ public class Protocols extends PluginActionable
throw new IllegalArgumentException(protocolFile + " is not a valid protocol file");
System.out.println("Loading workflow...");
- WorkFlow workFlow = new WorkFlow();
+ WorkFlow workFlow = new WorkFlow(true);
BlocksML.getInstance().loadWorkFlow(xml, workFlow);
workFlow.run();
diff --git a/src/main/java/plugins/adufour/protocols/gui/ProtocolPanel.java b/src/main/java/plugins/adufour/protocols/gui/ProtocolPanel.java
index 0aa76de..5df0e47 100644
--- a/src/main/java/plugins/adufour/protocols/gui/ProtocolPanel.java
+++ b/src/main/java/plugins/adufour/protocols/gui/ProtocolPanel.java
@@ -80,7 +80,7 @@ public class ProtocolPanel extends JPanel implements WorkFlowListener, PropertyC
public ProtocolPanel(MainFrame frame)
{
- this(null, new WorkFlow(), frame);
+ this(null, new WorkFlow(true), frame);
}
private ProtocolPanel(File file, final WorkFlow workFlow, MainFrame frame)
--
GitLab