Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extra annotations #2412

Merged
merged 70 commits into from Sep 25, 2014
Merged

Extra annotations #2412

merged 70 commits into from Sep 25, 2014

Conversation

qidane
Copy link
Contributor

@qidane qidane commented May 1, 2014

Adding extra annotation points to the model

@qidane
Copy link
Contributor Author

qidane commented May 1, 2014

--depends-on ome/bioformats#1054

@joshmoore joshmoore mentioned this pull request May 1, 2014
@joshmoore
Copy link
Member

Can we get rid of the whitespace changes?

@qidane
Copy link
Contributor Author

qidane commented May 1, 2014

The indenting of the file was all over the place and a mix of tabs and spaces. I found it hard to follow.

qidane and others added 12 commits May 1, 2014 10:27
There were a variety of styles of "TODO" markers for
methods that were not implemented: "TODO not in Model",
"unsupported", etc. This converts all of them to use
helper methods `protected ignoreX()` which log at various
levels. It should be fairly easy now to do a "Open call
hierarchy" style search and see which methods fall into
which category.

Also, **with this commit, the remaining TODOs in the file are valid!**
Unlike the methods which now log with `ignoreY()`, these
methods seem to have been improperly implemented or left
improperly unimplemented. These need careful review.
General cleanup of TODO markers and addition of logging
The sections of code removed with the removal of WellSample and Pixels
from the annotatable objects might be useful as a template of what needs
added for each of the new annotatable objects.
Conflicts:
	components/blitz/src/ome/formats/OMEROMetadataStoreClient.java
@qidane qidane added the develop label May 5, 2014
@mtbc
Copy link
Member

mtbc commented May 6, 2014

Travis failure.

@joshmoore
Copy link
Member

A valid compile fail, I believe. @qidane?

@mtbc
Copy link
Member

mtbc commented May 6, 2014

Great, thanks. I should be able to get you upgrade scripts quickly after #2401 / #2406 get resolved.

@qidane
Copy link
Contributor Author

qidane commented Sep 12, 2014

Breaking Build passing - is this ok to remove breaking (along with ome/bioformats#1054).

@joshmoore
Copy link
Member

As ome/bioformats#1054 (comment), no label so you can decide post full-repo run.

@sbesson
Copy link
Member

sbesson commented Sep 16, 2014

Travis failed with

FAILED: testSubSpecIterator on null(ome.services.graphs.GraphSpecUnitTest)
junit.framework.ComparisonFailure: expected:<...LightSource> but was:<...Arc>

@jburel
Copy link
Member

jburel commented Sep 23, 2014

@qidane: Travis is green!!!

@qidane
Copy link
Contributor Author

qidane commented Sep 23, 2014

@qidane
Copy link
Contributor Author

qidane commented Sep 23, 2014

removed breaking tag

@joshmoore
Copy link
Member

Note: from discussion this afternoon, if the full-repo is green, this and it's BF partner will be merged.

@sbesson
Copy link
Member

sbesson commented Sep 25, 2014

Merging to allow the submodules job to be run

sbesson added a commit that referenced this pull request Sep 25, 2014
@sbesson sbesson merged commit a1283cf into ome:develop Sep 25, 2014
@qidane
Copy link
Contributor Author

qidane commented Sep 29, 2014

--no-rebase

@sbesson sbesson added this to the 5.1.0-m1 milestone Oct 14, 2014
mtbc added a commit to mtbc/openmicroscopy that referenced this pull request Oct 14, 2014
@qidane qidane deleted the extra-annotations branch February 24, 2015 12:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants