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/06/16 04:15:56 UTC
svn commit: r955113 - in
/subversion/trunk/subversion/bindings/javahl/src/org:
apache/subversion/javahl/ReposNotifyInformation.java
tigris/subversion/javahl/SVNAdmin.java
Author: hwright
Date: Wed Jun 16 02:15:55 2010
New Revision: 955113
URL: http://svn.apache.org/viewvc?rev=955113&view=rev
Log:
JavaHL: Fix the compat build failures introduced by r954003 and r954009.
[ in subversion/bindings/javahl/ ]
* src/org/apache/subversion/javahl/ReposNotifyInformation.java
(getWarning): New.
* src/org/tigris/subversion/javahl/SVNAdmin.java
(dump, verify): Use a wrapper class to fix the API call.
(ReposNotifyHandler): New.
Modified:
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java?rev=955113&r1=955112&r2=955113&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java Wed Jun 16 02:15:55 2010
@@ -89,6 +89,14 @@ public class ReposNotifyInformation exte
}
/**
+ * @return The warning text.
+ */
+ public String getWarning()
+ {
+ return warning;
+ }
+
+ /**
* The type of action triggering the notification
*/
public enum Action
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java?rev=955113&r1=955112&r2=955113&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java Wed Jun 16 02:15:55 2010
@@ -170,10 +170,10 @@ public class SVNAdmin
try
{
aSVNAdmin.dump(new File(path), new OutputWrapper(dataOut),
- new OutputWrapper(errorOut),
start == null ? null : start.toApache(),
end == null ? null : end.toApache(),
- incremental, useDeltas);
+ incremental, useDeltas,
+ new ReposNotifyHandler(errorOut));
}
catch (org.apache.subversion.javahl.ClientException ex)
{
@@ -436,9 +436,10 @@ public class SVNAdmin
{
try
{
- aSVNAdmin.verify(new File(path), new OutputWrapper(messageOut),
+ aSVNAdmin.verify(new File(path),
start == null ? null : start.toApache(),
- end == null ? null : end.toApache());
+ end == null ? null : end.toApache(),
+ new ReposNotifyHandler(messageOut));
}
catch (org.apache.subversion.javahl.ClientException ex)
{
@@ -550,4 +551,49 @@ public class SVNAdmin
inputer.close();
}
}
+
+ private class ReposNotifyHandler
+ implements org.apache.subversion.javahl.callback.ReposNotifyCallback
+ {
+ private OutputInterface outputer;
+
+ public ReposNotifyHandler(OutputInterface outputer)
+ {
+ this.outputer = outputer;
+ }
+
+ public void onNotify(org.apache.subversion.javahl.ReposNotifyInformation
+ info)
+ {
+ String val;
+
+ switch (info.getAction())
+ {
+ case warning:
+ val = info.getWarning();
+ break;
+
+ case dump_rev_end:
+ val = "* Dumped revision " + info.getRevision() + ".\n";
+ break;
+
+ case verify_rev_end:
+ val = "* Verified revision " + info.getRevision() + ".\n";
+ break;
+
+ default:
+ val = null;
+ }
+
+ if (val != null)
+ try
+ {
+ outputer.write(val.getBytes());
+ }
+ catch (IOException ex)
+ {
+ ; // ignore
+ }
+ }
+ }
}