# This patch file was generated by NetBeans IDE # Following Index: paths are relative to: D:\ws\main # This patch can be applied using context Tools: Patch action on respective folder. # It uses platform neutral UTF-8 encoding and \n newlines. # Above lines and this line are ignored by the patching process. Index: versioning.util/src/org/netbeans/modules/versioning/util/common/VCSCommitParameters.java --- versioning.util/src/org/netbeans/modules/versioning/util/common/VCSCommitParameters.java +++ versioning.util/src/org/netbeans/modules/versioning/util/common/VCSCommitParameters.java @@ -58,7 +58,7 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JScrollPane; -import javax.swing.JTextArea; +import javax.swing.JEditorPane; import javax.swing.LayoutStyle.ComponentPlacement; import org.netbeans.modules.versioning.util.StringSelector; import org.netbeans.modules.versioning.util.TemplateSelector; @@ -111,7 +111,7 @@ changeSupport.addChangeListener(listener); } - public static JLabel createRecentMessagesLink(final JTextArea text, final Preferences preferences) { + public static JLabel createRecentMessagesLink(final JEditorPane text, final Preferences preferences) { JLabel recentLink = new JLabel(); recentLink.setIcon(new ImageIcon(VCSCommitParameters.class.getResource("/org/netbeans/modules/versioning/util/resources/recent_messages.png"))); // NOI18N recentLink.setToolTipText(getMessage("CTL_CommitForm_RecentMessages")); // NOI18N @@ -126,14 +126,14 @@ return recentLink; } - protected JLabel getRecentMessagesLink(final JTextArea text) { + protected JLabel getRecentMessagesLink(final JEditorPane text) { if(recentLink == null) { recentLink = createRecentMessagesLink(text, preferences); } return recentLink; } - protected static JLabel createMessagesTemplateLink(final JTextArea text, final Preferences preferences, final String helpCtxId) { + protected static JLabel createMessagesTemplateLink(final JEditorPane text, final Preferences preferences, final String helpCtxId) { JLabel templateLink = new JLabel(); templateLink.setIcon(new ImageIcon(VCSCommitParameters.class.getResource("/org/netbeans/modules/versioning/util/resources/load_template.png"))); // NOI18N templateLink.setToolTipText(getMessage("CTL_CommitForm_LoadTemplate")); // NOI18N @@ -148,7 +148,7 @@ return templateLink; } - protected JLabel getMessagesTemplateLink(final JTextArea text, String helpCtxId) { + protected JLabel getMessagesTemplateLink(final JEditorPane text, String helpCtxId) { if(templateLink == null) { templateLink = createMessagesTemplateLink(text, preferences, helpCtxId); } @@ -159,7 +159,7 @@ return NbBundle.getMessage(VCSCommitParameters.class, msgKey); } - private static void onBrowseRecentMessages(JTextArea text, Preferences preferences) { + private static void onBrowseRecentMessages(JEditorPane text, Preferences preferences) { StringSelector.RecentMessageSelector selector = new StringSelector.RecentMessageSelector(preferences); String message = selector.getRecentMessage(getMessage("CTL_CommitForm_RecentTitle"), // NOI18N getMessage("CTL_CommitForm_RecentPrompt"), // NOI18N @@ -169,7 +169,7 @@ } } - private static void onTemplate(JTextArea text, Preferences preferences, String helpCtxId) { + private static void onTemplate(JEditorPane text, Preferences preferences, String helpCtxId) { TemplateSelector ts = new TemplateSelector(preferences); if(ts.show(helpCtxId)) { text.setText(ts.getTemplate()); @@ -244,7 +244,7 @@ private class ParametersPanel extends JPanel { private JScrollPane scrollpane = new JScrollPane(); private final JLabel messageLabel = new JLabel(); - private final JTextArea messageTextArea = new JTextArea(); + private final JEditorPane messageTextArea = new JEditorPane(); private UndoRedoSupport um; public ParametersPanel() { @@ -254,11 +254,11 @@ JLabel templateLink = getMessagesTemplateLink(messageTextArea, "org.netbeans.modules.versioning.util.common.TemplatePanel"); //NOI18N JLabel recentLink = getRecentMessagesLink(messageTextArea); - messageTextArea.setColumns(60); //this determines the preferred width of the whole dialog - messageTextArea.setLineWrap(true); - messageTextArea.setRows(4); - messageTextArea.setTabSize(4); - messageTextArea.setWrapStyleWord(true); +// messageTextArea.setColumns(60); //this determines the preferred width of the whole dialog +// messageTextArea.setLineWrap(true); +// messageTextArea.setRows(4); +// messageTextArea.setTabSize(4); +// messageTextArea.setWrapStyleWord(true); messageTextArea.setMinimumSize(new Dimension(100, 18)); scrollpane.setViewportView(messageTextArea); Index: versioning.util/src/org/netbeans/modules/versioning/util/UndoRedoSupport.java --- versioning.util/src/org/netbeans/modules/versioning/util/UndoRedoSupport.java +++ versioning.util/src/org/netbeans/modules/versioning/util/UndoRedoSupport.java @@ -131,11 +131,12 @@ processDocumentChange(); return; } - AbstractDocument.DefaultDocumentEvent event = (AbstractDocument.DefaultDocumentEvent) e.getEdit(); - if (event.getType().equals(DocumentEvent.EventType.CHANGE)) { - edit.addEdit(e.getEdit()); - return; - } + UndoableEdit event = e.getEdit(); +// AbstractDocument.DefaultDocumentEvent event = (AbstractDocument.DefaultDocumentEvent) e.getEdit(); +// if (event.getType().equals(DocumentEvent.EventType.CHANGE)) { +// edit.addEdit(e.getEdit()); +// return; +// } int offsetChange = component.getCaretPosition() - lastOffset; int lengthChange = component.getDocument().getLength() - lastLength;