Merge lp://staging/~karni/ubuntuone-files-java-library/cleanup-and-headers into lp://staging/ubuntuone-files-java-library/0.x
Proposed by
Michał Karnicki
Status: | Merged |
---|---|
Merged at revision: | 28 |
Proposed branch: | lp://staging/~karni/ubuntuone-files-java-library/cleanup-and-headers |
Merge into: | lp://staging/ubuntuone-files-java-library/0.x |
Prerequisite: | lp://staging/~karni/ubuntuone-files-java-library/thumbnail-support |
Diff against target: |
2228 lines (+968/-690) 45 files modified
.bzrignore (+0/-2) .classpath (+9/-9) libs/README.txt (+18/-0) main/src/com/ubuntu/one/api/files/U1FileAPI.java (+67/-41) main/src/com/ubuntu/one/api/files/client/BaseClient.java (+21/-0) main/src/com/ubuntu/one/api/files/client/ContentClient.java (+27/-1) main/src/com/ubuntu/one/api/files/client/Failure.java (+21/-0) main/src/com/ubuntu/one/api/files/client/ResourceClient.java (+24/-1) main/src/com/ubuntu/one/api/files/example/SimpleExample.java (+0/-598) main/src/com/ubuntu/one/api/files/json/U1CustomNodeJson.java (+21/-0) main/src/com/ubuntu/one/api/files/json/U1NodeJson.java (+21/-0) main/src/com/ubuntu/one/api/files/json/U1UserJson.java (+21/-0) main/src/com/ubuntu/one/api/files/json/U1VolumeJson.java (+21/-0) main/src/com/ubuntu/one/api/files/model/U1Directory.java (+22/-1) main/src/com/ubuntu/one/api/files/model/U1File.java (+21/-0) main/src/com/ubuntu/one/api/files/model/U1Node.java (+21/-0) main/src/com/ubuntu/one/api/files/model/U1Resource.java (+21/-0) main/src/com/ubuntu/one/api/files/model/U1User.java (+21/-0) main/src/com/ubuntu/one/api/files/model/U1Volume.java (+21/-0) main/src/com/ubuntu/one/api/files/util/Callback.java (+21/-0) main/src/com/ubuntu/one/api/files/util/CancelTrigger.java (+21/-0) main/src/com/ubuntu/one/api/files/util/HashUtils.java (+21/-0) main/src/com/ubuntu/one/api/files/util/HttpUriRequestFactory.java (+21/-0) main/src/com/ubuntu/one/api/files/util/ProgressListener.java (+21/-0) main/src/com/ubuntu/one/api/files/util/RequestListener.java (+21/-0) main/src/com/ubuntu/one/api/files/util/ResponseHeader.java (+21/-0) test/src/com/ubuntu/one/api/files/CreateVolumeTest.java (+25/-4) test/src/com/ubuntu/one/api/files/DeleteVolumeTest.java (+26/-5) test/src/com/ubuntu/one/api/files/GetUserTest.java (+25/-4) test/src/com/ubuntu/one/api/files/GetVolumesTest.java (+25/-4) test/src/com/ubuntu/one/api/files/json/U1NodeJsonTest.java (+21/-0) test/src/com/ubuntu/one/api/files/json/U1UserJsonTest.java (+21/-0) test/src/com/ubuntu/one/api/files/json/U1VolumeJsonTest.java (+21/-0) test/src/com/ubuntu/one/api/files/util/U1NodeBuilder.java (+21/-0) test/src/com/ubuntu/one/api/files/util/U1UserBuilder.java (+21/-0) test/src/com/ubuntu/one/api/files/util/U1VolumeBuilder.java (+21/-0) test/src/com/ubuntu/one/api/files/util/Util.java (+28/-20) test/src/com/ubuntu/one/test/util/DummyAuthorizer.java (+21/-0) test/src/com/ubuntu/one/test/util/NotificationStream.java (+21/-0) test/src/com/ubuntu/one/test/util/NotificationTrace.java (+21/-0) test/src/com/ubuntu/one/test/util/SameCauseFailureMatcher.java (+21/-0) test/src/com/ubuntu/one/test/util/SameHttpRequestMatcher.java (+21/-0) test/src/com/ubuntu/one/test/util/SameHttpUriRequestMatcher.java (+21/-0) test/src/com/ubuntu/one/test/util/SameStatusCodeFailureMatcher.java (+21/-0) test/src/com/ubuntu/one/test/util/Timeout.java (+21/-0) |
To merge this branch: | bzr merge lp://staging/~karni/ubuntuone-files-java-library/cleanup-and-headers |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michał Karnicki (community) | Approve | ||
Chad Miller | Pending | ||
Review via email: mp+95452@code.staging.launchpad.net |
Commit message
Added license headers.
Description of the change
This branch introduces minor cleanup, adds license headers, and deletes the CLI example (extracted to cli-ubuntuone branch).
To post a comment you must log in.