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 17:50:20 UTC
svn commit: r916754 - in
/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl:
ISVNClient.java Mergeinfo.java SVNClient.java callback/BlameCallback.java
Author: hwright
Date: Fri Feb 26 16:50:20 2010
New Revision: 916754
URL: http://svn.apache.org/viewvc?rev=916754&view=rev
Log:
JavaHL: Make use of generics in our new package. This causes a number of
warnings in the compat package.
[ in subversion/bindings/javahl/ ]
* src/org/apache/subversion/javahl/Mergeinfo.java,
src/org/apache/subversion/javahl/SVNClient.java,
src/org/apache/subversion/javahl/callback/BlameCallback.java,
src/org/apache/subversion/javahl/ISVNClient.java:
Add type parameters to Map, List, and Set objects.
Modified:
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Mergeinfo.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameCallback.java
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java?rev=916754&r1=916753&r2=916754&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java Fri Feb 26 16:50:20 2010
@@ -216,7 +216,7 @@
* @since 1.5
*/
void remove(String[] path, String message, boolean force,
- boolean keepLocal, Map revpropTable)
+ boolean keepLocal, Map<String, String> revpropTable)
throws ClientException;
/**
@@ -302,7 +302,7 @@
*/
long commit(String[] path, String message, int depth,
boolean noUnlock, boolean keepChangelist,
- String[] changelists, Map revpropTable)
+ String[] changelists, Map<String, String> revpropTable)
throws ClientException;
/**
@@ -325,7 +325,7 @@
*/
void copy(CopySource[] sources, String destPath, String message,
boolean copyAsChild, boolean makeParents,
- boolean ignoreExternals, Map revpropTable)
+ boolean ignoreExternals, Map<String, String> revpropTable)
throws ClientException;
/**
@@ -348,7 +348,7 @@
*/
void move(String[] srcPaths, String destPath, String message,
boolean force, boolean moveAsChild, boolean makeParents,
- Map revpropTable)
+ Map<String, String> revpropTable)
throws ClientException;
/**
@@ -364,7 +364,7 @@
* @since 1.5
*/
void mkdir(String[] path, String message, boolean makeParents,
- Map revpropTable)
+ Map<String, String> revpropTable)
throws ClientException;
/**
@@ -446,7 +446,7 @@
*/
void doImport(String path, String url, String message, int depth,
boolean noIgnore, boolean ignoreUnknownNodeTypes,
- Map revpropTable)
+ Map<String, String> revpropTable)
throws ClientException;
/**
@@ -694,7 +694,7 @@
*/
void propertySet(String path, String name, String value, int depth,
String[] changelists, boolean force,
- Map revpropTable)
+ Map<String, String> revpropTable)
throws ClientException;
/**
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Mergeinfo.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Mergeinfo.java?rev=916754&r1=916753&r2=916754&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Mergeinfo.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Mergeinfo.java Fri Feb 26 16:50:20 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>>();
}
/**
@@ -92,9 +92,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);
}
@@ -105,10 +105,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()]);
}
/**
@@ -116,11 +116,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);
}
/**
@@ -130,11 +130,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()]);
}
/**
@@ -181,14 +180,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)
@@ -203,7 +202,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/apache/subversion/javahl/SVNClient.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java?rev=916754&r1=916753&r2=916754&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java Fri Feb 26 16:50:20 2010
@@ -200,7 +200,8 @@
* @since 1.5
*/
public native void remove(String[] path, String message, boolean force,
- boolean keepLocal, Map revpropTable)
+ boolean keepLocal,
+ Map<String, String> revpropTable)
throws ClientException;
/**
@@ -242,7 +243,8 @@
*/
public native long commit(String[] path, String message, int depth,
boolean noUnlock, boolean keepChangelist,
- String[] changelists, Map revpropTable)
+ String[] changelists,
+ Map<String, String> revpropTable)
throws ClientException;
/**
@@ -251,7 +253,7 @@
public native void copy(CopySource[] sources, String destPath,
String message, boolean copyAsChild,
boolean makeParents, boolean ignoreExternals,
- Map revpropTable)
+ Map<String, String> revpropTable)
throws ClientException;
/**
@@ -259,14 +261,16 @@
*/
public native void move(String[] srcPaths, String destPath, String message,
boolean force, boolean moveAsChild,
- boolean makeParents, Map revpropTable)
+ boolean makeParents,
+ Map<String, String> revpropTable)
throws ClientException;
/**
* @since 1.5
*/
public native void mkdir(String[] path, String message,
- boolean makeParents, Map revpropTable)
+ boolean makeParents,
+ Map<String, String> revpropTable)
throws ClientException;
/**
@@ -305,7 +309,7 @@
public native void doImport(String path, String url, String message,
int depth, boolean noIgnore,
boolean ignoreUnknownNodeTypes,
- Map revpropTable)
+ Map<String, String> revpropTable)
throws ClientException;
/**
@@ -417,7 +421,8 @@
*/
public native void propertySet(String path, String name, String value,
int depth, String[] changelists,
- boolean force, Map revpropTable)
+ boolean force,
+ Map<String, String> revpropTable)
throws ClientException;
/**
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameCallback.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameCallback.java?rev=916754&r1=916753&r2=916754&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameCallback.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameCallback.java Fri Feb 26 16:50:20 2010
@@ -47,8 +47,9 @@
* @param line the line in the file.
* @param localChange true if the line was locally modified.
*/
- public void singleLine(long lineNum, long revision, Map revProps,
- long mergedRevision, Map mergedRevProps,
+ public void singleLine(long lineNum, long revision,
+ Map<String, String> revProps, long mergedRevision,
+ Map<String, String> mergedRevProps,
String mergedPath, String line, boolean localChange)
throws ClientException;
}