Ij insight fixed develop #2122
Merged
Ij insight fixed develop #2122
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The `/usr/bin/imagej` launcher under Ubuntu starts ImageJ and points it at the directory `~/.imagej` to look for plugins. The location `./plugins` doesn't exist, and so the insight code receives a null array of locations. This is just a workaround; perhaps later versions can look for the `~/.imagej/plugin` directory itself. (There may be a System property that points to the location set via -ij_user_path)
Less disruptive change. This will probably have to be reviewed.
|
(re-launched travis build) |
|
@joshmoore: will do |
Since all methods in LoggerImpl were checking
`if (runAsPlugin < 0) {...}` separating out the logic
into a separate class is straight-forward. The reason
for doing this, however, is that in the case that the
IJ plugin is used with the `loci_tools.jar` jar, which
contains log4j, then the client hangs at
"Loading Logger Service"
Conflicts:
components/insight/SRC/org/openmicroscopy/shoola/env/log/LoggerFactory.java
components/insight/SRC/org/openmicroscopy/shoola/env/log/LoggerImpl.java
|
@joshmoore:done |
|
Conflicting PR.Removed from build OMERO-5.1-merge-push#63. See the console output for more details. |
|
Conflicting PR.Removed from build OMERO-5.1-merge-push#64. See the console output for more details. |
Conflicts: components/insight/SRC/org/openmicroscopy/shoola/env/log/LoggerFactory.java components/insight/SRC/org/openmicroscopy/shoola/env/log/LoggerImpl.java
Conflicts: components/insight/SRC/org/openmicroscopy/shoola/env/log/LoggerFactory.java
|
Note: this can't be automatically merged. |
|
Conflicting PR.Removed from build OMERO-5.1-merge-push#65. See the console output for more details. |
…evelop Conflicts: components/insight/SRC/org/openmicroscopy/shoola/env/data/DataServicesFactory.java
|
Conflicting PR.Removed from build OMERO-5.1-merge-push#66. See the console output for more details. |
|
Workflow:
|
|
In summary, the warnings were fine, but see above for the failure to open image. |
|
Re-tried the workflow using bioformats_package.jar from The results were identical with the above. |
|
To be retested with #2136 included in the merge build. |
Merged
|
Retested using bioformats_package.jar and loci_tools.jar from http://ci.openmicroscopy.org/view/5.1/job/BIOFORMATS-5.1-merge-daily/lastSuccessfulBuild/artifact/artifacts/.
All fine here. |
|
@pwalczysko: thanks for testing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
To test:
Check that
--rebased-from #2074
--rebased-from #2060
--rebased-from #2119