Attachment 83703 Details for Bug 199678 – new version

[patch] new version

patch199678.txt (text/plain), 6.97 KB, created by Frank Becker

on 2007-11-24 16:51:21 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Becker

Created: 2007-11-24 16:51:21 EST

Size: 6.97 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.tasks.ui
>Index: src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java,v
>retrieving revision 1.86
>diff -u -r1.86 TaskPlanningEditor.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java	14 Oct 2007 16:22:32 -0000	1.86
>+++ src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java	24 Nov 2007 21:43:14 -0000
>@@ -121,7 +121,7 @@
> 
> 	private ScrolledForm form;
> 
>-	private Text summary;
>+	private TextViewer summaryEditor;
> 
> 	private Text issueReportURL;
> 
>@@ -182,17 +182,21 @@
> 			}
> 		}
> 
>-		if (summary == null)
>+		if (summaryEditor == null)
> 			return;
>-		if (!summary.isDisposed()) {
>-			if (!summary.getText().equals(updateTask.getSummary())) {
>+		
>+		if (!summaryEditor.getTextWidget().isDisposed()) {
>+			if (!summaryEditor.getTextWidget().getText().equals(updateTask.getSummary())) {
> 				boolean wasDirty = TaskPlanningEditor.this.isDirty;
>-				summary.setText(updateTask.getSummary());
>+				summaryEditor.getTextWidget().setText(updateTask.getSummary());
> 				TaskPlanningEditor.this.markDirty(wasDirty);
> 			}
> 			if (parentEditor != null) {
> 				parentEditor.changeTitle();
>-				parentEditor.updateTitle(updateTask.getSummary());
>+				String summary = updateTask.getSummary();
>+				if (summary.length()> 20)
>+					summary = summary.substring(0, 20) + "...";
>+				parentEditor.updateTitle(summary);
> 			}
> 		}
> 
>@@ -218,7 +222,7 @@
> 	@Override
> 	public void doSave(IProgressMonitor monitor) {
> 		if (task instanceof LocalTask) {
>-			String label = summary.getText();
>+			String label = summaryEditor.getTextWidget().getText();
> 			// task.setDescription(label);
> 			TasksUiPlugin.getTaskListManager().getTaskList().renameTask(task, label);
> 
>@@ -295,11 +299,11 @@
> 		createPlanningSection(editorComposite);
> 		createNotesSection(editorComposite);
> 
>-		if (summary != null && LocalRepositoryConnector.DEFAULT_SUMMARY.equals(summary.getText())) {
>-			summary.setSelection(0, summary.getText().length());
>-			summary.setFocus();
>-		} else if (summary != null) {
>-			summary.setFocus();
>+		if (summaryEditor != null && summaryEditor.getTextWidget() != null && LocalRepositoryConnector.DEFAULT_SUMMARY.equals(summaryEditor.getTextWidget().getText())) {
>+			summaryEditor.setSelectedRange(0, summaryEditor.getTextWidget().getText().length());
>+			summaryEditor.getTextWidget().setFocus();
>+		} else if (summaryEditor != null && summaryEditor.getTextWidget() != null) {
>+			summaryEditor.getTextWidget().setFocus();
> 		}
> 	}
> 
>@@ -348,8 +352,8 @@
> 	@Override
> 	public void setFocus() {
> 		// form.setFocus();
>-		if (summary != null && !summary.isDisposed()) {
>-			summary.setFocus();
>+		if (summaryEditor != null && summaryEditor.getTextWidget() != null && !summaryEditor.getTextWidget().isDisposed()) {
>+			summaryEditor.getTextWidget().setFocus();
> 		}
> 	}
> 
>@@ -386,16 +390,32 @@
> 		summaryComposite.setLayout(summaryLayout);
> 		GridDataFactory.fillDefaults().grab(true, false).applyTo(summaryComposite);
> 
>-		summary = toolkit.createText(summaryComposite, task.getSummary(), SWT.LEFT | SWT.FLAT);
>-		summary.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER);
>-		GridDataFactory.fillDefaults().minSize(100, SWT.DEFAULT).grab(true, false).applyTo(summary);
>+		TaskRepository repository = null;
>+		if (task != null && !(task instanceof LocalTask)) {
>+			AbstractTask repositoryTask = task;
>+			repository = TasksUiPlugin.getRepositoryManager().getRepository(repositoryTask.getConnectorKind(),
>+					repositoryTask.getRepositoryUrl());
>+		}
>+//		summaryEditor = addTextEditor(repository, summaryComposite, task.getSummary(), true, SWT.FLAT | SWT.MULTI
>+//				| SWT.WRAP | SWT.V_SCROLL);
>+		summaryEditor = addTextEditor(repository, summaryComposite, task.getSummary(), true, SWT.FLAT | SWT.SINGLE);
>+
>+//		summaryEditor.getControl().setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
>+		GridDataFactory.fillDefaults().hint(summaryComposite.getSize().x - 100, SWT.DEFAULT).minSize(100, SWT.DEFAULT).grab(true, false)	.applyTo(summaryEditor.getTextWidget());
>+//		summaryEditor.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
>+		summaryEditor.getControl().setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER);
> 
>+//		summaryEditor.getTextWidget().setTextLimit(30);
>+		
> 		if (!(task instanceof LocalTask)) {
>-			summary.setEnabled(false);
>+			summaryEditor.setEditable(false);
> 		} else {
>-			summary.addModifyListener(new ModifyListener() {
>-				public void modifyText(ModifyEvent e) {
>-					markDirty(true);
>+			summaryEditor.setEditable(true);
>+			summaryEditor.addTextListener(new ITextListener() {
>+				public void textChanged(TextEvent event) {
>+					if (!task.getSummary().equals(summaryEditor.getTextWidget().getText())) {
>+						markDirty(true);
>+					}
> 				}
> 			});
> 		}
>@@ -569,7 +589,7 @@
> 
> 				@Override
> 				protected void setTitle(final String pageTitle) {
>-					summary.setText(pageTitle);
>+					summaryEditor.getTextWidget().setText(pageTitle);
> 					TaskPlanningEditor.this.markDirty(true);
> 				}
> 
>@@ -933,12 +953,12 @@
> 
> 	/** for testing - should cause dirty state */
> 	public void setDescription(String desc) {
>-		this.summary.setText(desc);
>+		this.summaryEditor.getTextWidget().setText(desc);
> 	}
> 
> 	/** for testing */
> 	public String getDescription() {
>-		return this.summary.getText();
>+		return this.summaryEditor.getTextWidget().getText();
> 	}
> 
> 	/** for testing */
>Index: src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java,v
>retrieving revision 1.64
>diff -u -r1.64 TaskEditor.java
>--- src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java	27 Sep 2007 00:42:08 -0000	1.64
>+++ src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java	24 Nov 2007 21:43:15 -0000
>@@ -257,7 +257,14 @@
> 				index++;
> 				taskEditorInput = (TaskEditorInput) getEditorInput();
> 				task = taskEditorInput.getTask();
>-				setPartName(taskEditorInput.getLabel());
>+
>+				String summary = taskEditorInput.getLabel();
>+				if (task instanceof LocalTask) {
>+					if (summary.length()> 20)
>+						summary = summary.substring(0, 20) + "...";
>+				}				
>+				
>+				setPartName(summary);
> 				setPageImage(0, TasksUiImages.getImage(TasksUiImages.CALENDAR_SMALL));
> 			}
> 
>@@ -398,7 +405,10 @@
> 		if (input instanceof TaskEditorInput) {
> 			AbstractTask task = ((TaskEditorInput) input).getTask();
> 			if (task instanceof LocalTask) {
>-				getHeaderForm().getForm().setText("Task: " + task.getSummary());
>+				String summary = task.getSummary();
>+				if (summary.length()> 40)
>+					summary = summary.substring(0, 40) + "...";
>+				getHeaderForm().getForm().setText("Task: " + summary);
> 			} else {
> 				setFormHeaderImage(task.getConnectorKind());
> 				setFormHeaderLabel(task);

Actions: View | Diff

Attachments on bug 199678: 83691 | 83692 | 83703 | 83704