diff --git a/pom.xml b/pom.xml index c0e1f4e1a4ee6ac6b1b8a119ac8e42bdd5a06a98..8710d70565f5397294c8473b3d994ff40a1ecaf2 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 7d9cd6a886e37bf593120dc6a646c264488bce80..4abbff1b91dbe5ca151407be557da29ed80024cc 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 5df0e476d1f4206cfecfa4dcd9ed7d67db71e432..0aa76de4d433a4b6f8d0390110d4505994da2938 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)