From: <dal...@us...> - 2008-01-23 05:31:08
|
Revision: 11627 http://jedit.svn.sourceforge.net/jedit/?rev=11627&view=rev Author: daleanson Date: 2008-01-22 21:31:05 -0800 (Tue, 22 Jan 2008) Log Message: ----------- lots of minor adjustments. Modified Paths: -------------- plugins/SVNPlugin/trunk/SVNPlugin.props plugins/SVNPlugin/trunk/src/ise/plugin/svn/SVNPlugin.java plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/AddDialog.java plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/BestRowTable.java plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/CopyDialog.java plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/ExportDialog.java plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/LogDialog.java plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/LogResultsPanel.java plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/MoveDialog.java plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/RevisionSelectionPanel.java plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/SVNInfoPanel.java plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/StatusResultsPanel.java plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/SwitchDialog.java plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/TagBranchDialog.java plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/TextAreaContextMenu.java plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/UpdateDialog.java plugins/SVNPlugin/trunk/src/ise/plugin/svn/library/TableCellViewer.java Modified: plugins/SVNPlugin/trunk/SVNPlugin.props =================================================================== --- plugins/SVNPlugin/trunk/SVNPlugin.props 2008-01-23 00:28:11 UTC (rev 11626) +++ plugins/SVNPlugin/trunk/SVNPlugin.props 2008-01-23 05:31:05 UTC (rev 11627) @@ -28,7 +28,7 @@ subversion.browser.label=SVN Browser # new setting for jEdit 4.2 -plugin.ise.plugin.svn.SVNPlugin.activate=defer +plugin.ise.plugin.svn.SVNPlugin.activate=startup # ProjectViewer option pane Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/SVNPlugin.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/SVNPlugin.java 2008-01-23 00:28:11 UTC (rev 11626) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/SVNPlugin.java 2008-01-23 05:31:05 UTC (rev 11627) @@ -59,14 +59,12 @@ } public void handleMessage( EBMessage message ) { + addContextMenu( jEdit.getActiveView() ); if ( message instanceof ViewUpdate ) { ViewUpdate vu = ( ViewUpdate ) message; if ( ViewUpdate.CLOSED == vu.getWhat() ) { panelMap.remove( vu.getView() ); } - else if ( ViewUpdate.CREATED == vu.getWhat() || ViewUpdate.ACTIVATED == vu.getWhat()) { - addContextMenu( vu.getView() ); - } } } Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/AddDialog.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/AddDialog.java 2008-01-23 00:28:11 UTC (rev 11626) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/AddDialog.java 2008-01-23 05:31:05 UTC (rev 11627) @@ -200,4 +200,13 @@ public SVNData getSVNData() { return addData; } + + public static void main (String[] args) { + List<String> paths = new ArrayList<String>(); + paths.add( "/home/danson/path/filename.txt" ); + paths.add( "/home/danson/path/filename2.txt" ); + AddDialog dialog = new AddDialog( null, paths ); + dialog.setVisible( true ); + + } } Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/BestRowTable.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/BestRowTable.java 2008-01-23 00:28:11 UTC (rev 11626) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/BestRowTable.java 2008-01-23 05:31:05 UTC (rev 11627) @@ -133,7 +133,7 @@ @Override public Dimension getPreferredSize() { Dimension d = super.getPreferredSize(); - d = new Dimension( d.width, getBestHeight() ); + d.height = getBestHeight(); return d; } Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/CopyDialog.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/CopyDialog.java 2008-01-23 00:28:11 UTC (rev 11626) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/CopyDialog.java 2008-01-23 05:31:05 UTC (rev 11627) @@ -147,9 +147,7 @@ file_table.packRows(); // revision selection panel - final RevisionSelectionPanel revision_panel = new RevisionSelectionPanel( "Copy from this revision:" ); - revision_panel.setLayout(SwingConstants.HORIZONTAL); - revision_panel.setShowWorking(true); + final RevisionSelectionPanel revision_panel = new RevisionSelectionPanel( "Copy from this revision:", SwingConstants.HORIZONTAL, true ); // destination JLabel path_label = new JLabel( "To this location:" ); Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/ExportDialog.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/ExportDialog.java 2008-01-23 00:28:11 UTC (rev 11626) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/ExportDialog.java 2008-01-23 05:31:05 UTC (rev 11627) @@ -129,13 +129,8 @@ recursive_cb.setSelected( true ); // revision selection panels - revision_panel = new RevisionSelectionPanel( "Export from this revision:" ); - revision_panel.setShowWorking(data.getSourceURLs() == null); - peg_revision_panel = new RevisionSelectionPanel( "Using this peg revision:" ); - peg_revision_panel.setShowWorking(false); - peg_revision_panel.setShowHead(false); - peg_revision_panel.setShowBase(false); - peg_revision_panel.setShowDate(false); + revision_panel = new RevisionSelectionPanel( "Export from this revision:", SwingConstants.VERTICAL, data.getSourceURLs() == null ); + peg_revision_panel = new RevisionSelectionPanel( "Using this peg revision:", SwingConstants.VERTICAL, false, false, true, false, false ); // destination JLabel path_label = new JLabel( "Export to this directory:" ); Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/LogDialog.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/LogDialog.java 2008-01-23 00:28:11 UTC (rev 11626) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/LogDialog.java 2008-01-23 05:31:05 UTC (rev 11627) @@ -49,6 +49,7 @@ import projectviewer.ProjectViewer; import projectviewer.config.ProjectOptions; import ise.java.awt.KappaLayout; +import ise.java.awt.LambdaLayout; import ise.plugin.svn.data.LogData; import ise.plugin.svn.library.PasswordHandler; import ise.plugin.svn.library.PasswordHandlerException; @@ -82,7 +83,7 @@ /** Initialises the option pane. */ protected void _init() { - JPanel panel = new JPanel( new KappaLayout() ); + JPanel panel = new JPanel( new LambdaLayout() ); panel.setBorder( new EmptyBorder( 6, 6, 6, 6 ) ); // list the selected files @@ -242,7 +243,7 @@ // add the components to the option panel JScrollPane file_scroller = new JScrollPane( file_table ); - file_scroller.getViewport().setPreferredSize( new Dimension( 600, Math.min( file_table.getBestHeight(), 250 ) ) ); + file_scroller.getViewport().setPreferredSize( new Dimension( 600, Math.min( file_table.getBestHeight() + 50, 250 ) ) ); panel.add( "0, 0, 2, 1, W, , 3", file_label ); panel.add( "0, 1, 2, 1, W, wh, 3", file_scroller ); @@ -287,6 +288,5 @@ data.setPaths( paths ); LogDialog dialog = new LogDialog( null, data ); dialog.setVisible( true ); - } } Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/LogResultsPanel.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/LogResultsPanel.java 2008-01-23 00:28:11 UTC (rev 11626) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/LogResultsPanel.java 2008-01-23 05:31:05 UTC (rev 11627) @@ -31,6 +31,7 @@ import java.awt.Color; import java.awt.Component; import java.awt.Dimension; +import java.awt.Point; import java.awt.event.*; import java.io.File; import java.io.Serializable; @@ -48,6 +49,7 @@ import ise.plugin.svn.data.SVNData; import ise.plugin.svn.data.LogResults; import ise.plugin.svn.library.GUIUtils; +import ise.plugin.svn.library.TableCellViewer; import org.tmatesoft.svn.core.SVNLogEntry; import org.tmatesoft.svn.core.SVNLogEntryPath; import org.tmatesoft.svn.core.wc.SVNInfo; @@ -140,7 +142,7 @@ final LogTable table = new LogTable( data, col_names ); table.setPath( path ); table.addMouseListener( new TableMouseListener( table ) ); - ToolTipManager.sharedInstance().registerComponent( table ); + //ToolTipManager.sharedInstance().registerComponent( table ); // set column widths and cell renderers TableColumnModel column_model = table.getColumnModel(); @@ -224,7 +226,7 @@ public static class PathCellRenderer extends JTextArea implements TableCellRenderer { public Component getTableCellRendererComponent( JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column ) { setText( value == null ? "" : value.toString() ); - setToolTipText( "<html><b>Other files in this revision:</b><br><pre>" + getText() ); + //setToolTipText( "<html><b>Other files in this revision:</b><br><pre>" + getText() ); setBackground( isSelected ? Color.LIGHT_GRAY : Color.WHITE ); return this; } @@ -271,7 +273,10 @@ private void handleClick( MouseEvent me ) { if ( me.isPopupTrigger() ) { - JPopupMenu popup = getPopupMenu( table ); + Point p = me.getPoint(); + int col = table.columnAtPoint( p ); + int row = table.rowAtPoint( p ); + JPopupMenu popup = getPopupMenu( table, col, row, me.getX(), me.getY() ); if ( popup != null ) { GUIUtilities.showPopupMenu( popup, table, me.getX(), me.getY() ); } @@ -282,7 +287,7 @@ /** * Create the context menu. */ - private JPopupMenu getPopupMenu( final LogTable table ) { + private JPopupMenu getPopupMenu( final LogTable table, final int col, final int row, final int x, final int y) { final int[] rows = table.getSelectedRows(); JPopupMenu popup = new JPopupMenu(); @@ -353,9 +358,6 @@ } } - if ( popup.getComponentCount() == 0 && rows.length != 2 ) { - return null; - } if ( rows.length == 2 ) { final String path = table.getPath(); JMenuItem mi = new JMenuItem( "Diff" ); @@ -371,6 +373,16 @@ } ); } + //popup.addSeparator(); + JMenuItem mi = new JMenuItem("Zoom"); + mi.addActionListener(new ActionListener(){ + public void actionPerformed(ActionEvent ae) { + TableCellViewer viewer = new TableCellViewer(table); + viewer.doPopup(col, row, x, y); + } + }); + popup.add(mi); + return popup; } } Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/MoveDialog.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/MoveDialog.java 2008-01-23 00:28:11 UTC (rev 11626) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/MoveDialog.java 2008-01-23 05:31:05 UTC (rev 11627) @@ -146,9 +146,7 @@ file_table.packRows(); // revision selection panel - final RevisionSelectionPanel revision_panel = new RevisionSelectionPanel( "Move from this revision:" ); - revision_panel.setLayout(SwingConstants.HORIZONTAL); - revision_panel.setShowWorking(true); + final RevisionSelectionPanel revision_panel = new RevisionSelectionPanel( "Move from this revision:", SwingConstants.HORIZONTAL, true ); // destination JLabel path_label = new JLabel( "To this location:" ); Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/RevisionSelectionPanel.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/RevisionSelectionPanel.java 2008-01-23 00:28:11 UTC (rev 11626) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/RevisionSelectionPanel.java 2008-01-23 05:31:05 UTC (rev 11627) @@ -58,7 +58,7 @@ private String title; - private int layout = SwingConstants.VERTICAL; + private int direction = SwingConstants.VERTICAL; private boolean showHead = true; private boolean showWorking = false; private boolean showBase = true; @@ -75,19 +75,36 @@ * @param title this panel is displayed in an etched border with a title. */ public RevisionSelectionPanel( String title ) { + this( title, SwingConstants.VERTICAL, false ); + } + + public RevisionSelectionPanel( String title, int direction, boolean showWorking ) { this.title = title; + this.direction = direction; + this.showWorking = showWorking; init(); } + public RevisionSelectionPanel(String title, int direction, boolean showHead, boolean showBase, boolean showNumber, boolean showDate, boolean showWorking ) { + this.title = title; + this.direction = direction; + this.showHead = showHead; + this.showBase = showBase; + this.showNumber = showNumber; + this.showDate = showDate; + this.showWorking = showWorking; + init(); + } + public void init() { KappaLayout kl = new KappaLayout(); setLayout( kl ); - switch ( layout ) { + switch ( direction ) { case SwingConstants.HORIZONTAL: case SwingConstants.VERTICAL: break; default: - layout = SwingConstants.VERTICAL; + direction = SwingConstants.VERTICAL; } setBorder( BorderFactory.createTitledBorder( BorderFactory.createEtchedBorder(), title ) ); @@ -175,15 +192,55 @@ revision_number.setEnabled( false ); date_spinner.setEnabled( false ); - repaint(); + if ( direction == SwingConstants.HORIZONTAL ) { + add( "0, 0, 1, 1, 0, , 0", KappaLayout.createVerticalStrut( 6, true ) ); + if ( showHead ) { + add( "0, 1, 1, 1, W, , 3", head_rb ); + } + if ( showBase ) { + add( "0, 2, 1, 1, W, , 3", base_rb ); + } + if ( showWorking ) { + add( "0, 3, 1, 1, W, , 3", working_rb ); + } + add( "1, 1, 1, 1, 0, , 0", KappaLayout.createHorizontalStrut( 21, true ) ); + if ( showNumber ) { + add( "2, 1, 1, 1, W, , 3", revision_number_rb ); + add( "3, 1, 1, 1, W, , 3", getRevisionChooser() ); + } + if ( showDate ) { + add( "2, 2, 1, 1, W, , 3", date_rb ); + add( "3, 2, 1, 1, W, , 3", getDateChooser() ); + } + } + else { + add( "0, 0, 1, 1, 0, , 0", KappaLayout.createVerticalStrut( 6, true ) ); + if ( showHead ) { + add( "0, 1, 2, 1, W, , 3", head_rb ); + } + if ( showBase ) { + add( "0, 2, 2, 1, W, , 3", base_rb ); + } + if ( showWorking ) { + add( "0, 3, 2, 1, W, , 3", working_rb ); + } + if ( showNumber ) { + add( "0, 4, 1, 1, W, w, 3", revision_number_rb ); + add( "1, 4, 1, 1, W, , 3", getRevisionChooser() ); + } + if ( showDate ) { + add( "0, 5, 1, 1, W, , 3", date_rb ); + add( "1, 5, 1, 1, W, , 3", getDateChooser() ); + } + } } private JSpinner getRevisionChooser() { SpinnerNumberModel model = new SpinnerNumberModel(); - model.setMinimum(0); - revision_number = new JSpinner(model); + model.setMinimum( 0 ); + revision_number = new JSpinner( model ); revision_number.setPreferredSize( new Dimension( 150, revision_number.getPreferredSize().height ) ); - revision_number.setEnabled(false); + revision_number.setEnabled( false ); revision_number.addChangeListener( new ChangeListener() { public void stateChanged( ChangeEvent ce ) { if ( RevisionSelectionPanel.this.revision_number.isEnabled() ) { @@ -217,142 +274,45 @@ } ); date_spinner.setPreferredSize( new Dimension( 150, date_spinner.getPreferredSize().height ) ); - date_spinner.setEnabled(false); + date_spinner.setEnabled( false ); return date_spinner; } - public void setTitle( String title ) { - this.title = title; - } - - public void setLayout( int layout ) { - switch ( layout ) { - case SwingConstants.HORIZONTAL: - case SwingConstants.VERTICAL: - this.layout = layout; - break; - default: - this.layout = SwingConstants.VERTICAL; - } - repaint(); - } - public void setRevision( SVNRevision revision ) { this.revision = revision; + if ( revision.getNumber() != -1 ) { + revision_number.getModel().setValue(revision.getNumber()); + } + else if ( revision.getDate() != null ) { + date_spinner.getModel().setValue(revision.getDate()); + } } public SVNRevision getRevision() { return revision; } - public void setShowHead( boolean b ) { - showHead = b; - if ( !b ) { - remove( head_rb ); - repaint(); - } - } - - public void setShowWorking( boolean b ) { - showWorking = b; - if ( !b ) { - remove( working_rb ); - repaint(); - } - } - - public void setShowBase( boolean b ) { - showBase = b; - if ( !b ) { - remove( base_rb ); - repaint(); - } - } - - public void setShowDate( boolean b ) { - showDate = b; - if ( !b ) { - remove( date_rb ); - remove( date_spinner ); - repaint(); - } - } - - public void setShowNumber( boolean b ) { - showNumber = b; - if ( !b ) { - remove( revision_number_rb ); - remove( revision_number ); - repaint(); - } - } - @Override public void setEnabled( boolean b ) { super.setEnabled( b ); + head_rb.setEnabled( b ); + base_rb.setEnabled( b ); + revision_number_rb.setEnabled( b ); + date_rb.setEnabled( b ); + working_rb.setEnabled( b ); + revision_number.setEnabled( revision_number_rb.isSelected() ); + date_spinner.setEnabled( date_rb.isSelected() ); } - @Override - public void repaint() { - removeAll(); - - KappaLayout kl = new KappaLayout(); - if ( layout == SwingConstants.HORIZONTAL ) { - add( "0, 0, 1, 1, 0, , 0", KappaLayout.createVerticalStrut( 6, true ) ); - if ( showHead ) { - add( "0, 1, 1, 1, W, , 3", head_rb ); - } - if ( showBase ) { - add( "0, 2, 1, 1, W, , 3", base_rb ); - } - if ( showWorking ) { - add( "0, 3, 1, 1, W, , 3", working_rb ); - } - add( "1, 1, 1, 1, 0, , 0", KappaLayout.createHorizontalStrut( 21, true ) ); - if ( showNumber ) { - add( "2, 1, 1, 1, W, , 3", revision_number_rb ); - add( "3, 1, 1, 1, W, , 3", getRevisionChooser() ); - } - if ( showDate ) { - add( "2, 2, 1, 1, W, , 3", date_rb ); - add( "3, 2, 1, 1, W, , 3", getDateChooser() ); - } - } - else { - add( "0, 0, 1, 1, 0, , 0", KappaLayout.createVerticalStrut( 6, true ) ); - if ( showHead ) { - add( "0, 1, 2, 1, W, , 3", head_rb ); - } - if ( showBase ) { - add( "0, 2, 2, 1, W, , 3", base_rb ); - } - if ( showWorking ) { - add( "0, 3, 2, 1, W, , 3", working_rb ); - } - if ( showNumber ) { - add( "0, 4, 1, 1, W, w, 3", revision_number_rb ); - add( "1, 4, 1, 1, W, , 3", getRevisionChooser() ); - } - if ( showDate ) { - add( "0, 5, 1, 1, W, , 3", date_rb ); - add( "1, 5, 1, 1, W, , 3", getDateChooser() ); - } - } - super.repaint(); - } - // for testing public static void main ( String[] args ) { RevisionSelectionPanel panel = new RevisionSelectionPanel( "some title" ); - //panel.setShowWorking( true ); - //panel.setShowHead( true ); - //panel.setShowBase( false ); - //panel.setLayout( SwingConstants.HORIZONTAL ); + panel.setEnabled(false); JFrame frame = new JFrame(); frame.setContentPane( panel ); frame.pack(); frame.setVisible( true ); SVNRevision revision = panel.getRevision(); - System.out.println("+++++ RSP, revision = " + revision); + System.out.println( "+++++ RSP, revision = " + revision ); } } Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/SVNInfoPanel.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/SVNInfoPanel.java 2008-01-23 00:28:11 UTC (rev 11626) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/SVNInfoPanel.java 2008-01-23 05:31:05 UTC (rev 11627) @@ -60,6 +60,8 @@ import org.tmatesoft.svn.core.wc.xml.SVNXMLInfoHandler; import org.tmatesoft.svn.core.wc.xml.SVNXMLSerializer; +import ise.plugin.svn.library.TableCellViewer; + public class SVNInfoPanel extends JPanel { @@ -186,6 +188,7 @@ info_table.getColumnModel().getColumn( 0 ).setMinWidth( 150 ); info_table.getColumnModel().getColumn( 1 ).setPreferredWidth( 600 ); info_table.packRows(); + info_table.addMouseListener( new TableCellViewer( info_table ) ); } private String formatDate( Date date ) { Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/StatusResultsPanel.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/StatusResultsPanel.java 2008-01-23 00:28:11 UTC (rev 11626) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/StatusResultsPanel.java 2008-01-23 05:31:05 UTC (rev 11627) @@ -376,6 +376,7 @@ } } ); + return pm; } } Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/SwitchDialog.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/SwitchDialog.java 2008-01-23 00:28:11 UTC (rev 11626) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/SwitchDialog.java 2008-01-23 05:31:05 UTC (rev 11627) @@ -127,8 +127,7 @@ ); // revision selection panel - final RevisionSelectionPanel revision_panel = new RevisionSelectionPanel( "At this revision:" ); - revision_panel.setLayout(SwingConstants.HORIZONTAL); + final RevisionSelectionPanel revision_panel = new RevisionSelectionPanel( "At this revision:", SwingConstants.HORIZONTAL, false ); // destination JLabel path_label = new JLabel( "With file(s) from this location:" ); Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/TagBranchDialog.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/TagBranchDialog.java 2008-01-23 00:28:11 UTC (rev 11626) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/TagBranchDialog.java 2008-01-23 05:31:05 UTC (rev 11627) @@ -77,6 +77,7 @@ public static String TAG = "Tag"; public static String BRANCH = "Branch"; + private CopyData data = null; private boolean canceled = false; /** @@ -112,11 +113,9 @@ source_file.setBackground( Color.WHITE ); // revision selection panel - final RevisionSelectionPanel tag_revision_panel = new RevisionSelectionPanel( "Create " + ( type == TAG_DIALOG ? "tag" : "branch" ) + " from this revision:" ); - tag_revision_panel.setLayout( SwingConstants.HORIZONTAL ); + final RevisionSelectionPanel tag_revision_panel = new RevisionSelectionPanel( "Create " + ( type == TAG_DIALOG ? "tag" : "branch" ) + " from this revision:", SwingConstants.HORIZONTAL, false ); JPanel source_panel = new JPanel( new LambdaLayout() ); - //source_panel.setBorder(BorderFactory.createEtchedBorder()); source_panel.add( "0, 0, 1, 1, W, w, 3", to_copy_label ); source_panel.add( "0, 1, 1, 1, W, w, 3", source_file ); source_panel.add( "0, 2, 1, 1, 0, w, 3", tag_revision_panel ); @@ -220,11 +219,21 @@ revision = tag_revision_panel.getRevision(); canceled = false; - // save the comment + data = new CopyData(); + List<SVNURL> urls = new ArrayList<SVNURL>(); + urls.add( source ); + data.setSourceURLs( urls ); + data.setRevision( revision ); + data.setDestinationURL( destination ); String msg = comment.getText(); + if ( msg == null || msg.length() == 0 ) { + msg = "no comment"; + } + data.setMessage( msg ); + + // save the comment if ( msg != null && msg.length() > 0 && commentList != null ) { commentList.addValue( msg ); - commentList.save(); } TagBranchDialog.this.setVisible( false ); @@ -236,6 +245,7 @@ cancel_btn.addActionListener( new ActionListener() { public void actionPerformed( ActionEvent ae ) { canceled = true; + data = null; TagBranchDialog.this.setVisible( false ); TagBranchDialog.this.dispose(); } @@ -275,22 +285,11 @@ if ( canceled ) { return null; } - CopyData cd = new CopyData(); - List<SVNURL> urls = new ArrayList<SVNURL>(); - urls.add( source ); - cd.setSourceURLs( urls ); - cd.setRevision( revision ); - cd.setDestinationURL( destination ); - String msg = comment.getText(); - if ( msg == null || msg.length() == 0 ) { - msg = "no comment"; - } - cd.setMessage( msg ); - return cd; + return data; } - public static void main (String[] args) { - TagBranchDialog d = new TagBranchDialog(null, TagBranchDialog.TAG_DIALOG, "http://somewhere.over/the/rainbow", null); - d.setVisible(true); + public static void main ( String[] args ) { + TagBranchDialog d = new TagBranchDialog( null, TagBranchDialog.TAG_DIALOG, "http://somewhere.over/the/rainbow", null ); + d.setVisible( true ); } } Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/TextAreaContextMenu.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/TextAreaContextMenu.java 2008-01-23 00:28:11 UTC (rev 11626) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/TextAreaContextMenu.java 2008-01-23 05:31:05 UTC (rev 11627) @@ -54,9 +54,15 @@ JMenuItem item = new JMenuItem( "Add" ); item.addActionListener( getAddActionListener() ); add( item ); + item = new JMenuItem( "Update" ); + item.addActionListener( getUpdateActionListener() ); + add( item ); item = new JMenuItem( "Revert" ); item.addActionListener( getRevertActionListener() ); add( item ); + item = new JMenuItem( "Commit" ); + item.addActionListener( getCommitActionListener() ); + add( item ); item = new JMenuItem( "Resolve" ); item.addActionListener( getResolvedActionListener() ); add( item ); @@ -154,4 +160,26 @@ }; } + private ActionListener getUpdateActionListener() { + return new ActionListener() { + public void actionPerformed( ActionEvent ae ) { + UpdateAction action = new UpdateAction( view, getPaths(), null, null ); + action.actionPerformed( ae ); + } + }; + } + + private ActionListener getCommitActionListener() { + return new ActionListener() { + public void actionPerformed( ActionEvent ae ) { + TreeMap<String, String> paths = new TreeMap<String, String>(); + for ( String path : getPaths() ) { + paths.put( path, "" ); + } + CommitAction action = new CommitAction( view, paths, null, null ); + action.actionPerformed( ae ); + } + }; + } + } Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/UpdateDialog.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/UpdateDialog.java 2008-01-23 00:28:11 UTC (rev 11626) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/UpdateDialog.java 2008-01-23 05:31:05 UTC (rev 11627) @@ -61,8 +61,7 @@ JPanel panel = new JPanel( new KappaLayout() ); panel.setBorder( new EmptyBorder( 6, 6, 6, 6 ) ); - final RevisionSelectionPanel rsp = new RevisionSelectionPanel("Update To:"); - rsp.setLayout(SwingConstants.HORIZONTAL); + final RevisionSelectionPanel rsp = new RevisionSelectionPanel("Update To:", SwingConstants.HORIZONTAL, false); final JCheckBox recursive_cb = new JCheckBox("Recursive"); recursive_cb.setSelected(data.getRecursive()); Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/library/TableCellViewer.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/library/TableCellViewer.java 2008-01-23 00:28:11 UTC (rev 11626) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/library/TableCellViewer.java 2008-01-23 05:31:05 UTC (rev 11627) @@ -9,9 +9,11 @@ * in a popup. */ public class TableCellViewer extends MouseAdapter { + private JTable table = null; private JTextArea ta; private JPopupMenu pm; + public TableCellViewer( JTable table ) { this.table = table; ta = new JTextArea( 10, 40 ); @@ -20,22 +22,29 @@ pm = new JPopupMenu(); pm.add( new JScrollPane( ta ) ); } + public void mousePressed( MouseEvent me ) { doPopup( me ); } + public void mouseReleased( MouseEvent me ) { doPopup( me ); } + private void doPopup( MouseEvent me ) { if ( me.isPopupTrigger() ) { Point p = me.getPoint(); int col = table.columnAtPoint( p ); int row = table.rowAtPoint( p ); - Object value = table.getModel().getValueAt( row, col ); - if ( value != null ) { - ta.setText( value.toString() ); - GUIUtils.showPopupMenu( pm, table, me.getX(), me.getY() ); - } + doPopup( col, row, me.getX(), me.getY() ); } } + + public void doPopup( int col, int row, int x, int y ) { + Object value = table.getModel().getValueAt( row, col ); + if ( value != null ) { + ta.setText( value.toString() ); + GUIUtils.showPopupMenu( pm, table, x, y ); + } + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |