From: <dal...@us...> - 2007-12-31 23:21:20
|
Revision: 11500 http://jedit.svn.sourceforge.net/jedit/?rev=11500&view=rev Author: daleanson Date: 2007-12-31 15:21:18 -0800 (Mon, 31 Dec 2007) Log Message: ----------- added lock and unlock to svn browser Modified Paths: -------------- plugins/SVNPlugin/trunk/src/ise/plugin/svn/action/LockAction.java plugins/SVNPlugin/trunk/src/ise/plugin/svn/action/UnlockAction.java plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/BrowseRepositoryPanel.java plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/LockDialog.java plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/StatusResultsPanel.java plugins/SVNPlugin/trunk/src/ise/plugin/svn/pv/LockActor.java plugins/SVNPlugin/trunk/src/ise/plugin/svn/pv/UnlockActor.java Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/action/LockAction.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/action/LockAction.java 2007-12-31 23:06:25 UTC (rev 11499) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/action/LockAction.java 2007-12-31 23:21:18 UTC (rev 11500) @@ -63,6 +63,7 @@ private List<String> paths = null; private String username = null; private String password = null; + private boolean remote = false; /** * @param view the View in which to display results @@ -70,7 +71,7 @@ * @param username the username for the svn repository * @param password the password for the username */ - public LockAction( View view, List<String> paths, String username, String password ) { + public LockAction( View view, List<String> paths, String username, String password, boolean remote ) { if ( view == null ) throw new IllegalArgumentException( "view may not be null" ); if ( paths == null ) @@ -79,12 +80,13 @@ this.paths = paths; this.username = username; this.password = password; + this.remote = remote; } public void actionPerformed( ActionEvent ae ) { if ( paths != null && paths.size() > 0 ) { - dialog = new LockDialog( view, paths, true ); + dialog = new LockDialog( view, paths, true, remote ); GUIUtils.center( view, dialog ); dialog.setVisible( true ); final CommitData cd = dialog.getData(); Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/action/UnlockAction.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/action/UnlockAction.java 2007-12-31 23:06:25 UTC (rev 11499) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/action/UnlockAction.java 2007-12-31 23:21:18 UTC (rev 11500) @@ -63,6 +63,7 @@ private List<String> paths = null; private String username = null; private String password = null; + private boolean remote = false; /** * @param view the View in which to display results @@ -70,7 +71,7 @@ * @param username the username for the svn repository * @param password the password for the username */ - public UnlockAction( View view, List<String> paths, String username, String password ) { + public UnlockAction( View view, List<String> paths, String username, String password, boolean remote ) { if ( view == null ) throw new IllegalArgumentException( "view may not be null" ); if ( paths == null ) @@ -79,12 +80,13 @@ this.paths = paths; this.username = username; this.password = password; + this.remote = remote; } public void actionPerformed( ActionEvent ae ) { if ( paths != null && paths.size() > 0 ) { - dialog = new LockDialog( view, paths, false ); + dialog = new LockDialog( view, paths, false, remote ); GUIUtils.center( view, dialog ); dialog.setVisible( true ); final CommitData cd = dialog.getData(); Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/BrowseRepositoryPanel.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/BrowseRepositoryPanel.java 2007-12-31 23:06:25 UTC (rev 11499) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/BrowseRepositoryPanel.java 2007-12-31 23:21:18 UTC (rev 11500) @@ -677,6 +677,7 @@ } ); + pm.addSeparator(); mi = new JMenuItem( "Delete" ); pm.add( mi ); mi.addActionListener( new ActionListener() { @@ -704,6 +705,60 @@ } ); + mi = new JMenuItem( "Lock" ); + pm.add( mi ); + mi.addActionListener( new ActionListener() { + public void actionPerformed( ActionEvent ae ) { + TreePath[] tree_paths = tree.getSelectionPaths(); + if ( tree_paths.length == 0 ) { + return ; + } + List<String> paths = new ArrayList<String>(); + for ( TreePath path : tree_paths ) { + if ( path != null ) { + Object[] parts = path.getPath(); + StringBuilder sb = new StringBuilder(); + sb.append( parts[ 0 ] ); + for ( int i = 1; i < parts.length; i++ ) { + sb.append( "/" ).append( parts[ i ].toString() ); + } + String url = sb.toString(); + paths.add( url ); + } + } + LockAction action = new LockAction( view, paths, username, password, true ); + action.actionPerformed( ae ); + } + } + ); + + mi = new JMenuItem( "Unlock" ); + pm.add( mi ); + mi.addActionListener( new ActionListener() { + public void actionPerformed( ActionEvent ae ) { + TreePath[] tree_paths = tree.getSelectionPaths(); + if ( tree_paths.length == 0 ) { + return ; + } + List<String> paths = new ArrayList<String>(); + for ( TreePath path : tree_paths ) { + if ( path != null ) { + Object[] parts = path.getPath(); + StringBuilder sb = new StringBuilder(); + sb.append( parts[ 0 ] ); + for ( int i = 1; i < parts.length; i++ ) { + sb.append( "/" ).append( parts[ i ].toString() ); + } + String url = sb.toString(); + paths.add( url ); + } + } + UnlockAction action = new UnlockAction( view, paths, username, password, true ); + action.actionPerformed( ae ); + } + } + ); + return pm; } Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/LockDialog.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/LockDialog.java 2007-12-31 23:06:25 UTC (rev 11499) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/LockDialog.java 2007-12-31 23:21:18 UTC (rev 11500) @@ -62,6 +62,7 @@ private View view = null; private List<String> nodes = null; private boolean lock = true; + private boolean remote = false; private JTextArea comment = null; private PropertyComboBox commentList = null; @@ -69,7 +70,7 @@ private CommitData lockData = null; - public LockDialog( View view, List<String> nodes, boolean lock ) { + public LockDialog( View view, List<String> nodes, boolean lock, boolean remote ) { super( ( JFrame ) view, ( lock ? "Lock" : "Unlock" ), true ); if ( nodes == null ) { throw new IllegalArgumentException( "nodes may not be null" ); @@ -77,6 +78,7 @@ this.view = view; this.nodes = nodes; this.lock = lock; + this.remote = remote; _init(); } @@ -95,6 +97,7 @@ } } lockData.setPaths( paths ); + lockData.setPathsAreURLs( remote ); JLabel file_label = new JLabel( lock ? "Locking these files:" : "Unlocking these files:" ); BestRowTable file_table = new BestRowTable(); Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/StatusResultsPanel.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/StatusResultsPanel.java 2007-12-31 23:06:25 UTC (rev 11499) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/StatusResultsPanel.java 2007-12-31 23:21:18 UTC (rev 11500) @@ -371,7 +371,7 @@ paths.add( ( String ) ( ( DefaultMutableTreeNode ) path.getLastPathComponent() ).getUserObject() ); } } - UnlockAction action = new UnlockAction( view, paths, username, password ); + UnlockAction action = new UnlockAction( view, paths, username, password, false ); action.actionPerformed( ae ); } } Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/pv/LockActor.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/pv/LockActor.java 2007-12-31 23:06:25 UTC (rev 11499) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/pv/LockActor.java 2007-12-31 23:21:18 UTC (rev 11500) @@ -64,7 +64,7 @@ } } - LockAction action = new LockAction(view, paths, username, password); + LockAction action = new LockAction(view, paths, username, password, false); action.actionPerformed(ae); } } Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/pv/UnlockActor.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/pv/UnlockActor.java 2007-12-31 23:06:25 UTC (rev 11499) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/pv/UnlockActor.java 2007-12-31 23:21:18 UTC (rev 11500) @@ -64,7 +64,7 @@ } } - UnlockAction action = new UnlockAction(view, paths, username, password); + UnlockAction action = new UnlockAction(view, paths, username, password, false); action.actionPerformed(ae); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |