From bf6fafba2b1d59a192d2cbe301450b8ba2f7ebb5 Mon Sep 17 00:00:00 2001
From: Amandine Tournay <amandine.tournay@pasteur.fr>
Date: Tue, 1 Sep 2020 11:20:16 +0200
Subject: [PATCH] Use parent POM + Fix new Workflow() parameter
---
pom.xml | 47 +++----------------
.../plugins/adufour/protocols/Protocols.java | 2 +-
.../adufour/protocols/gui/ProtocolPanel.java | 2 +-
3 files changed, 9 insertions(+), 42 deletions(-)
diff --git a/pom.xml b/pom.xml
index c0e1f4e..8710d70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,9 +4,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.bioimageanalysis.icy</groupId>
+ <parent>
+ <artifactId>pom-icy</artifactId>
+ <groupId>org.bioimageanalysis.icy</groupId>
+ <version>1.0.4</version>
+ </parent>
+
<artifactId>icy-protocols</artifactId>
- <version>3.0.9</version>
+ <version>3.0.10</version>
<packaging>jar</packaging>
@@ -15,31 +20,6 @@
Protocols (GUI part) plugin for Icy
</description>
- <properties>
- <outputJar>${project.build.outputDirectory}/../plugin</outputJar>
- </properties>
-
- <build>
- <finalName>${project.artifactId}</finalName>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>3.1.2</version>
- <configuration>
- <outputDirectory>${outputJar}</outputDirectory>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- <mainClass>plugins.adufour.protocols.Protocols</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.bioimageanalysis.icy</groupId>
@@ -73,17 +53,4 @@
<url>https://icy-nexus.pasteur.fr/repository/Icy/</url>
</repository>
</repositories>
-
- <distributionManagement>
- <repository>
- <id>icy-prod</id>
- <name>icy-prod</name>
- <url>https://icy-nexus.pasteur.fr/repository/icy-core/</url>
- </repository>
- <snapshotRepository>
- <id>icy-dev</id>
- <name>icy-dev</name>
- <url>https://icy-nexus-dev.pasteur.cloud/repository/icy-core/</url>
- </snapshotRepository>
- </distributionManagement>
</project>
\ No newline at end of file
diff --git a/src/main/java/plugins/adufour/protocols/Protocols.java b/src/main/java/plugins/adufour/protocols/Protocols.java
index 7d9cd6a..4abbff1 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(true);
+ WorkFlow workFlow = new WorkFlow();
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 5df0e47..0aa76de 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(true), frame);
+ this(null, new WorkFlow(), frame);
}
private ProtocolPanel(File file, final WorkFlow workFlow, MainFrame frame)
--
GitLab