Skip to content

Copy ome.api.* documentation to omero.api.* (4)#4605

Merged
sbesson merged 8 commits intoome:developfrom
sbesson:ome_omero_apidoc_4
Jun 8, 2016
Merged

Copy ome.api.* documentation to omero.api.* (4)#4605
sbesson merged 8 commits intoome:developfrom
sbesson:ome_omero_apidoc_4

Conversation

@sbesson
Copy link
Copy Markdown
Member

@sbesson sbesson commented Apr 23, 2016

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

Follow-up of #4547, #4569 and #4578, 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.

@snoopycrimecop
Copy link
Copy Markdown
Member

Conflicting PR. Removed from build OMERO-DEV-merge-push#303. See the console output for more details.
Possible conflicts:

  • PR Ice 3.6 #4452 jburel 'Ice 3.6'
    • components/blitz/resources/omero/api/RawFileStore.ice
    • components/blitz/resources/omero/api/RawPixelsStore.ice

@jburel
Copy link
Copy Markdown
Member

jburel commented Apr 25, 2016

This PR conflicts with #4452
the fact that there are double-quote in the description could also create error when parsing the slice object. This is due to a bug in ice.

@jburel jburel removed the exclude label May 11, 2016
@jburel
Copy link
Copy Markdown
Member

jburel commented May 12, 2016

Due to a bug in string parsing in ice, check for single quote in the documentation

@sbesson
Copy link
Copy Markdown
Member Author

sbesson commented May 12, 2016


/**
* Returns <code>true</code> if the {@link omero.model.Job} is
* running, i.e. has an attached {@link omero.model.Process}.
Copy link
Copy Markdown
Contributor

@ximenesuk ximenesuk May 18, 2016

Choose a reason for hiding this comment

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

The i.e. here has the effect of the index entry being just:

Returns true if the model::Job is running, i.e.

although outwith this PR a change to

     * Returns <code>true</code> if the {@link omero.model.Job} is
     * running. I.e. has an attached {@link omero.model.Process}.

would make for a neater index entry.

@ximenesuk
Copy link
Copy Markdown
Contributor

b7d9005#diff-32cd3b746a391445c25fd6e8c5f25621R120 needs the return value wrapping in a code block.

* <code>false</code> is expected.
*
* See "read-only caveat" under {@link RawPixelsStore}
* See "Read-only caveat" under {@link RawPixelsStore}
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.

For some reason I am not seeing this change in the rendered docs. But regardless of that does this change need to be made elsewhere in this file? Line 270 onwards has a few occurrences.

@sbesson
Copy link
Copy Markdown
Member Author

sbesson commented May 18, 2016

@ximenesuk: pushed 2 commits addressing most of the formatting issues.

@jburel
Copy link
Copy Markdown
Member

jburel commented Jun 6, 2016

@ximenesuk: happy with the last changes?

/**
* Returns <code>true</code> if the {@link omero.model.Job} is
* running, i.e. has an attached {@link omero.model.Process}.
* running, I.e. has an attached process.
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 the comma after 'running' stays then it should be 'i.e.' (i.e. lower case I)

@ximenesuk
Copy link
Copy Markdown
Contributor

@jburel thanks for the reminder. Other than the very tiny chnage to achieve perfect this looks okay. I'll leave @sbesson to fix that and then it can be merged.

@sbesson
Copy link
Copy Markdown
Member Author

sbesson commented Jun 7, 2016

@ximenesuk/@jburel: I have a local branch to tackle the three last classes of this epic work - see https://trello.com/c/JQ9AcNa2/77-copy-ome-api-documentation-to-omero-api. Worth fixing it on the last PR?

@jburel
Copy link
Copy Markdown
Member

jburel commented Jun 7, 2016

Let's merge this PR, @ximenesuk minor edit can be done in the next PR.

@sbesson sbesson merged commit e64ead8 into ome:develop Jun 8, 2016
@sbesson sbesson deleted the ome_omero_apidoc_4 branch June 8, 2016 15:15
@sbesson sbesson added this to the 5.3.0 milestone Sep 10, 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.

4 participants