From: <dal...@us...> - 2009-01-15 15:55:20
|
Revision: 14356 http://jedit.svn.sourceforge.net/jedit/?rev=14356&view=rev Author: daleanson Date: 2009-01-15 15:55:06 +0000 (Thu, 15 Jan 2009) Log Message: ----------- more work on converting to svnkit 1.2 Modified Paths: -------------- plugins/SVNPlugin/trunk/src/ise/plugin/svn/action/CopyAction.java plugins/SVNPlugin/trunk/src/ise/plugin/svn/command/Checkout.java plugins/SVNPlugin/trunk/src/ise/plugin/svn/command/Copy.java plugins/SVNPlugin/trunk/src/ise/plugin/svn/command/Import.java plugins/SVNPlugin/trunk/src/ise/plugin/svn/command/Property.java plugins/SVNPlugin/trunk/src/ise/plugin/svn/data/CopyData.java Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/action/CopyAction.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/action/CopyAction.java 2009-01-15 11:46:11 UTC (rev 14355) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/action/CopyAction.java 2009-01-15 15:55:06 UTC (rev 14356) @@ -81,6 +81,7 @@ throw new IllegalArgumentException( "data may not be null" ); this.data = data; this.title = data.getTitle(); + System.out.println("+++++ CopyAction, " + data.toString()); } Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/command/Checkout.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/command/Checkout.java 2009-01-15 11:46:11 UTC (rev 14355) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/command/Checkout.java 2009-01-15 15:55:06 UTC (rev 14356) @@ -31,6 +31,7 @@ import java.io.*; import java.util.*; +import org.tmatesoft.svn.core.SVNDepth; import org.tmatesoft.svn.core.wc.SVNUpdateClient; import org.tmatesoft.svn.core.wc.SVNRevision; import org.tmatesoft.svn.core.wc.ISVNOptions; @@ -85,7 +86,7 @@ client.setEventHandler( new SVNCommandEventProcessor( out, cd.getErr(), false ) ); - long revision = client.doCheckout(SVNURL.parseURIDecoded(cd.getURL()), localPath, SVNRevision.HEAD, SVNRevision.HEAD, true); + long revision = client.doCheckout(SVNURL.parseURIDecoded(cd.getURL()), localPath, SVNRevision.HEAD, SVNRevision.HEAD, SVNDepth.INFINITY, false); out.flush(); out.close(); Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/command/Copy.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/command/Copy.java 2009-01-15 11:46:11 UTC (rev 14355) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/command/Copy.java 2009-01-15 15:55:06 UTC (rev 14356) @@ -56,6 +56,7 @@ public class Copy { public SVNCommitInfo copy( CopyData data ) throws CommandInitializationException, SVNException { + System.out.println("+++++ " + data.toString()); SVNKit.setupLibrary(); // validate data values Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/command/Import.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/command/Import.java 2009-01-15 11:46:11 UTC (rev 14355) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/command/Import.java 2009-01-15 15:55:06 UTC (rev 14356) @@ -35,6 +35,7 @@ import org.tmatesoft.svn.core.wc.SVNClientManager; import org.tmatesoft.svn.core.SVNCommitInfo; +import org.tmatesoft.svn.core.SVNDepth; import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.SVNURL; import org.tmatesoft.svn.core.wc.SVNCommitClient; @@ -96,7 +97,7 @@ }); // make the directories - SVNCommitInfo info = client.doImport( from, to, cd.getMessage(), true ); + SVNCommitInfo info = client.doImport( from, to, cd.getMessage(), null, false, false, SVNDepth.INFINITY ); // handle the results PrintStream out = cd.getOut(); Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/command/Property.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/command/Property.java 2009-01-15 11:46:11 UTC (rev 14355) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/command/Property.java 2009-01-15 15:55:06 UTC (rev 14356) @@ -85,7 +85,7 @@ if ( data.getUsername() != null ) { // use default svn config options ISVNOptions options = SVNWCUtil.createDefaultOptions( true ); - clientManager = SVNClientManager.newInstance( options, new BasicAuthenticationManager(data.getUsername(), data.getDecryptedPassword() )); + clientManager = SVNClientManager.newInstance( options, new BasicAuthenticationManager( data.getUsername(), data.getDecryptedPassword() ) ); } else { clientManager = SVNClientManager.newInstance(); @@ -105,7 +105,7 @@ String value = data.getValue(); PropertyHandler handler = new PropertyHandler( file ); if ( name != null ) { - wc_client.doSetProperty( file, name, SVNPropertyValue.create(value), data.getForce(), data.getRecursive() ? SVNDepth.INFINITY : SVNDepth.EMPTY, handler, (Collection)null ); + wc_client.doSetProperty( file, name, SVNPropertyValue.create( value ), data.getForce(), data.getRecursive() ? SVNDepth.INFINITY : SVNDepth.EMPTY, handler, ( Collection ) null ); } else { // check for multiple properties @@ -116,7 +116,7 @@ if ( key != null ) { name = key.toString(); value = String.valueOf( me.getValue() ); - wc_client.doSetProperty( file, name, SVNPropertyValue.create(value), data.getForce(), data.getRecursive() ? SVNDepth.INFINITY : SVNDepth.EMPTY, handler, (Collection)null ); + wc_client.doSetProperty( file, name, SVNPropertyValue.create( value ), data.getForce(), data.getRecursive() ? SVNDepth.INFINITY : SVNDepth.EMPTY, handler, ( Collection ) null ); } } } @@ -160,7 +160,7 @@ if ( data.getUsername() != null ) { // use default svn config options ISVNOptions options = SVNWCUtil.createDefaultOptions( true ); - clientManager = SVNClientManager.newInstance( options, new BasicAuthenticationManager(data.getUsername(), data.getDecryptedPassword()) ); + clientManager = SVNClientManager.newInstance( options, new BasicAuthenticationManager( data.getUsername(), data.getDecryptedPassword() ) ); } else { clientManager = SVNClientManager.newInstance(); @@ -230,14 +230,19 @@ path = p; } public void handleProperty( File path, SVNPropertyData property ) { + if ( property == null ) { + return ; + } String key = path.toString(); Properties prop = ( Properties ) results.get( key ); if ( prop == null ) { prop = new Properties(); results.put( key, prop ); } - prop.setProperty( property.getName(), property.getValue().getString() ); - out.println( "F " + path + ": " + property.getName() + " = " + property.getValue().getString() ); + if ( property.getName() != null && property.getValue() != null && property.getValue().getString() != null ) { + prop.setProperty( property.getName(), property.getValue().getString() ); + out.println( "F " + path + ": " + property.getName() + " = " + property.getValue().getString() ); + } } public void handleProperty( long revision, SVNPropertyData property ) { @@ -293,7 +298,7 @@ org.tmatesoft.svn.core.internal.io.svn.SVNRepositoryFactoryImpl.setup(); org.tmatesoft.svn.core.internal.io.fs.FSRepositoryFactory.setup(); ISVNOptions options = SVNWCUtil.createDefaultOptions( true ); - SVNClientManager clientManager = SVNClientManager.newInstance( options, new BasicAuthenticationManager("daleanson", "" )); + SVNClientManager clientManager = SVNClientManager.newInstance( options, new BasicAuthenticationManager( "daleanson", "" ) ); SVNWCClient wc_client = clientManager.getWCClient(); Property prop = new Property(); prop.out = System.out; Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/data/CopyData.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/data/CopyData.java 2009-01-15 11:46:11 UTC (rev 14355) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/data/CopyData.java 2009-01-15 15:55:06 UTC (rev 14356) @@ -71,6 +71,36 @@ private String title = "Copy"; + public String toString() { + StringBuffer sb = new StringBuffer(); + sb.append(title); + sb.append("["); + if (sourceFile != null) { + sb.append("sourceFile:").append(sourceFile).append(", "); + } + if (sourceFiles != null) { + sb.append("sourceFiles:"); + for(File f : sourceFiles) { + sb.append(f.getAbsolutePath()).append(", "); + } + } + if (sourceURL != null) { + sb.append("sourceURL:").append(sourceURL).append(", "); + } + if (sourceURLs != null) { + sb.append("sourceURLs:"); + for (SVNURL url : sourceURLs) { + sb.append(url.toString()).append(", "); + } + } + sb.append("destinationFile:").append(destinationFile).append(", "); + sb.append("destinationURL:").append(destinationURL).append(", "); + sb.append("isMove:").append(isMove).append(", "); + sb.append("message:").append(message).append("]"); + return sb.toString(); + } + + // set/get commit message public void setMessage(String m) { message = m; @@ -112,8 +142,10 @@ sourceFiles = files; } public SVNCopySource[] getSourceFiles() { - if (sourceFiles == null && sourceFile != null) { + if (sourceFiles == null) { sourceFiles = new ArrayList<File>(); + } + if (sourceFile != null && !sourceFiles.contains(sourceFile)) { sourceFiles.add(sourceFile); } SVNCopySource[] sources = new SVNCopySource[sourceFiles.size()]; @@ -134,8 +166,10 @@ } public SVNCopySource[] getSourceURLs() { - if (sourceURLs == null && sourceURL != null) { + if (sourceURLs == null) { sourceURLs = new ArrayList<SVNURL>(); + } + if (sourceURL != null && !sourceURLs.contains(sourceURL)) { sourceURLs.add(sourceURL); } SVNCopySource[] sources = new SVNCopySource[sourceURLs.size()]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |