Revision: 9751
http://svn.sourceforge.net/jedit/?rev=9751&view=rev
Author: daleanson
Date: 2007-06-14 13:15:29 -0700 (Thu, 14 Jun 2007)
Log Message:
-----------
more updates and adjustments
Modified Paths:
--------------
plugins/SVNPlugin/SVNPlugin.props
plugins/SVNPlugin/src/ise/plugin/svn/SVN2.java
plugins/SVNPlugin/src/ise/plugin/svn/action/AddAction.java
plugins/SVNPlugin/src/ise/plugin/svn/action/RevertAction.java
plugins/SVNPlugin/src/ise/plugin/svn/command/Add.java
plugins/SVNPlugin/src/ise/plugin/svn/data/CommitData.java
plugins/SVNPlugin/src/ise/plugin/svn/data/SVNData.java
Added Paths:
-----------
plugins/SVNPlugin/src/ise/plugin/svn/action/ResolvedAction.java
plugins/SVNPlugin/src/ise/plugin/svn/command/Resolved.java
plugins/SVNPlugin/src/ise/plugin/svn/command/Revert.java
Removed Paths:
-------------
plugins/SVNPlugin/src/ise/plugin/svn/command/CommitCommand.java
plugins/SVNPlugin/src/ise/plugin/svn/command/RevertCommand.java
plugins/SVNPlugin/src/ise/plugin/svn/command/UpdateCommand.java
plugins/SVNPlugin/src/ise/plugin/svn/data/AddData.java
Modified: plugins/SVNPlugin/SVNPlugin.props
===================================================================
--- plugins/SVNPlugin/SVNPlugin.props 2007-06-14 17:35:33 UTC (rev 9750)
+++ plugins/SVNPlugin/SVNPlugin.props 2007-06-14 20:15:29 UTC (rev 9751)
@@ -59,6 +59,8 @@
ise.plugin.svn.action.code.7=ise.plugin.svn.action.CheckoutAction
ise.plugin.svn.action.label.8=Cleanup
ise.plugin.svn.action.code.8=ise.plugin.svn.action.CleanupAction
+ise.plugin.svn.action.label.9=Resolve
+ise.plugin.svn.action.code.9=ise.plugin.svn.action.ResolvedAction
# register subversion commands with ProjectViewer
Modified: plugins/SVNPlugin/src/ise/plugin/svn/SVN2.java
===================================================================
--- plugins/SVNPlugin/src/ise/plugin/svn/SVN2.java 2007-06-14 17:35:33 UTC (rev 9750)
+++ plugins/SVNPlugin/src/ise/plugin/svn/SVN2.java 2007-06-14 20:15:29 UTC (rev 9751)
@@ -91,6 +91,9 @@
ourArguments.add( SVNArgument.PRE_14_COMPATIBLE );
}
+ /**
+ * @deprecated
+ */
public static String execute( String[] args ) {
if ( args == null || args.length < 1 ) {
throw new IllegalArgumentException( "usage: jsvn commandName commandArguments" );
Modified: plugins/SVNPlugin/src/ise/plugin/svn/action/AddAction.java
===================================================================
--- plugins/SVNPlugin/src/ise/plugin/svn/action/AddAction.java 2007-06-14 17:35:33 UTC (rev 9750)
+++ plugins/SVNPlugin/src/ise/plugin/svn/action/AddAction.java 2007-06-14 20:15:29 UTC (rev 9751)
@@ -4,7 +4,7 @@
import ise.plugin.svn.SVNPlugin;
import ise.plugin.svn.command.Add;
import ise.plugin.svn.command.Info;
-import ise.plugin.svn.data.AddData;
+import ise.plugin.svn.data.SVNData;
import ise.plugin.svn.data.AddResults;
import ise.plugin.svn.gui.AddDialog;
import ise.plugin.svn.gui.AddResultsPanel;
@@ -28,7 +28,7 @@
dialog = new AddDialog( view, nodes );
GUIUtils.center( view, dialog );
dialog.setVisible( true );
- final AddData cd = dialog.getAddData();
+ final SVNData cd = dialog.getSVNData();
if ( cd == null ) {
return ; // null means user cancelled
}
@@ -56,7 +56,7 @@
final AddResults results = add.add( cd );
SwingUtilities.invokeLater(new Runnable(){
public void run() {
- JPanel results_panel = new AddResultsPanel(results);
+ JPanel results_panel = new AddResultsPanel(results, true);
panel.setResultsPanel(results_panel);
panel.showTab(OutputPanel.RESULTS);
}
Added: plugins/SVNPlugin/src/ise/plugin/svn/action/ResolvedAction.java
===================================================================
--- plugins/SVNPlugin/src/ise/plugin/svn/action/ResolvedAction.java (rev 0)
+++ plugins/SVNPlugin/src/ise/plugin/svn/action/ResolvedAction.java 2007-06-14 20:15:29 UTC (rev 9751)
@@ -0,0 +1,97 @@
+package ise.plugin.svn.action;
+
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+import java.io.*;
+import java.util.*;
+import java.util.logging.*;
+import javax.swing.*;
+import projectviewer.vpt.VPTNode;
+import ise.plugin.svn.OutputPanel;
+import ise.plugin.svn.SVNPlugin;
+import ise.plugin.svn.command.Resolved;
+import ise.plugin.svn.data.SVNData;
+import ise.plugin.svn.data.AddResults;
+import ise.plugin.svn.library.GUIUtils;
+import ise.plugin.svn.gui.AddResultsPanel;
+import ise.plugin.svn.io.ConsolePrintStream;
+
+import org.tmatesoft.svn.core.wc.SVNInfo;
+
+public class ResolvedAction extends NodeActor {
+
+ public void actionPerformed( ActionEvent ae ) {
+ if ( nodes != null && nodes.size() > 0 ) {
+ final SVNData data = new SVNData();
+
+ // get the paths
+ boolean recursive = false;
+ List<String> paths = new ArrayList<String>();
+ for ( VPTNode node : nodes ) {
+ if ( node != null && node.getNodePath() != null ) {
+ paths.add( node.getNodePath() );
+ if (node.isDirectory()) {
+ recursive = true;
+ }
+ }
+ }
+
+ // user confirmations
+ if (recursive) {
+ // have the user verify they want a recursive resolve
+ int response = JOptionPane.showConfirmDialog(getView(), "Recursively resolve all files in selected directories?", "Recursive Resolved?", JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
+ if (response == JOptionPane.CANCEL_OPTION) {
+ return;
+ }
+ recursive = response == JOptionPane.YES_OPTION;
+ }
+ else {
+ // have the user confirm they really want to resolve
+ int response = JOptionPane.showConfirmDialog(getView(), "Resolve selected files?", "Confirm Resolve", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
+ if (response == JOptionPane.NO_OPTION) {
+ return;
+ }
+ }
+
+ data.setPaths( paths );
+
+ if ( username != null && password != null ) {
+ data.setUsername( username );
+ data.setPassword( password );
+ }
+
+ data.setOut( new ConsolePrintStream(this));
+
+ view.getDockableWindowManager().showDockableWindow( "subversion" );
+ final OutputPanel panel = SVNPlugin.getOutputPanel(view);
+ panel.showTab(OutputPanel.CONSOLE);
+ Logger logger = panel.getLogger();
+ logger.log(Level.INFO, "Resolving ...");
+ for(Handler handler : logger.getHandlers()) {
+ handler.flush();
+ }
+
+ SwingUtilities.invokeLater( new Runnable() {
+ public void run() {
+ try {
+ Resolved resolve = new Resolved();
+ final AddResults results = resolve.resolve( data );
+ SwingUtilities.invokeLater(new Runnable(){
+ public void run() {
+ JPanel results_panel = new AddResultsPanel(results, true);
+ panel.setResultsPanel(results_panel);
+ panel.showTab(OutputPanel.RESULTS);
+ }
+ });
+ }
+ catch ( Exception e ) {
+ data.getOut().printError( e.getMessage() );
+ }
+ data.getOut().close();
+ }
+ }
+ );
+ }
+ }
+
+}
Modified: plugins/SVNPlugin/src/ise/plugin/svn/action/RevertAction.java
===================================================================
--- plugins/SVNPlugin/src/ise/plugin/svn/action/RevertAction.java 2007-06-14 17:35:33 UTC (rev 9750)
+++ plugins/SVNPlugin/src/ise/plugin/svn/action/RevertAction.java 2007-06-14 20:15:29 UTC (rev 9751)
@@ -1,57 +1,97 @@
package ise.plugin.svn.action;
+import java.awt.event.ActionListener;
import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
+import java.io.*;
import java.util.*;
-import javax.swing.SwingUtilities;
-import javax.swing.JOptionPane;
-import ise.plugin.svn.command.RevertCommand;
+import java.util.logging.*;
+import javax.swing.*;
import projectviewer.vpt.VPTNode;
+import ise.plugin.svn.OutputPanel;
+import ise.plugin.svn.SVNPlugin;
+import ise.plugin.svn.command.Revert;
+import ise.plugin.svn.data.SVNData;
+import ise.plugin.svn.data.AddResults;
+import ise.plugin.svn.library.GUIUtils;
+import ise.plugin.svn.gui.AddResultsPanel;
+import ise.plugin.svn.io.ConsolePrintStream;
+import org.tmatesoft.svn.core.wc.SVNInfo;
+
public class RevertAction extends NodeActor {
public void actionPerformed( ActionEvent ae ) {
if ( nodes != null && nodes.size() > 0 ) {
+ final SVNData data = new SVNData();
- // if user has selected a directory, ask if the revert should be
- // applied recursively, and give the user the opportunity to
- // cancel the revert.
- final VPTNode node = nodes.get(0); // fix this, need to support multiple nodes
- boolean is_directory = node.isDirectory();
+ // get the paths
boolean recursive = false;
- if ( is_directory ) {
- int choice = JOptionPane.showConfirmDialog( null, "Revert all files in this directory and subdirectories?", "Apply Recursively?", JOptionPane.YES_NO_CANCEL_OPTION );
- if ( choice == JOptionPane.CANCEL_OPTION ) {
- return ;
+ List<String> paths = new ArrayList<String>();
+ for ( VPTNode node : nodes ) {
+ if ( node != null && node.getNodePath() != null ) {
+ paths.add( node.getNodePath() );
+ if (node.isDirectory()) {
+ recursive = true;
+ }
}
- recursive = choice == JOptionPane.YES_OPTION;
}
- final String recurse = recursive ? "--recursive" : "";
+ // user confirmations
+ if (recursive) {
+ // have the user verify they want a recursive revert
+ int response = JOptionPane.showConfirmDialog(getView(), "Recursively revert all files in selected directories?", "Recursive Revert?", JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
+ if (response == JOptionPane.CANCEL_OPTION) {
+ return;
+ }
+ recursive = response == JOptionPane.YES_OPTION;
+ }
+ else {
+ // have the user confirm they really want to revert
+ int response = JOptionPane.showConfirmDialog(getView(), "Revert selected files?", "Confirm Revert", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
+ if (response == JOptionPane.NO_OPTION) {
+ return;
+ }
+ }
+
+ data.setPaths( paths );
+
+ if ( username != null && password != null ) {
+ data.setUsername( username );
+ data.setPassword( password );
+ }
+
+ data.setOut( new ConsolePrintStream(this));
+
+ view.getDockableWindowManager().showDockableWindow( "subversion" );
+ final OutputPanel panel = SVNPlugin.getOutputPanel(view);
+ panel.showTab(OutputPanel.CONSOLE);
+ Logger logger = panel.getLogger();
+ logger.log(Level.INFO, "Reverting ...");
+ for(Handler handler : logger.getHandlers()) {
+ handler.flush();
+ }
+
SwingUtilities.invokeLater( new Runnable() {
public void run() {
- view.getDockableWindowManager().showDockableWindow( "console" );
- RevertCommand command = new RevertCommand();
- List<String> args = new ArrayList<String>();
- args.add(node.getNodePath());
- if (recurse.length() > 0) {
- args.add("--recursive");
- }
-
- String[] params = new String[args.size()];
- params = args.toArray(params);
-
try {
- String result = command.execute( params );
- print( result );
+ Revert revert = new Revert();
+ final AddResults results = revert.revert( data );
+ SwingUtilities.invokeLater(new Runnable(){
+ public void run() {
+ JPanel results_panel = new AddResultsPanel(results, true);
+ panel.setResultsPanel(results_panel);
+ panel.showTab(OutputPanel.RESULTS);
+ }
+ });
}
catch ( Exception e ) {
- printError( e.getMessage() );
- e.printStackTrace();
+ data.getOut().printError( e.getMessage() );
}
+ data.getOut().close();
}
}
);
}
}
+
}
Modified: plugins/SVNPlugin/src/ise/plugin/svn/command/Add.java
===================================================================
--- plugins/SVNPlugin/src/ise/plugin/svn/command/Add.java 2007-06-14 17:35:33 UTC (rev 9750)
+++ plugins/SVNPlugin/src/ise/plugin/svn/command/Add.java 2007-06-14 20:15:29 UTC (rev 9751)
@@ -11,7 +11,7 @@
import org.tmatesoft.svn.core.wc.SVNWCClient;
import org.tmatesoft.svn.core.wc.SVNWCUtil;
-import ise.plugin.svn.data.AddData;
+import ise.plugin.svn.data.SVNData;
import ise.plugin.svn.data.AddResults;
@@ -20,7 +20,7 @@
/**
* @return a list of paths that were scheduled to be added.
*/
- public AddResults add( AddData cd ) throws CommandInitializationException, SVNException {
+ public AddResults add( SVNData cd ) throws CommandInitializationException, SVNException {
// validate data values
if ( cd.getPaths() == null ) {
Deleted: plugins/SVNPlugin/src/ise/plugin/svn/command/CommitCommand.java
===================================================================
--- plugins/SVNPlugin/src/ise/plugin/svn/command/CommitCommand.java 2007-06-14 17:35:33 UTC (rev 9750)
+++ plugins/SVNPlugin/src/ise/plugin/svn/command/CommitCommand.java 2007-06-14 20:15:29 UTC (rev 9751)
@@ -1,61 +0,0 @@
-package ise.plugin.svn.command;
-
-import java.io.File;
-import java.util.*;
-import ise.plugin.svn.SVN2;
-
-public class CommitCommand implements Command {
-
- /**
- * params[0] directory or filename, required
- * params[1] message for commit, required
- * params[2] username, optional
- * params[3] password, required if username, otherwise optional
- */
- public String execute( String[] params ) throws CommandInitializationException, CommandExecutionException {
- if ( params == null || params.length < 2 ) {
- throw new CommandInitializationException( "Must have directory or filename and commit message." );
- }
-
- // make sure there is a directory or filename
- if ( params[ 0 ] == null || params[ 0 ].equals( "" ) ) {
- throw new CommandInitializationException( "Directory or filename cannot be null for commit." );
- }
- String path = params[0];
-
- // make sure there is a commit message
- String message = null;
- if ( params[ 1 ] == null || params[ 1 ].equals("") ) {
- throw new CommandInitializationException( "Message required for commit." );
- }
- message = params[1];
-
- // gather the command arguments
- List<String> args = new ArrayList<String>();
- args.add("commit");
- args.add("-m \"" + message + "\"");
- args.add(path);
-
- // check for username/password
- if (params.length == 4) {
- String username = params[3] != null && params[3].length() > 0 ? params[3] : null;
- String password = params[4] != null && params[4].length() > 0 ? params[4] : null;
- if (username != null && password != null) {
- args.add("--username " + username);
- args.add("--password " + password);
- }
- }
-
- // run the command
- String[] command = new String[args.size()];
- command = args.toArray(command);
-
- try {
- return SVN2.execute( command );
- }
- catch ( Exception e ) {
- e.printStackTrace();
- throw new CommandExecutionException( e );
- }
- }
-}
Added: plugins/SVNPlugin/src/ise/plugin/svn/command/Resolved.java
===================================================================
--- plugins/SVNPlugin/src/ise/plugin/svn/command/Resolved.java (rev 0)
+++ plugins/SVNPlugin/src/ise/plugin/svn/command/Resolved.java 2007-06-14 20:15:29 UTC (rev 9751)
@@ -0,0 +1,75 @@
+package ise.plugin.svn.command;
+
+import java.io.*;
+import java.util.*;
+
+import org.tmatesoft.svn.core.wc.ISVNOptions;
+import org.tmatesoft.svn.core.wc.SVNClientManager;
+import org.tmatesoft.svn.cli.command.SVNCommandEventProcessor;
+
+import org.tmatesoft.svn.core.SVNException;
+import org.tmatesoft.svn.core.wc.SVNWCClient;
+import org.tmatesoft.svn.core.wc.SVNWCUtil;
+
+import ise.plugin.svn.data.SVNData;
+import ise.plugin.svn.data.AddResults;
+
+
+public class Resolved {
+
+ /**
+ * @return a list of paths to be resolved. This is very similar to an "add".
+ */
+ public AddResults resolve( SVNData cd ) throws CommandInitializationException, SVNException {
+
+ // validate data values
+ if ( cd.getPaths() == null ) {
+ return null; // nothing to do
+ }
+ if ( cd.getOut() == null ) {
+ throw new CommandInitializationException( "Invalid output stream." );
+ }
+ if ( cd.getErr() == null ) {
+ cd.setErr( cd.getOut() );
+ }
+
+ // convert paths to Files
+ List<String> paths = cd.getPaths();
+ File[] localPaths = new File[ paths.size() ];
+ for ( int i = 0; i < paths.size(); i++ ) {
+ localPaths[ i ] = new File( paths.get( i ) );
+ // check for file existence?
+ }
+
+ // use default svn config options
+ ISVNOptions options = SVNWCUtil.createDefaultOptions( true );
+
+ // use the svnkit client manager
+ SVNClientManager clientManager = SVNClientManager.newInstance( options, cd.getUsername(), cd.getPassword() );
+
+ // get a commit client
+ SVNWCClient client = clientManager.getWCClient();
+
+ // set an event handler so that messages go to the commit data streams for display
+ client.setEventHandler( new SVNCommandEventProcessor( cd.getOut(), cd.getErr(), false ) );
+
+ // actually do the reverts(s)
+ PrintStream out = cd.getOut();
+ AddResults results = new AddResults();
+ for ( String path : paths ) {
+ try {
+ File file = new File(path);
+ client.doResolve(file, cd.getRecursive());
+ results.addPath(path);
+ }
+ catch ( Exception e ) {
+ out.println( e.getMessage() );
+ results.addErrorPath(path, e.getMessage());
+ }
+ }
+
+ out.flush();
+ out.close();
+ return results;
+ }
+}
Added: plugins/SVNPlugin/src/ise/plugin/svn/command/Revert.java
===================================================================
--- plugins/SVNPlugin/src/ise/plugin/svn/command/Revert.java (rev 0)
+++ plugins/SVNPlugin/src/ise/plugin/svn/command/Revert.java 2007-06-14 20:15:29 UTC (rev 9751)
@@ -0,0 +1,75 @@
+package ise.plugin.svn.command;
+
+import java.io.*;
+import java.util.*;
+
+import org.tmatesoft.svn.core.wc.ISVNOptions;
+import org.tmatesoft.svn.core.wc.SVNClientManager;
+import org.tmatesoft.svn.cli.command.SVNCommandEventProcessor;
+
+import org.tmatesoft.svn.core.SVNException;
+import org.tmatesoft.svn.core.wc.SVNWCClient;
+import org.tmatesoft.svn.core.wc.SVNWCUtil;
+
+import ise.plugin.svn.data.SVNData;
+import ise.plugin.svn.data.AddResults;
+
+
+public class Revert {
+
+ /**
+ * @return a list of paths to be reverted. This is very similar to an "add".
+ */
+ public AddResults revert( SVNData cd ) throws CommandInitializationException, SVNException {
+
+ // validate data values
+ if ( cd.getPaths() == null ) {
+ return null; // nothing to do
+ }
+ if ( cd.getOut() == null ) {
+ throw new CommandInitializationException( "Invalid output stream." );
+ }
+ if ( cd.getErr() == null ) {
+ cd.setErr( cd.getOut() );
+ }
+
+ // convert paths to Files
+ List<String> paths = cd.getPaths();
+ File[] localPaths = new File[ paths.size() ];
+ for ( int i = 0; i < paths.size(); i++ ) {
+ localPaths[ i ] = new File( paths.get( i ) );
+ // check for file existence?
+ }
+
+ // use default svn config options
+ ISVNOptions options = SVNWCUtil.createDefaultOptions( true );
+
+ // use the svnkit client manager
+ SVNClientManager clientManager = SVNClientManager.newInstance( options, cd.getUsername(), cd.getPassword() );
+
+ // get a commit client
+ SVNWCClient client = clientManager.getWCClient();
+
+ // set an event handler so that messages go to the commit data streams for display
+ client.setEventHandler( new SVNCommandEventProcessor( cd.getOut(), cd.getErr(), false ) );
+
+ // actually do the reverts(s)
+ PrintStream out = cd.getOut();
+ AddResults results = new AddResults();
+ for ( String path : paths ) {
+ try {
+ File file = new File(path);
+ client.doRevert(file, cd.getRecursive());
+ results.addPath(path);
+ }
+ catch ( Exception e ) {
+ out.println( e.getMessage() );
+ results.addErrorPath(path, e.getMessage());
+ }
+ }
+
+ out.flush();
+ out.close();
+ return results;
+ }
+}
Deleted: plugins/SVNPlugin/src/ise/plugin/svn/command/RevertCommand.java
===================================================================
--- plugins/SVNPlugin/src/ise/plugin/svn/command/RevertCommand.java 2007-06-14 17:35:33 UTC (rev 9750)
+++ plugins/SVNPlugin/src/ise/plugin/svn/command/RevertCommand.java 2007-06-14 20:15:29 UTC (rev 9751)
@@ -1,43 +0,0 @@
-package ise.plugin.svn.command;
-
-import java.io.File;
-import java.util.*;
-import ise.plugin.svn.SVN2;
-
-public class RevertCommand implements Command {
-
- /**
- * params[0] directory or filename, required
- * params[1] --recursive, this is optional
- * params[2] username, optional
- * params[3] password, required if username, otherwise optional
- */
- public String execute( String[] params ) throws
- CommandInitializationException, CommandExecutionException {
-
- if ( params == null || params.length < 1 ) {
- throw new CommandInitializationException( "Must have directory or file name to revert." );
- }
- String path = params[0];
-
- boolean recursive = params.length > 1 && params[1].equals("--recursive");
-
- List<String> args = new ArrayList<String>();
- args.add("revert");
- if (recursive) {
- args.add("--recursive");
- }
- args.add(path);
-
- // run the command
- String[] command = new String[args.size()];
- command = args.toArray(command);
-
- try {
- return SVN2.execute(command);
- }
- catch ( Exception e ) {
- throw new CommandExecutionException(e);
- }
- }
-}
Deleted: plugins/SVNPlugin/src/ise/plugin/svn/command/UpdateCommand.java
===================================================================
--- plugins/SVNPlugin/src/ise/plugin/svn/command/UpdateCommand.java 2007-06-14 17:35:33 UTC (rev 9750)
+++ plugins/SVNPlugin/src/ise/plugin/svn/command/UpdateCommand.java 2007-06-14 20:15:29 UTC (rev 9751)
@@ -1,45 +0,0 @@
-package ise.plugin.svn.command;
-
-import java.io.File;
-import java.util.*;
-import ise.plugin.svn.SVN2;
-
-public class UpdateCommand implements Command {
-
- /**
- * params[0] directory or filename, required
- */
- public String execute( String[] params ) throws
- CommandInitializationException, CommandExecutionException {
-
- if ( params == null || params.length != 1 ) {
- throw new CommandInitializationException( "Must have directory or file name to update." );
- }
- String path = params[0];
-
- List<String> args = new ArrayList<String>();
- args.add("update");
- args.add(path);
-
- // check for username/password
- if (params.length == 3) {
- String username = params[2] != null && params[2].length() > 0 ? params[2] : null;
- String password = params[3] != null && params[3].length() > 0 ? params[3] : null;
- if (username != null && password != null) {
- args.add("--username " + username);
- args.add("--password " + password);
- }
- }
-
-
-
- // run svn update on the selected item
- try {
- String[] command = new String[]{"update", params[0]};
- return SVN2.execute(command);
- }
- catch ( Exception e ) {
- throw new CommandExecutionException(e);
- }
- }
-}
Deleted: plugins/SVNPlugin/src/ise/plugin/svn/data/AddData.java
===================================================================
--- plugins/SVNPlugin/src/ise/plugin/svn/data/AddData.java 2007-06-14 17:35:33 UTC (rev 9750)
+++ plugins/SVNPlugin/src/ise/plugin/svn/data/AddData.java 2007-06-14 20:15:29 UTC (rev 9751)
@@ -1,40 +0,0 @@
-package ise.plugin.svn.data;
-
-import java.io.*;
-import java.util.*;
-import ise.plugin.svn.io.ConsolePrintStream;
-
-/**
- * Data to pass to an "add" command.
- */
-public class AddData extends SVNData {
- private boolean recursive = true;
-
- public AddData(){}
-
- public AddData( ConsolePrintStream out,
- ConsolePrintStream err,
- List<String> paths,
- boolean recursive,
- String username,
- String password ) {
- super(out, err, paths, username, password);
- this.recursive = recursive;
- }
-
- /**
- * Returns the value of recursive.
- */
- public boolean getRecursive() {
- return recursive;
- }
-
- /**
- * Sets the value of recursive.
- * @param recursive The value to assign recursive.
- */
- public void setRecursive( boolean recursive ) {
- this.recursive = recursive;
- }
-
-}
Modified: plugins/SVNPlugin/src/ise/plugin/svn/data/CommitData.java
===================================================================
--- plugins/SVNPlugin/src/ise/plugin/svn/data/CommitData.java 2007-06-14 17:35:33 UTC (rev 9750)
+++ plugins/SVNPlugin/src/ise/plugin/svn/data/CommitData.java 2007-06-14 20:15:29 UTC (rev 9751)
@@ -7,7 +7,6 @@
public class CommitData extends SVNData {
private boolean keepLocks = true;
private String commitMessage = "";
- private boolean recursive = true;
public CommitData(){}
@@ -19,10 +18,9 @@
boolean recursive,
String username,
String password ) {
- super(out, err, paths, username, password);
+ super(out, err, paths, username, password, recursive);
this.keepLocks = keepLocks;
this.commitMessage = commitMessage;
- this.recursive = recursive;
}
/**
@@ -55,19 +53,4 @@
this.commitMessage = commitMessage;
}
- /**
- * Returns the value of recursive.
- */
- public boolean getRecursive() {
- return recursive;
- }
-
- /**
- * Sets the value of recursive.
- * @param recursive The value to assign recursive.
- */
- public void setRecursive( boolean recursive ) {
- this.recursive = recursive;
- }
-
}
Modified: plugins/SVNPlugin/src/ise/plugin/svn/data/SVNData.java
===================================================================
--- plugins/SVNPlugin/src/ise/plugin/svn/data/SVNData.java 2007-06-14 17:35:33 UTC (rev 9750)
+++ plugins/SVNPlugin/src/ise/plugin/svn/data/SVNData.java 2007-06-14 20:15:29 UTC (rev 9751)
@@ -13,6 +13,7 @@
private List<String> paths;
private String username = "";
private String password = "";
+ private boolean recursive = false;
public SVNData(){}
@@ -20,12 +21,14 @@
ConsolePrintStream err,
List<String> paths,
String username,
- String password ) {
+ String password,
+ boolean recursive) {
this.out = out;
this.err = err;
this.paths = paths;
this.username = username;
this.password = password;
+ this.recursive = recursive;
}
/**
@@ -103,6 +106,19 @@
this.password = password;
}
+ /**
+ * Returns the value of recursive.
+ */
+ public boolean getRecursive() {
+ return recursive;
+ }
+ /**
+ * Sets the value of recursive.
+ * @param recursive The value to assign recursive.
+ */
+ public void setRecursive( boolean recursive ) {
+ this.recursive = recursive;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
