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/02/26 18:16:43 UTC
svn commit: r916764 - in
/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl:
BlameCallbackImpl.java Mergeinfo.java ProplistCallbackImpl.java
SVNClient.java
Author: hwright
Date: Fri Feb 26 17:16:43 2010
New Revision: 916764
URL: http://svn.apache.org/viewvc?rev=916764&view=rev
Log:
JavaHL: Update the backward-compat package to use generics, insofar as it is
reasonable without changing public interfaces.
[ in subversion/bindings/javahl/src/org/tigris/subversion/javahl/ ]
* Mergeinfo.java,
SVNClient.java,
BlameCallbackImpl.java,
ProplistCallbackImpl.java:
Type-parameterize List, Set, and Map usages.
Modified:
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallbackImpl.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Mergeinfo.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProplistCallbackImpl.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallbackImpl.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallbackImpl.java?rev=916764&r1=916763&r2=916764&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallbackImpl.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/BlameCallbackImpl.java Fri Feb 26 17:16:43 2010
@@ -36,7 +36,7 @@
{
/** list of blame records (lines) */
- private List lines = new ArrayList();
+ private List<BlameLine> lines = new ArrayList<BlameLine>();
/*
* (non-Javadoc)
@@ -92,7 +92,7 @@
{
return null;
}
- return (BlameLine) this.lines.get(i);
+ return this.lines.get(i);
}
/**
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Mergeinfo.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Mergeinfo.java?rev=916764&r1=916763&r2=916764&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Mergeinfo.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Mergeinfo.java Fri Feb 26 17:16:43 2010
@@ -50,11 +50,11 @@
* A mapping of repository-relative paths to a list of revision
* ranges.
*/
- private Map mergeSources;
+ private Map<String, List<RevisionRange>> mergeSources;
public Mergeinfo()
{
- mergeSources = new HashMap();
+ mergeSources = new HashMap<String, List<RevisionRange>>();
}
/**
@@ -80,7 +80,7 @@
{
org.apache.subversion.javahl.RevisionRange[] aRange =
aMergeinfo.getRevisionRange(srcPaths[i]);
- List list = new ArrayList();
+ List<RevisionRange> list = new ArrayList<RevisionRange>();
for (int j = 0; j < aRange.length; j++)
{
@@ -114,9 +114,9 @@
*/
public void addRevisionRange(String mergeSrc, RevisionRange range)
{
- List revisions = this.getRevisions(mergeSrc);
+ List<RevisionRange> revisions = this.getRevisions(mergeSrc);
if (revisions == null)
- revisions = new ArrayList();
+ revisions = new ArrayList<RevisionRange>();
revisions.add(range);
this.setRevisionList(mergeSrc, revisions);
}
@@ -127,10 +127,10 @@
*/
public String[] getPaths()
{
- Set pathSet = mergeSources.keySet();
+ Set<String> pathSet = mergeSources.keySet();
if (pathSet == null)
return null;
- return (String []) pathSet.toArray(new String[pathSet.size()]);
+ return pathSet.toArray(new String[pathSet.size()]);
}
/**
@@ -138,11 +138,11 @@
* @param mergeSrc The merge source URL, or <code>null</code>.
* @return List of RevisionRange objects, or <code>null</code>.
*/
- public List getRevisions(String mergeSrc)
+ public List<RevisionRange> getRevisions(String mergeSrc)
{
if (mergeSrc == null)
return null;
- return (List) mergeSources.get(mergeSrc);
+ return mergeSources.get(mergeSrc);
}
/**
@@ -152,11 +152,10 @@
*/
public RevisionRange[] getRevisionRange(String mergeSrc)
{
- List revisions = this.getRevisions(mergeSrc);
+ List<RevisionRange> revisions = this.getRevisions(mergeSrc);
if (revisions == null)
return null;
- return (RevisionRange [])
- revisions.toArray(new RevisionRange[revisions.size()]);
+ return revisions.toArray(new RevisionRange[revisions.size()]);
}
/**
@@ -203,14 +202,14 @@
*/
private void parseRevisions(String path, String revisions)
{
- List rangeList = this.getRevisions(path);
+ List<RevisionRange> rangeList = this.getRevisions(path);
StringTokenizer st = new StringTokenizer(revisions, ",");
while (st.hasMoreTokens())
{
String revisionElement = st.nextToken();
RevisionRange range = new RevisionRange(revisionElement);
if (rangeList == null)
- rangeList = new ArrayList();
+ rangeList = new ArrayList<RevisionRange>();
rangeList.add(range);
}
if (rangeList != null)
@@ -225,7 +224,7 @@
* @param mergeSrc The merge source URL.
* @param range List of RevisionRange objects to add.
*/
- private void setRevisionList(String mergeSrc, List range)
+ private void setRevisionList(String mergeSrc, List<RevisionRange> range)
{
mergeSources.put(mergeSrc, range);
}
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProplistCallbackImpl.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProplistCallbackImpl.java?rev=916764&r1=916763&r2=916764&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProplistCallbackImpl.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ProplistCallbackImpl.java Fri Feb 26 17:16:43 2010
@@ -33,7 +33,7 @@
*/
public class ProplistCallbackImpl implements ProplistCallback
{
- Map propMap = new HashMap();
+ Map<String, Map> propMap = new HashMap<String, Map>();
public void singlePath(String path, Map props)
{
@@ -42,6 +42,6 @@
public Map getProperties(String path)
{
- return (Map) propMap.get(path);
+ return propMap.get(path);
}
}
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java?rev=916764&r1=916763&r2=916764&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java Fri Feb 26 17:16:43 2010
@@ -165,7 +165,7 @@
{
class MyStatusCallback implements StatusCallback
{
- private List statuses = new ArrayList();
+ private List<Status> statuses = new ArrayList<Status>();
public void doStatus(Status status)
{
@@ -174,8 +174,7 @@
public Status[] getStatusArray()
{
- return (Status[]) statuses.toArray(new Status[
- statuses.size()]);
+ return statuses.toArray(new Status[statuses.size()]);
}
}
@@ -246,7 +245,7 @@
{
class MyListCallback implements ListCallback
{
- private List dirents = new ArrayList();
+ private List<DirEntry> dirents = new ArrayList<DirEntry>();
public void doEntry(DirEntry dirent, Lock lock)
{
@@ -278,8 +277,7 @@
public DirEntry[] getDirEntryArray()
{
- return (DirEntry[]) dirents.toArray(new DirEntry[
- dirents.size()]);
+ return dirents.toArray(new DirEntry[dirents.size()]);
}
}
@@ -413,7 +411,7 @@
{
class MyLogMessageCallback implements LogMessageCallback
{
- private List messages = new ArrayList();
+ private List<LogMessage> messages = new ArrayList<LogMessage>();
public void singleMessage(ChangePath[] changedPaths,
long revision,
@@ -443,8 +441,7 @@
public LogMessage[] getMessages()
{
- return (LogMessage[]) messages.toArray(
- new LogMessage[messages.size()]);
+ return messages.toArray(new LogMessage[messages.size()]);
}
}
@@ -2490,7 +2487,7 @@
{
class MyInfoCallback implements InfoCallback
{
- private List infos = new ArrayList();
+ private List<Info2> infos = new ArrayList<Info2>();
public void singleInfo(Info2 info)
{
@@ -2499,7 +2496,7 @@
public Info2[] getInfoArray()
{
- return (Info2[]) infos.toArray(new Info2[infos.size()]);
+ return infos.toArray(new Info2[infos.size()]);
}
}