Changeset 821:b14dbd44fad1

Timestamp:

08/09/08 16:01:06 (4 months ago)

Author:

Bastian Doetsch <bastian.doetsch@gmx.de>

branch:

default

Message:

"Support spell checking in commit dialog. Eclipse editor preferences are used for configuration.

This was *hard*. Integrating into spell check is hardly documented and the preference constants must be searched in plug-in configurations..."

Files:

• src/com/vectrace/MercurialEclipse/dialogs/CommitDialog.java (modified) (20 diffs)
• src/com/vectrace/MercurialEclipse/ui/TextSpellingProblemCollector.java (added)

src/com/vectrace/MercurialEclipse/dialogs/CommitDialog.java

@@ -19 +19 @@
-import org.eclipse.compare.ResourceNode;
-import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.content.IContentType;
+import org.eclipse.core.runtime.content.IContentTypeManager;
-import org.eclipse.jface.dialogs.TrayDialog;
+import org.eclipse.jface.text.Document;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.ITextListener;
+import org.eclipse.jface.text.TextEvent;
+import org.eclipse.jface.text.source.AnnotationModel;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
@@ -45 +55 @@
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-
+
+
+
+
+
+
+
+
-
-import com.vectrace.MercurialEclipse.TableColumnSorter;
@@ -51 +68 @@
-import com.vectrace.MercurialEclipse.model.HgRoot;
-import com.vectrace.MercurialEclipse.team.IStorageMercurialRevision;
+import com.vectrace.MercurialEclipse.ui.TextSpellingProblemCollector;
-import com.vectrace.MercurialEclipse.utils.CompareUtils;
-
@@ -86 +104 @@
-    private String defaultCommitMessage = "(no commit message)";
-
-Text
+ISourceViewer
-    private Label commitTextLabel;
-    private Label commitFilesLabel;
@@ -104 +122 @@
-    private File[] filesToRemove;
-    private List<IResource> resourcesToRemove;
+    private IDocument commitTextDocument;
+    private SourceViewerDecorationSupport decorationSupport;
-
-    /**
@@ -110 +130 @@
-    public CommitDialog(Shell shell, HgRoot root, IResource[] inResources) {
-        super(shell);
-        
+
-        this.root = root;
-        this.inResources = inResources;
@@ -116 +136 @@
-        this.committableFilesFilter = new CommittableFilesFilter();
-        this.selectableFiles = true;
+        this.commitTextDocument = new Document();
-    }
-
@@ -152 +173 @@
-        commitTextLabel = new Label(container, SWT.NONE);
-        commitTextLabel.setText("Commit comments");
+
+        // commitTextBox = new Text(container, SWT.V_SCROLL | SWT.MULTI
+        // | SWT.BORDER | SWT.WRAP);
+
+        commitTextBox = new SourceViewer(container, null, SWT.V_SCROLL
+                | SWT.MULTI | SWT.BORDER | SWT.WRAP);
+        commitTextBox.setEditable(true);
+
+        // set up spell-check annotations
-        
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        commitFilesLabel = new Label(container, SWT.NONE);
@@ -161 +240 @@
-        commitFilesList = createFilesList(container, selectableFiles);
-
-        
-        
-        final FormData fd_commitTextLabel = new FormData();
-        fd_commitTextLabel.top = new FormAttachment(0, 20);
@@ -170 +247 @@
-
-        final FormData fd_commitTextBox = new FormData();
-
+
+
-        fd_commitTextBox.left = new FormAttachment(0, 9);
-        fd_commitTextBox.bottom = new FormAttachment(0, 200);
-        fd_commitTextBox.right = new FormAttachment(100, -9);
-
+getTextWidget().
-
-        final FormData fd_commitFilesLabel = new FormData();
-
+
+
-        fd_commitFilesLabel.left = new FormAttachment(0, 9);
-        fd_commitFilesLabel.right = new FormAttachment(100, -9);
-        commitFilesLabel.setLayoutData(fd_commitFilesLabel);
-
-        
-        Table table = commitFilesList.getTable();
-        final FormData fd_table = new FormData();
@@ -195 +273 @@
-            selectAllButton = new Button(container, SWT.CHECK);
-            selectAllButton.setText("Select/unselect all");
-
+
-            showUntrackedFilesButton = new Button(container, SWT.CHECK);
-            showUntrackedFilesButton.setText("Show added/removed files");
@@ -202 +280 @@
-
-            final FormData fd_selectAllButton = new FormData();
-
+
+
-            fd_selectAllButton.left = new FormAttachment(0, 9);
-            fd_selectAllButton.right = new FormAttachment(100, -9);
@@ -218 +297 @@
-
-    private void makeActions() {
-
+// 
-        commitFilesList.addDoubleClickListener(new IDoubleClickListener() {
-            public void doubleClick(DoubleClickEvent event) {
@@ -236 +315 @@
-                                    .getResource()));
-
-                                        
+
-                }
-            }
@@ -291 +370 @@
-
-    private void setupDefaultCommitMessage() {
-Box.setTex
-ion(0, defaultCommitMessage.length());        
+Document.se
+edRange(0, defaultCommitMessage.length());
-    }
-
@@ -341 +420 @@
-        List<CommitResource> tracked = new ArrayList<CommitResource>();
-        for (CommitResource commitResource : commitResources) {
- 
+
-                tracked.add(commitResource);
-            }
@@ -398 +477 @@
-        return list.toArray(new File[0]);
-    }
-
+
-    private File[] getToRemoveList(Object[] objs) {
-        ArrayList<File> list = new ArrayList<File>();
@@ -432 +511 @@
-        return list;
-    }
-
+
-    private List<IResource> getToRemoveResourceList(Object[] objs) {
-        ArrayList<IResource> list = new ArrayList<IResource>();
@@ -459 +538 @@
-        resourcesToAdd = getToAddResourceList(commitFilesList
-                .getCheckedElements());
-
+
-        filesToCommit = convertToFiles(commitFilesList.getCheckedElements());
-        resourcesToCommit = convertToResource(commitFilesList
@@ -465 +544 @@
-
-        filesToRemove = getToRemoveList(commitFilesList.getCheckedElements());
-
-
+
+
+
-
-        super.okPressed();