cvs server: Diffing javacvs
cvs server: Diffing javacvs/changelog
cvs server: Diffing javacvs/changelog/src
cvs server: Diffing javacvs/changelog/src/org
cvs server: Diffing javacvs/changelog/src/org/netbeans
cvs server: Diffing javacvs/changelog/src/org/netbeans/modules
cvs server: Diffing javacvs/changelog/src/org/netbeans/modules/changelog
cvs server: Diffing javacvs/changelog/src/org/netbeans/modules/changelog/html
cvs server: Diffing javacvs/changelog/src/org/netbeans/modules/changelog/resources
cvs server: Diffing javacvs/changelog/src/org/netbeans/modules/changelog/settings
cvs server: Diffing javacvs/changelog/src/org/netbeans/modules/changelog/wizard
cvs server: Diffing javacvs/changelog/src/org/netbeans/modules/changelog/xml
cvs server: Diffing javacvs/compat
cvs server: Diffing javacvs/compat/src
cvs server: Diffing javacvs/compat/src/org
cvs server: Diffing javacvs/compat/src/org/netbeans
cvs server: Diffing javacvs/compat/src/org/netbeans/modules
cvs server: Diffing javacvs/compat/src/org/netbeans/modules/cvsclient
cvs server: Diffing javacvs/compat/src/org/netbeans/modules/cvsclient/compat
cvs server: Diffing javacvs/compat/src/org/netbeans/modules/javacvs
cvs server: Diffing javacvs/cvsmodule
cvs server: Diffing javacvs/cvsmodule/javahelp
cvs server: Diffing javacvs/cvsmodule/javahelp/org
cvs server: Diffing javacvs/cvsmodule/javahelp/org/netbeans
cvs server: Diffing javacvs/cvsmodule/javahelp/org/netbeans/modules
cvs server: Diffing javacvs/cvsmodule/javahelp/org/netbeans/modules/versioning
cvs server: Diffing javacvs/cvsmodule/javahelp/org/netbeans/modules/versioning/system
cvs server: Diffing javacvs/cvsmodule/javahelp/org/netbeans/modules/versioning/system/cvss
cvs server: Diffing javacvs/cvsmodule/javahelp/org/netbeans/modules/versioning/system/cvss/docs
cvs server: Diffing javacvs/cvsmodule/javahelp/org/netbeans/modules/versioning/system/cvss/docs/cvsmodule
cvs server: Diffing javacvs/cvsmodule/nbproject
cvs server: Diffing javacvs/cvsmodule/patches
cvs server: Diffing javacvs/cvsmodule/src
cvs server: Diffing javacvs/cvsmodule/src/META-INF
cvs server: Diffing javacvs/cvsmodule/src/META-INF/services
cvs server: Diffing javacvs/cvsmodule/src/com
cvs server: Diffing javacvs/cvsmodule/src/com/jcraft
cvs server: Diffing javacvs/cvsmodule/src/com/jcraft/jsch
cvs server: Diffing javacvs/cvsmodule/src/com/jcraft/jsch/jce
cvs server: Diffing javacvs/cvsmodule/src/com/jcraft/jsch/jcraft
cvs server: Diffing javacvs/cvsmodule/src/org
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/executor
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/resources
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/resources/components
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/resources/groups
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/resources/groups/cvss
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/resources/icons
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/resources/modes
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/resources/modes/cvss
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/resources/modes/output
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/settings
Index: javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/settings/HistorySettings.java
===================================================================
RCS file: /cvs/javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/settings/HistorySettings.java,v
retrieving revision 1.3
diff -u -r1.3 HistorySettings.java
--- javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/settings/HistorySettings.java 6 Sep 2005 14:17:10 -0000 1.3
+++ javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/settings/HistorySettings.java 12 Sep 2005 20:33:36 -0000
@@ -48,6 +48,9 @@
public static final String PROP_SOCKS_PROXY_HOST = "socksProxyHost"; // NOI18N
public static final String PROP_SOCKS_PROXY_PORT = "socksProxyPort"; // NOI18N
+ /** Latest cvs messages */
+ public static final String PROP_LATEST_COMMENTS="latestComments"; // NOI18N
+
/** Creates new instance, for externalizion purposes only. */
public HistorySettings() {
}
@@ -128,6 +131,14 @@
public void setCvsRoots(List values) {
setRecent(PROP_CVS_ROOTS, values);
+ }
+
+ public List getLatestCommitMessages() {
+ return getRecent(PROP_LATEST_COMMENTS);
+ }
+
+ public void setLatestCommitMessages(List values) {
+ setRecent(PROP_LATEST_COMMENTS, values);
}
public List getCheckoutDirectory() {
Index: javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/settings/HistorySettingsBeanInfo.java
===================================================================
RCS file: /cvs/javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/settings/HistorySettingsBeanInfo.java,v
retrieving revision 1.3
diff -u -r1.3 HistorySettingsBeanInfo.java
--- javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/settings/HistorySettingsBeanInfo.java 11 Sep 2005 11:45:24 -0000 1.3
+++ javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/settings/HistorySettingsBeanInfo.java 12 Sep 2005 20:46:48 -0000
@@ -37,20 +37,22 @@
private static final int PROPERTY_cvsRoots = 1;
private static final int PROPERTY_httpProxyHost = 2;
private static final int PROPERTY_httpProxyPort = 3;
- private static final int PROPERTY_showCheckoutCompleted = 4;
- private static final int PROPERTY_socksProxyHost = 5;
- private static final int PROPERTY_socksProxyPort = 6;
+ private static final int PROPERTY_latestCommitMessages = 4;
+ private static final int PROPERTY_showCheckoutCompleted = 5;
+ private static final int PROPERTY_socksProxyHost = 6;
+ private static final int PROPERTY_socksProxyPort = 7;
// Property array
/*lazy PropertyDescriptor*/
private static PropertyDescriptor[] getPdescriptor(){
- PropertyDescriptor[] properties = new PropertyDescriptor[7];
+ PropertyDescriptor[] properties = new PropertyDescriptor[8];
try {
properties[PROPERTY_checkoutDirectory] = new PropertyDescriptor ( "checkoutDirectory", org.netbeans.modules.versioning.system.cvss.settings.HistorySettings.class, "getCheckoutDirectory", "setCheckoutDirectory" );
properties[PROPERTY_cvsRoots] = new PropertyDescriptor ( "cvsRoots", org.netbeans.modules.versioning.system.cvss.settings.HistorySettings.class, "getCvsRoots", "setCvsRoots" );
properties[PROPERTY_httpProxyHost] = new PropertyDescriptor ( "httpProxyHost", org.netbeans.modules.versioning.system.cvss.settings.HistorySettings.class, "getHttpProxyHost", "setHttpProxyHost" );
properties[PROPERTY_httpProxyPort] = new PropertyDescriptor ( "httpProxyPort", org.netbeans.modules.versioning.system.cvss.settings.HistorySettings.class, "getHttpProxyPort", "setHttpProxyPort" );
+ properties[PROPERTY_latestCommitMessages] = new PropertyDescriptor ( "latestCommitMessages", org.netbeans.modules.versioning.system.cvss.settings.HistorySettings.class, "getLatestCommitMessages", "setLatestCommitMessages" );
properties[PROPERTY_showCheckoutCompleted] = new PropertyDescriptor ( "showCheckoutCompleted", org.netbeans.modules.versioning.system.cvss.settings.HistorySettings.class, "getShowCheckoutCompleted", "setShowCheckoutCompleted" );
properties[PROPERTY_socksProxyHost] = new PropertyDescriptor ( "socksProxyHost", org.netbeans.modules.versioning.system.cvss.settings.HistorySettings.class, "getSocksProxyHost", "setSocksProxyHost" );
properties[PROPERTY_socksProxyPort] = new PropertyDescriptor ( "socksProxyPort", org.netbeans.modules.versioning.system.cvss.settings.HistorySettings.class, "getSocksProxyPort", "setSocksProxyPort" );
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/add
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/annotate
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/checkout
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/commit
Index: javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/commit/Bundle.properties
===================================================================
RCS file: /cvs/javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/commit/Bundle.properties,v
retrieving revision 1.10
diff -u -r1.10 Bundle.properties
--- javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/commit/Bundle.properties 24 Aug 2005 13:51:03 -0000 1.10
+++ javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/commit/Bundle.properties 12 Sep 2005 22:03:06 -0000
@@ -30,6 +30,7 @@
CTL_CommitDialog_Title_Multi = {0} files
CTL_CommitForm_Message=Commit &Message\:
+CTL_CommitForm_PreviousMessage=-- previously entered message --
MNE_CommitForm_Message=M
CTL_CommitForm_Locally=Run locally (-l)
CTL_CommitForm_Revision=Commit to revision (-r)\:
Index: javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/commit/CommitAction.java
===================================================================
RCS file: /cvs/javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/commit/CommitAction.java,v
retrieving revision 1.11
diff -u -r1.11 CommitAction.java
--- javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/commit/CommitAction.java 30 Aug 2005 10:04:02 -0000 1.11
+++ javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/commit/CommitAction.java 13 Sep 2005 08:04:45 -0000
@@ -13,6 +13,7 @@
package org.netbeans.modules.versioning.system.cvss.ui.actions.commit;
+import org.netbeans.modules.versioning.system.cvss.settings.HistorySettings;
import org.openide.util.NbBundle;
import org.openide.util.HelpCtx;
import org.openide.DialogDescriptor;
@@ -44,7 +45,7 @@
*/
public class CommitAction extends AbstractSystemAction {
- private static CommitCommand commandTemplate = new CommitCommand();
+ private static CommitCommand commandTemplate = new CommitCommand() ;
public CommitAction() {
setIcon(null);
@@ -89,6 +90,7 @@
}
CommitCommand cmd = new CommitCommand();
+
cmd.setDisplayName(NbBundle.getMessage(CommitAction.class, "BK0001"));
copy (cmd, commandTemplate);
@@ -120,6 +122,11 @@
dialog.setVisible(true);
if (descriptor.getValue() != commit) return;
+ String commitMessage = settings.getCommitMessage();
+
+ if (commitMessage.trim().length() != 0 ) {
+ HistorySettings.addRecent(HistorySettings.PROP_LATEST_COMMENTS, settings.getCommitMessage());
+ }
settings.updateCommand(cmd);
copy(commandTemplate, cmd);
cmd.setFiles(roots);
Index: javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/commit/CommitSettings.form
===================================================================
RCS file: /cvs/javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/commit/CommitSettings.form,v
retrieving revision 1.4
diff -u -r1.4 CommitSettings.form
--- javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/commit/CommitSettings.form 31 Aug 2005 20:26:10 -0000 1.4
+++ javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/commit/CommitSettings.form 12 Sep 2005 22:03:36 -0000
@@ -43,11 +43,12 @@
+
-
+
@@ -70,7 +71,7 @@
-
+
@@ -90,7 +91,7 @@
-
+
@@ -106,7 +107,7 @@
-
+
@@ -121,7 +122,23 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/commit/CommitSettings.java
===================================================================
RCS file: /cvs/javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/commit/CommitSettings.java,v
retrieving revision 1.5
diff -u -r1.5 CommitSettings.java
--- javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/commit/CommitSettings.java 31 Aug 2005 20:26:10 -0000 1.5
+++ javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/commit/CommitSettings.java 13 Sep 2005 08:10:46 -0000
@@ -13,10 +13,15 @@
package org.netbeans.modules.versioning.system.cvss.ui.actions.commit;
+import java.awt.event.ItemEvent;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ResourceBundle;
import org.netbeans.lib.cvsclient.command.commit.CommitCommand;
import org.netbeans.modules.versioning.system.cvss.*;
import org.netbeans.modules.versioning.system.cvss.settings.CvsModuleConfig;
import org.netbeans.modules.versioning.spi.VersioningListener;
+import org.netbeans.modules.versioning.system.cvss.settings.HistorySettings;
import org.netbeans.modules.versioning.util.ListenersSupport;
import javax.swing.event.TableModelListener;
@@ -28,7 +33,7 @@
/**
* Customization of commits.
- *
+ *
* @author Maros Sandor
*/
public class CommitSettings extends javax.swing.JPanel implements PropertyChangeListener, TableModelListener {
@@ -40,22 +45,22 @@
static final String COLUMN_NAME_PATH = "path";
static final Object EVENT_SETTINGS_CHANGED = new Object();
-
+
private CommitTable commitTable;
-
+
public static class CommitFile {
private final CommitOptions options;
private final CvsFileNode node;
-
+
public CommitFile(CvsFileNode node, CommitOptions options) {
this.node = node;
this.options = options;
}
-
+
public CommitOptions getOptions() {
return options;
}
-
+
public CvsFileNode getNode() {
return node;
}
@@ -66,21 +71,21 @@
setPreferredSize(new Dimension(ss.width / 2, ss.height / 5 * 2));
init();
}
-
+
/**
* Set columns to display in the Commit table.
- *
+ *
* @param cols array of column names
- */
+ */
void setColumns(String[] cols) {
commitTable.setColumns(cols);
}
-
+
/**
* Set file nodes to display in the Commit table.
- *
+ *
* @param nodes array of nodes
- */
+ */
void setNodes(CvsFileNode[] nodes) {
commitTable.setNodes(nodes);
}
@@ -96,20 +101,20 @@
listenerSupport.fireVersioningEvent(EVENT_SETTINGS_CHANGED);
taMessage.selectAll();
}
-
+
public void removeNotify() {
commitTable.getTableModel().removeTableModelListener(this);
CvsModuleConfig.getDefault().removePropertyChangeListener(this);
super.removeNotify();
}
-
+
public void propertyChange(PropertyChangeEvent evt) {
if (CvsModuleConfig.PROP_COMMIT_EXCLUSIONS.equals(evt.getPropertyName())) {
commitTable.dataChanged();
listenerSupport.fireVersioningEvent(EVENT_SETTINGS_CHANGED);
}
}
-
+
public CommitFile [] getCommitFiles() {
return commitTable.getCommitFiles();
}
@@ -118,11 +123,20 @@
initComponents();
errorLabel.setMinimumSize(errorLabel.getPreferredSize());
errorLabel.setText("");
- jScrollPane1.setMinimumSize(jScrollPane1.getPreferredSize());
+ messageScroll.setMinimumSize(messageScroll.getPreferredSize());
+
+ List latestMessages = HistorySettings.getDefault().getLatestCommitMessages();
+ String defaultMessage = ResourceBundle.getBundle("org/netbeans/modules/versioning/system/cvss/ui/actions/commit/Bundle").getString("CTL_CommitForm_PreviousMessage");
+ messageHistory.addItem(defaultMessage);
+ for (Iterator iter = latestMessages.iterator(); iter.hasNext();) {
+ String message = (String) iter.next();
+ messageHistory.addItem(message);
+ }
+
commitTable = new CommitTable();
java.awt.GridBagConstraints gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 3;
+ gridBagConstraints.gridy = 4;
gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
gridBagConstraints.weightx = 1.0;
@@ -133,25 +147,25 @@
void setErrorLabel(String htmlErrorLabel) {
errorLabel.setText(htmlErrorLabel);
}
-
+
public void setCommand(CommitCommand cmd) {
taMessage.setText(cmd.getMessage());
if (cmd.getToRevisionOrBranch() != null) {
tfRevision.setText(cmd.getToRevisionOrBranch());
cbRevision.setSelected(true);
} else {
- cbRevision.setSelected(false);
+ cbRevision.setSelected(false);
}
cbLocally.setSelected(!cmd.isRecursive());
}
-
+
public void updateCommand(CommitCommand cmd) {
cmd.setMessage(taMessage.getText());
cmd.setRecursive(!cbLocally.isSelected());
if (cbRevision.isSelected()) {
cmd.setToRevisionOrBranch(tfRevision.getText());
} else {
- cmd.setToRevisionOrBranch(null);
+ cmd.setToRevisionOrBranch(null);
}
}
@@ -167,11 +181,12 @@
cbLocally = new javax.swing.JCheckBox();
cbRevision = new javax.swing.JCheckBox();
tfRevision = new javax.swing.JTextField();
- jLabel2 = new javax.swing.JLabel();
- jScrollPane1 = new javax.swing.JScrollPane();
+ messageLabel = new javax.swing.JLabel();
+ messageScroll = new javax.swing.JScrollPane();
taMessage = new org.netbeans.modules.versioning.system.cvss.ui.components.KTextArea();
- jLabel3 = new javax.swing.JLabel();
+ filesLabel = new javax.swing.JLabel();
errorLabel = new javax.swing.JLabel();
+ messageHistory = new javax.swing.JComboBox();
cbLocally.setMnemonic(java.util.ResourceBundle.getBundle("org/netbeans/modules/versioning/system/cvss/ui/actions/commit/Bundle").getString("MNE_CommitForm_Locally").charAt(0));
org.openide.awt.Mnemonics.setLocalizedText(cbLocally, java.util.ResourceBundle.getBundle("org/netbeans/modules/versioning/system/cvss/ui/actions/commit/Bundle").getString("CTL_CommitForm_Locally"));
@@ -181,23 +196,23 @@
setLayout(new java.awt.GridBagLayout());
setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(12, 12, 0, 11)));
- jLabel2.setLabelFor(taMessage);
- org.openide.awt.Mnemonics.setLocalizedText(jLabel2, java.util.ResourceBundle.getBundle("org/netbeans/modules/versioning/system/cvss/ui/actions/commit/Bundle").getString("CTL_CommitForm_Message"));
- jLabel2.setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(0, 0, 2, 0)));
+ messageLabel.setLabelFor(taMessage);
+ org.openide.awt.Mnemonics.setLocalizedText(messageLabel, java.util.ResourceBundle.getBundle("org/netbeans/modules/versioning/system/cvss/ui/actions/commit/Bundle").getString("CTL_CommitForm_Message"));
+ messageLabel.setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(0, 0, 2, 0)));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 0;
gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LAST_LINE_START;
gridBagConstraints.insets = new java.awt.Insets(0, 0, 0, 5);
- add(jLabel2, gridBagConstraints);
+ add(messageLabel, gridBagConstraints);
taMessage.setColumns(30);
taMessage.setLineWrap(true);
taMessage.setRows(6);
taMessage.setTabSize(4);
taMessage.setWrapStyleWord(true);
- jScrollPane1.setViewportView(taMessage);
+ messageScroll.setViewportView(taMessage);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
@@ -206,39 +221,75 @@
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
gridBagConstraints.anchor = java.awt.GridBagConstraints.FIRST_LINE_START;
gridBagConstraints.weightx = 1.0;
- add(jScrollPane1, gridBagConstraints);
+ add(messageScroll, gridBagConstraints);
- org.openide.awt.Mnemonics.setLocalizedText(jLabel3, java.util.ResourceBundle.getBundle("org/netbeans/modules/versioning/system/cvss/ui/actions/commit/Bundle").getString("CTL_CommitForm_FilesToCommit"));
- jLabel3.setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(12, 0, 0, 0)));
+ org.openide.awt.Mnemonics.setLocalizedText(filesLabel, java.util.ResourceBundle.getBundle("org/netbeans/modules/versioning/system/cvss/ui/actions/commit/Bundle").getString("CTL_CommitForm_FilesToCommit"));
+ filesLabel.setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(12, 0, 0, 0)));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 2;
+ gridBagConstraints.gridy = 3;
gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
gridBagConstraints.anchor = java.awt.GridBagConstraints.FIRST_LINE_START;
gridBagConstraints.insets = new java.awt.Insets(0, 0, 0, 5);
- add(jLabel3, gridBagConstraints);
+ add(filesLabel, gridBagConstraints);
errorLabel.setText("Y");
errorLabel.setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(2, 0, 0, 0)));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 4;
+ gridBagConstraints.gridy = 5;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.anchor = java.awt.GridBagConstraints.LINE_START;
gridBagConstraints.weightx = 1.0;
add(errorLabel, gridBagConstraints);
+ messageHistory.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ messageHistoryActionPerformed(evt);
+ }
+ });
+ messageHistory.addFocusListener(new java.awt.event.FocusAdapter() {
+ public void focusLost(java.awt.event.FocusEvent evt) {
+ messageHistoryFocusLost(evt);
+ }
+ });
+
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 2;
+ gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.FIRST_LINE_START;
+ gridBagConstraints.weightx = 1.0;
+ gridBagConstraints.insets = new java.awt.Insets(5, 0, 0, 0);
+ add(messageHistory, gridBagConstraints);
+
}
// //GEN-END:initComponents
-
+
+ private void messageHistoryFocusLost(java.awt.event.FocusEvent evt) {//GEN-FIRST:event_messageHistoryFocusLost
+ messageHistory.setSelectedIndex(0);
+ }//GEN-LAST:event_messageHistoryFocusLost
+
+ private void messageHistoryActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_messageHistoryActionPerformed
+ int idx = messageHistory.getSelectedIndex();
+ if (idx == 0) {
+ return;
+ }
+
+ String message = (String) messageHistory.getItemAt(idx);
+ taMessage.setText(message);
+ }//GEN-LAST:event_messageHistoryActionPerformed
+
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JCheckBox cbLocally;
private javax.swing.JCheckBox cbRevision;
private javax.swing.JLabel errorLabel;
- private javax.swing.JLabel jLabel2;
- private javax.swing.JLabel jLabel3;
- private javax.swing.JScrollPane jScrollPane1;
+ private javax.swing.JLabel filesLabel;
+ private javax.swing.JComboBox messageHistory;
+ private javax.swing.JLabel messageLabel;
+ private javax.swing.JScrollPane messageScroll;
private org.netbeans.modules.versioning.system.cvss.ui.components.KTextArea taMessage;
private javax.swing.JTextField tfRevision;
// End of variables declaration//GEN-END:variables
@@ -246,12 +297,12 @@
public void tableChanged(TableModelEvent e) {
listenerSupport.fireVersioningEvent(EVENT_SETTINGS_CHANGED);
}
-
+
ListenersSupport listenerSupport = new ListenersSupport(this);
public void addVersioningListener(VersioningListener listener) {
listenerSupport.addListener(listener);
}
-
+
public void removeVersioningListener(VersioningListener listener) {
listenerSupport.removeListener(listener);
}
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/diff
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/ignore
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/log
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/project
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/remove
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/status
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/tag
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/update
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/components
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/console
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/history
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/selectors
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/syncview
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/wizards
cvs server: Diffing javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/util
cvs server: Diffing javacvs/cvsmodule/test
cvs server: Diffing javacvs/cvsmodule/test/unit
cvs server: Diffing javacvs/cvsmodule/test/unit/src
cvs server: Diffing javacvs/cvsmodule/test/unit/src/org
cvs server: Diffing javacvs/cvsmodule/test/unit/src/org/netbeans
cvs server: Diffing javacvs/cvsmodule/test/unit/src/org/netbeans/modules
cvs server: Diffing javacvs/cvsmodule/test/unit/src/org/netbeans/modules/versioning
cvs server: Diffing javacvs/cvsmodule/test/unit/src/org/netbeans/modules/versioning/system
cvs server: Diffing javacvs/cvsmodule/test/unit/src/org/netbeans/modules/versioning/system/cvss
cvs server: Diffing javacvs/cvsmodule/test/unit/src/org/netbeans/modules/versioning/system/cvss/ui
cvs server: Diffing javacvs/cvsmodule/test/unit/src/org/netbeans/modules/versioning/system/cvss/ui/actions
cvs server: Diffing javacvs/cvsmodule/test/unit/src/org/netbeans/modules/versioning/system/cvss/ui/actions/annotate
cvs server: Diffing javacvs/cvsmodule/test/unit/src/org/netbeans/modules/versioning/system/cvss/util
cvs server: Diffing javacvs/cvsmodule/tools
cvs server: Diffing javacvs/external
cvs server: Diffing javacvs/libmodule
cvs server: Diffing javacvs/libmodule/nbproject
cvs server: Diffing javacvs/libsrc
cvs server: Diffing javacvs/libsrc/org
cvs server: Diffing javacvs/libsrc/org/netbeans
cvs server: Diffing javacvs/libsrc/org/netbeans/lib
cvs server: Diffing javacvs/libsrc/org/netbeans/lib/cvsclient
cvs server: Diffing javacvs/libsrc/org/netbeans/lib/cvsclient/admin
cvs server: Diffing javacvs/libsrc/org/netbeans/lib/cvsclient/command
cvs server: Diffing javacvs/libsrc/org/netbeans/lib/cvsclient/command/add
cvs server: Diffing javacvs/libsrc/org/netbeans/lib/cvsclient/command/annotate
cvs server: Diffing javacvs/libsrc/org/netbeans/lib/cvsclient/command/checkout
cvs server: Diffing javacvs/libsrc/org/netbeans/lib/cvsclient/command/commit
cvs server: Diffing javacvs/libsrc/org/netbeans/lib/cvsclient/command/diff
cvs server: Diffing javacvs/libsrc/org/netbeans/lib/cvsclient/command/edit
cvs server: Diffing javacvs/libsrc/org/netbeans/lib/cvsclient/command/editors
cvs server: Diffing javacvs/libsrc/org/netbeans/lib/cvsclient/command/export
cvs server: Diffing javacvs/libsrc/org/netbeans/lib/cvsclient/command/history
cvs server: Diffing javacvs/libsrc/org/netbeans/lib/cvsclient/command/importcmd
cvs server: Diffing javacvs/libsrc/org/netbeans/lib/cvsclient/command/log
cvs server: Diffing javacvs/libsrc/org/netbeans/lib/cvsclient/command/remove
cvs server: Diffing javacvs/libsrc/org/netbeans/lib/cvsclient/command/status
cvs server: Diffing javacvs/libsrc/org/netbeans/lib/cvsclient/command/tag
cvs server: Diffing javacvs/libsrc/org/netbeans/lib/cvsclient/command/unedit
cvs server: Diffing javacvs/libsrc/org/netbeans/lib/cvsclient/command/update
cvs server: Diffing javacvs/libsrc/org/netbeans/lib/cvsclient/command/watch
cvs server: Diffing javacvs/libsrc/org/netbeans/lib/cvsclient/command/watchers
cvs server: Diffing javacvs/libsrc/org/netbeans/lib/cvsclient/commandLine
cvs server: Diffing javacvs/libsrc/org/netbeans/lib/cvsclient/commandLine/command
cvs server: Diffing javacvs/libsrc/org/netbeans/lib/cvsclient/connection
cvs server: Diffing javacvs/libsrc/org/netbeans/lib/cvsclient/event
cvs server: Diffing javacvs/libsrc/org/netbeans/lib/cvsclient/file
cvs server: Diffing javacvs/libsrc/org/netbeans/lib/cvsclient/request
cvs server: Diffing javacvs/libsrc/org/netbeans/lib/cvsclient/response
cvs server: Diffing javacvs/libsrc/org/netbeans/lib/cvsclient/util
cvs server: Diffing javacvs/src
cvs server: Diffing javacvs/src/org
cvs server: Diffing javacvs/src/org/netbeans
cvs server: Diffing javacvs/src/org/netbeans/modules
cvs server: Diffing javacvs/src/org/netbeans/modules/cvsclient
cvs server: Diffing javacvs/src/org/netbeans/modules/cvsclient/actions
cvs server: Diffing javacvs/src/org/netbeans/modules/cvsclient/cache
cvs server: Diffing javacvs/src/org/netbeans/modules/cvsclient/cache/javacvs
cvs server: Diffing javacvs/src/org/netbeans/modules/cvsclient/caching
cvs server: Diffing javacvs/src/org/netbeans/modules/cvsclient/commands
cvs server: Diffing javacvs/src/org/netbeans/modules/cvsclient/commands/add
cvs server: Diffing javacvs/src/org/netbeans/modules/cvsclient/commands/annotate
cvs server: Diffing javacvs/src/org/netbeans/modules/cvsclient/commands/changelog
cvs server: Diffing javacvs/src/org/netbeans/modules/cvsclient/commands/checkout
cvs server: Diffing javacvs/src/org/netbeans/modules/cvsclient/commands/commit
cvs server: Diffing javacvs/src/org/netbeans/modules/cvsclient/commands/diff
cvs server: Diffing javacvs/src/org/netbeans/modules/cvsclient/commands/grouping
cvs server: Diffing javacvs/src/org/netbeans/modules/cvsclient/commands/log
cvs server: Diffing javacvs/src/org/netbeans/modules/cvsclient/commands/remove
cvs server: Diffing javacvs/src/org/netbeans/modules/cvsclient/commands/status
cvs server: Diffing javacvs/src/org/netbeans/modules/cvsclient/commands/tag
cvs server: Diffing javacvs/src/org/netbeans/modules/cvsclient/commands/update
cvs server: Diffing javacvs/src/org/netbeans/modules/cvsclient/customizer
cvs server: Diffing javacvs/src/org/netbeans/modules/cvsclient/editors
cvs server: Diffing javacvs/src/org/netbeans/modules/cvsclient/events
cvs server: Diffing javacvs/src/org/netbeans/modules/cvsclient/login
cvs server: Diffing javacvs/src/org/netbeans/modules/cvsclient/passwd
cvs server: Diffing javacvs/src/org/netbeans/modules/cvsclient/util
cvs server: Diffing javacvs/src/org/netbeans/modules/cvsclient/versioning
cvs server: Diffing javacvs/src/org/netbeans/modules/cvsclient/views
cvs server: Diffing javacvs/src/org/netbeans/modules/cvsclient/views/actions
cvs server: Diffing javacvs/src/org/netbeans/modules/javacvs
cvs server: Diffing javacvs/src/org/netbeans/modules/javacvs/caching
cvs server: Diffing javacvs/src/org/netbeans/modules/javacvs/commands
cvs server: Diffing javacvs/src/org/netbeans/modules/javacvs/customizers
cvs server: Diffing javacvs/src/org/netbeans/modules/javacvs/editors
cvs server: Diffing javacvs/src/org/netbeans/modules/javacvs/events
cvs server: Diffing javacvs/src/org/netbeans/modules/javacvs/passwd
cvs server: Diffing javacvs/src/org/netbeans/modules/javacvs/resources
cvs server: Diffing javacvs/src/org/netbeans/modules/javacvs/util
cvs server: Diffing javacvs/test
cvs server: Diffing javacvs/test/data
cvs server: Diffing javacvs/test/data/iz50229
cvs server: Diffing javacvs/test/data/iz50963
cvs server: Diffing javacvs/test/data/iz53239
cvs server: Diffing javacvs/test/data/iz56710
cvs server: Diffing javacvs/test/oo
cvs server: Diffing javacvs/test/oo/gui
cvs server: Diffing javacvs/test/oo/gui/jelly
cvs server: Diffing javacvs/test/oo/gui/jelly/javacvs
cvs server: Diffing javacvs/test/qa-functional
cvs server: Diffing javacvs/test/qa-functional/src
cvs server: Diffing javacvs/test/qa-functional/src/Startup
cvs server: Diffing javacvs/test/qa-functional/src/complete
cvs server: Diffing javacvs/test/qa-functional/src/complete/data
cvs server: Diffing javacvs/test/qa-functional/src/complete/data/goldenfiles
cvs server: Diffing javacvs/test/qa-functional/src/complete/data/goldenfiles/AdditionalCommands
cvs server: Diffing javacvs/test/qa-functional/src/complete/data/goldenfiles/BasicCommands
cvs server: Diffing javacvs/test/qa-functional/src/org
cvs server: Diffing javacvs/test/qa-functional/src/org/netbeans
cvs server: Diffing javacvs/test/qa-functional/src/org/netbeans/jellytools
cvs server: Diffing javacvs/test/qa-functional/src/org/netbeans/jellytools/modules
cvs server: Diffing javacvs/test/qa-functional/src/org/netbeans/jellytools/modules/javacvs
cvs server: Diffing javacvs/test/qa-functional/src/org/netbeans/jellytools/modules/javacvs/output
cvs server: Diffing javacvs/test/qa-functional/src/site-specific
cvs server: Diffing javacvs/test/qa-functional/src/validation
cvs server: Diffing javacvs/test/qa-functional/src/validation/data
cvs server: Diffing javacvs/test/qa-functional/src/validation/data/goldenfiles
cvs server: Diffing javacvs/test/qa-functional/src/validation/data/goldenfiles/JavaCVSValidationTest
cvs server: Diffing javacvs/test/unit
cvs server: Diffing javacvs/test/unit/library
cvs server: Diffing javacvs/test/unit/library/org
cvs server: Diffing javacvs/test/unit/library/org/netbeans
cvs server: Diffing javacvs/test/unit/library/org/netbeans/lib
cvs server: Diffing javacvs/test/unit/library/org/netbeans/lib/cvsclient
cvs server: Diffing javacvs/test/unit/library/org/netbeans/lib/cvsclient/protocol
cvs server: Diffing javacvs/www
cvs server: Diffing javacvs/www/changelog
cvs server: Diffing javacvs/www/cvsmodule
cvs server: Diffing javacvs/www/cvsmodule/develop
cvs server: Diffing javacvs/www/cvsmodule/usersguide
cvs server: Diffing javacvs/www/doc
cvs server: Diffing javacvs/www/doc/jihlava
cvs server: Diffing javacvs/www/library
cvs server: Diffing javacvs/www/plans