You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/03/18 22:17:43 UTC
svn commit: r924999 -
/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Author: hwright
Date: Thu Mar 18 21:17:43 2010
New Revision: 924999
URL: http://svn.apache.org/viewvc?rev=924999&view=rev
Log:
JavaHL: Make a couple of classes in the test suite anonymous, to resolve naming
conflicts.
* subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
(collectProperties, collectInfos): Use anonymous classes.
Modified:
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Modified: subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=924999&r1=924998&r2=924999&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java (original)
+++ subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java Thu Mar 18 21:17:43 2010
@@ -3652,27 +3652,16 @@ public class BasicTests extends SVNTests
Collection<String> changelists)
throws ClientException
{
- class MyProplistCallback implements ProplistCallback
- {
- Map<String, Map<String, byte[]>> propMap =
- new HashMap<String, Map<String, byte[]>>();
-
- public void singlePath(String path, Map<String, byte[]> props)
- {
- propMap.put(path, props);
- }
-
- public Map<String, byte[]> getProperties(String path)
- {
- return propMap.get(path);
- }
- }
-
- MyProplistCallback callback = new MyProplistCallback();
+ final Map<String, Map<String, byte[]>> propMap =
+ new HashMap<String, Map<String, byte[]>>();
+
client.properties(path, revision, revision, depth, changelists,
- callback);
+ new ProplistCallback () {
+ public void singlePath(String path, Map<String, byte[]> props)
+ { propMap.put(path, props); }
+ });
- return callback.getProperties(path);
+ return propMap.get(path);
}
private DirEntry[] collectDirEntries(String url, Revision revision,
@@ -3729,25 +3718,14 @@ public class BasicTests extends SVNTests
Collection<String> changelists)
throws ClientException
{
- class MyInfoCallback implements InfoCallback
- {
- private List<Info2> infos = new ArrayList<Info2>();
-
- public void singleInfo(Info2 info)
- {
- infos.add(info);
- }
-
- public Info2[] getInfoArray()
- {
- return infos.toArray(new Info2[infos.size()]);
- }
- }
-
- MyInfoCallback callback = new MyInfoCallback();
+ final List<Info2> infos = new ArrayList<Info2>();
+
client.info2(pathOrUrl, revision, pegRevision, depth, changelists,
- callback);
- return callback.getInfoArray();
+ new InfoCallback () {
+ public void singleInfo(Info2 info)
+ { infos.add(info); }
+ });
+ return infos.toArray(new Info2[infos.size()]);
}
private LogMessage[] collectLogMessages(String path, Revision pegRevision,