Skip to content
Snippets Groups Projects
Commit bf6fafba authored by Amandine  TOURNAY's avatar Amandine TOURNAY
Browse files

Use parent POM + Fix new Workflow() parameter

parent 0e5ba239
No related branches found
No related tags found
No related merge requests found
...@@ -4,9 +4,14 @@ ...@@ -4,9 +4,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 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> <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> <artifactId>icy-protocols</artifactId>
<version>3.0.9</version> <version>3.0.10</version>
<packaging>jar</packaging> <packaging>jar</packaging>
...@@ -15,31 +20,6 @@ ...@@ -15,31 +20,6 @@
Protocols (GUI part) plugin for Icy Protocols (GUI part) plugin for Icy
</description> </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> <dependencies>
<dependency> <dependency>
<groupId>org.bioimageanalysis.icy</groupId> <groupId>org.bioimageanalysis.icy</groupId>
...@@ -73,17 +53,4 @@ ...@@ -73,17 +53,4 @@
<url>https://icy-nexus.pasteur.fr/repository/Icy/</url> <url>https://icy-nexus.pasteur.fr/repository/Icy/</url>
</repository> </repository>
</repositories> </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> </project>
\ No newline at end of file
...@@ -362,7 +362,7 @@ public class Protocols extends PluginActionable ...@@ -362,7 +362,7 @@ public class Protocols extends PluginActionable
throw new IllegalArgumentException(protocolFile + " is not a valid protocol file"); throw new IllegalArgumentException(protocolFile + " is not a valid protocol file");
System.out.println("Loading workflow..."); System.out.println("Loading workflow...");
WorkFlow workFlow = new WorkFlow(true); WorkFlow workFlow = new WorkFlow();
BlocksML.getInstance().loadWorkFlow(xml, workFlow); BlocksML.getInstance().loadWorkFlow(xml, workFlow);
workFlow.run(); workFlow.run();
......
...@@ -80,7 +80,7 @@ public class ProtocolPanel extends JPanel implements WorkFlowListener, PropertyC ...@@ -80,7 +80,7 @@ public class ProtocolPanel extends JPanel implements WorkFlowListener, PropertyC
public ProtocolPanel(MainFrame frame) public ProtocolPanel(MainFrame frame)
{ {
this(null, new WorkFlow(true), frame); this(null, new WorkFlow(), frame);
} }
private ProtocolPanel(File file, final WorkFlow workFlow, MainFrame frame) private ProtocolPanel(File file, final WorkFlow workFlow, MainFrame frame)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment