Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Protocols
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Bioimage Analysis
Icy
Extensions
Protocols
Commits
69095d0d
Commit
69095d0d
authored
4 years ago
by
Stephane Dallongeville
Browse files
Options
Downloads
Patches
Plain Diff
Fixed merging from mavenization.
parent
bf6fafba
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/plugins/adufour/protocols/Protocols.java
+1
-1
1 addition, 1 deletion
src/main/java/plugins/adufour/protocols/Protocols.java
src/main/java/plugins/adufour/protocols/gui/ProtocolPanel.java
+1
-1
1 addition, 1 deletion
...ain/java/plugins/adufour/protocols/gui/ProtocolPanel.java
with
2 additions
and
2 deletions
src/main/java/plugins/adufour/protocols/Protocols.java
+
1
−
1
View file @
69095d0d
...
...
@@ -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
();
...
...
This diff is collapsed.
Click to expand it.
src/main/java/plugins/adufour/protocols/gui/ProtocolPanel.java
+
1
−
1
View file @
69095d0d
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment