Skip to content

Copy ome.api.* documentation to omero.api.* (2)#4569

Merged
jburel merged 7 commits intoome:developfrom
sbesson:ome_omero_apidoc_2
Apr 14, 2016
Merged

Copy ome.api.* documentation to omero.api.* (2)#4569
jburel merged 7 commits intoome:developfrom
sbesson:ome_omero_apidoc_2

Conversation

@sbesson
Copy link
Copy Markdown
Member

@sbesson sbesson commented Apr 11, 2016

See https://trello.com/c/KLCaZX4X/19-copy-ome-api-documentation-to-omero-api

Follow-up of #4547, this PR copies more of the ome.api.* Javadoc documentation into the slice classes.

To review this PR, either build the slice documentation via release-slice2html or use the published CI documentation or OMERO.docs* artifacts. Check the links are all working and the method parameters match.

["ami", "amd"] interface IMetadata extends ServiceInterface
{
/**
* Loads the <code>logical channels</code> and the acquisition
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If "logical channels" is code should it be CamelCase? or at least not have a space in it?

@jburel
Copy link
Copy Markdown
Member

jburel commented Apr 12, 2016

Note that I had to make some changes in the "ice" files for ice 3.6 in order to work with the release version of ice.
.

* @param sizeX The new size across the X-axis.
* <code>null</code> if the copy should maintain
* the same size.
* @param sizeY The new size across the Y-axis. * <code>null</code> if the copy should maintain
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Quite a lot of extraneous whitespace here that I can't see affects the rendering. Though having see that this should be split over two lines.

@ximenesuk
Copy link
Copy Markdown
Contributor

Looks fine other that minor comments above.

Is there a style guide for Javadoc? I was just wondering about the use of the code tags in some of these files, there were cases where I might have used them had I been writing from scratch. Maybe at some point harmonising usage across the docs would make some sense - though that point is probably approaching infinity!

@sbesson
Copy link
Copy Markdown
Member Author

sbesson commented Apr 12, 2016

@ximenesuk: I do not think we have an authoritative Javadoc style apart. I would personally be inclined to limit the usage of code tags to either variable names or real code expression e.g. null so I removed the tags encapsulating names like logical channels or tags.

@jburel: from #4452, the only changes I see brought to components/blitz/resources/omero/api are documentation improvements which should not conflict with this effort. Do you have other changes planned modifying these classes?

@jburel
Copy link
Copy Markdown
Member

jburel commented Apr 12, 2016

@sbesson: no plan to add more changes
I had to do that in order to build on centos6 with python 2.6.
if no conflict, all good

idempotent LongIObjectListMap loadTagContent(omero::sys::LongList ids, omero::sys::Parameters options) throws ServerError;

/**
* Loads all the tag Sets. Returns a collection of
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, this probably needs to be TagSet or TagSets too cf method above.

@ximenesuk
Copy link
Copy Markdown
Contributor

@sbesson agree on style comment.

Changes look fine, just the one tiny inconsistency noted.

@sbesson
Copy link
Copy Markdown
Member Author

sbesson commented Apr 13, 2016

Pushed

@ximenesuk
Copy link
Copy Markdown
Contributor

Given the limited scope of the change do you want to merge this now or wait until a after a build?

@sbesson
Copy link
Copy Markdown
Member Author

sbesson commented Apr 13, 2016

Deferring to @jburel with regard to the merging decision.

@jburel
Copy link
Copy Markdown
Member

jburel commented Apr 14, 2016

Merging, we can improve the doc in a follow-up PR I noticed several things when I made some adjustments to work with ice 3.6

@jburel jburel merged commit d89f4bf into ome:develop Apr 14, 2016
@sbesson sbesson deleted the ome_omero_apidoc_2 branch April 14, 2016 08:34
@jburel jburel added this to the 5.2.3 milestone May 4, 2016
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.

3 participants