Attachment 103264 Details for Bug 235222 – Jira wiki integration step 1

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Jira wiki integration step 1

clipboard.txt (text/plain), 37.25 KB, created by Jingwen 'Owen' Ou

on 2008-06-03 04:58:27 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jingwen 'Owen' Ou

Created: 2008-06-03 04:58:27 EDT

Size: 37.25 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.tasks.ui
>Index: .refactorings/2008/6/23/refactorings.index
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/.refactorings/2008/6/23/refactorings.index,v
>retrieving revision 1.1
>diff -u -r1.1 refactorings.index
>--- .refactorings/2008/6/23/refactorings.index	2 Jun 2008 07:07:27 -0000	1.1
>+++ .refactorings/2008/6/23/refactorings.index	3 Jun 2008 08:55:14 -0000
>@@ -2,3 +2,11 @@
> 1212381972354	Convert member type 'TaskAttributeDiff' to top level
> 1212387128201	Extract local variable 'size'
> 1212388250355	Extract local variable 'label'
>+1212453678453	Move compilation unit
>+1212471788453	Convert local variable 'folder' to field
>+1212478092171	Convert local variable 'viewr' to field
>+1212481630750	Convert local variable 'document' to field
>+1212482179921	Move package
>+1212482655906	Rename package 'org.eclipse.mylyn.internal.tasks.wiki'
>+1212482712906	Delete element
>+1212483094343	Move compilation unit
>Index: .refactorings/2008/6/23/refactorings.history
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/.refactorings/2008/6/23/refactorings.history,v
>retrieving revision 1.1
>diff -u -r1.1 refactorings.history
>--- .refactorings/2008/6/23/refactorings.history	2 Jun 2008 07:07:27 -0000	1.1
>+++ .refactorings/2008/6/23/refactorings.history	3 Jun 2008 08:55:14 -0000
>@@ -1,3 +1,3 @@
> <?xml version="1.0" encoding="UTF-8"?>
>-<session version="1.0">&#x0A;<refactoring comment="Copy 1 elements(s) to &apos;org.eclipse.mylyn.tasks.ui/src/org.eclipse.mylyn.internal.tasks.ui.notifications&apos;&#x0A;- Original project: &apos;org.eclipse.mylyn.tasks.ui&apos;&#x0A;- Destination element: &apos;org.eclipse.mylyn.tasks.ui/src/org.eclipse.mylyn.internal.tasks.ui.notifications&apos;&#x0A;- Original element: &apos;org.eclipse.mylyn.internal.tasks.ui.LegacyChangeManager.java&apos;" description="Copy compilation unit" destination="/src&lt;org.eclipse.mylyn.internal.tasks.ui.notifications" element1="/src&lt;org.eclipse.mylyn.internal.tasks.ui{LegacyChangeManager.java" files="0" flags="589830" folders="0" id="org.eclipse.jdt.ui.copy" policy="org.eclipse.jdt.ui.copyResources" stamp="1212381060856" units="1" version="1.0"/>&#x0A;<refactoring comment="Convert member type &apos;org.eclipse.mylyn.internal.tasks.ui.notifications.TaskDataDiff.TaskAttributeDiff&apos; in &apos;org.eclipse.mylyn.internal.tasks.ui.notifications.TaskDataDiff&apos; to top level type&#x0A;- Original project: &apos;org.eclipse.mylyn.tasks.ui&apos;&#x0A;- Original element: &apos;org.eclipse.mylyn.internal.tasks.ui.notifications.TaskDataDiff.TaskAttributeDiff&apos;&#x0A;- Field name: &apos;taskDataDiff&apos;&#x0A;- Declare field &apos;final&apos;" description="Convert member type &apos;TaskAttributeDiff&apos; to top level" field="false" fieldName="taskDataDiff" final="true" flags="786438" id="org.eclipse.jdt.ui.move.inner" input="/src&lt;org.eclipse.mylyn.internal.tasks.ui.notifications{TaskDataDiff.java[TaskDataDiff[TaskAttributeDiff" mandatory="false" possible="false" stamp="1212381972354" version="1.0"/>&#x0A;<refactoring comment="Extract local variable &apos;size&apos; from expression &apos;newComments.size()&apos;&#x0A;- Original project: &apos;org.eclipse.mylyn.tasks.ui&apos;&#x0A;- Variable name: &apos;size&apos;&#x0A;- Destination method: &apos;org.eclipse.mylyn.internal.tasks.ui.notifications.TaskDataDiff.toString()&apos;&#x0A;- Variable expression: &apos;newComments.size()&apos;&#x0A;- Replace occurrences of expression with variable" description="Extract local variable &apos;size&apos;" final="false" id="org.eclipse.jdt.ui.extract.temp" input="/src&lt;org.eclipse.mylyn.internal.tasks.ui.notifications{TaskDataDiff.java" name="size" replace="true" selection="4350 18" stamp="1212387128201" version="1.0"/>&#x0A;<refactoring comment="Extract local variable &apos;label&apos; from expression &apos;attributeDiff.getLabel()&apos;&#x0A;- Original project: &apos;org.eclipse.mylyn.tasks.ui&apos;&#x0A;- Variable name: &apos;label&apos;&#x0A;- Destination method: &apos;org.eclipse.mylyn.internal.tasks.ui.notifications.TaskDataDiff.toString()&apos;&#x0A;- Variable expression: &apos;attributeDiff.getLabel()&apos;&#x0A;- Replace occurrences of expression with variable" description="Extract local variable &apos;label&apos;" final="false" id="org.eclipse.jdt.ui.extract.temp" input="/src&lt;org.eclipse.mylyn.internal.tasks.ui.notifications{TaskDataDiff.java" name="label" replace="true" selection="4466 24" stamp="1212388250355" version="1.0"/>
>+<session version="1.0">&#x0A;<refactoring comment="Copy 1 elements(s) to &apos;org.eclipse.mylyn.tasks.ui/src/org.eclipse.mylyn.internal.tasks.ui.notifications&apos;&#x0A;- Original project: &apos;org.eclipse.mylyn.tasks.ui&apos;&#x0A;- Destination element: &apos;org.eclipse.mylyn.tasks.ui/src/org.eclipse.mylyn.internal.tasks.ui.notifications&apos;&#x0A;- Original element: &apos;org.eclipse.mylyn.internal.tasks.ui.LegacyChangeManager.java&apos;" description="Copy compilation unit" destination="/src&lt;org.eclipse.mylyn.internal.tasks.ui.notifications" element1="/src&lt;org.eclipse.mylyn.internal.tasks.ui{LegacyChangeManager.java" files="0" flags="589830" folders="0" id="org.eclipse.jdt.ui.copy" policy="org.eclipse.jdt.ui.copyResources" stamp="1212381060856" units="1" version="1.0"/>&#x0A;<refactoring comment="Convert member type &apos;org.eclipse.mylyn.internal.tasks.ui.notifications.TaskDataDiff.TaskAttributeDiff&apos; in &apos;org.eclipse.mylyn.internal.tasks.ui.notifications.TaskDataDiff&apos; to top level type&#x0A;- Original project: &apos;org.eclipse.mylyn.tasks.ui&apos;&#x0A;- Original element: &apos;org.eclipse.mylyn.internal.tasks.ui.notifications.TaskDataDiff.TaskAttributeDiff&apos;&#x0A;- Field name: &apos;taskDataDiff&apos;&#x0A;- Declare field &apos;final&apos;" description="Convert member type &apos;TaskAttributeDiff&apos; to top level" field="false" fieldName="taskDataDiff" final="true" flags="786438" id="org.eclipse.jdt.ui.move.inner" input="/src&lt;org.eclipse.mylyn.internal.tasks.ui.notifications{TaskDataDiff.java[TaskDataDiff[TaskAttributeDiff" mandatory="false" possible="false" stamp="1212381972354" version="1.0"/>&#x0A;<refactoring comment="Extract local variable &apos;size&apos; from expression &apos;newComments.size()&apos;&#x0A;- Original project: &apos;org.eclipse.mylyn.tasks.ui&apos;&#x0A;- Variable name: &apos;size&apos;&#x0A;- Destination method: &apos;org.eclipse.mylyn.internal.tasks.ui.notifications.TaskDataDiff.toString()&apos;&#x0A;- Variable expression: &apos;newComments.size()&apos;&#x0A;- Replace occurrences of expression with variable" description="Extract local variable &apos;size&apos;" final="false" id="org.eclipse.jdt.ui.extract.temp" input="/src&lt;org.eclipse.mylyn.internal.tasks.ui.notifications{TaskDataDiff.java" name="size" replace="true" selection="4350 18" stamp="1212387128201" version="1.0"/>&#x0A;<refactoring comment="Extract local variable &apos;label&apos; from expression &apos;attributeDiff.getLabel()&apos;&#x0A;- Original project: &apos;org.eclipse.mylyn.tasks.ui&apos;&#x0A;- Variable name: &apos;label&apos;&#x0A;- Destination method: &apos;org.eclipse.mylyn.internal.tasks.ui.notifications.TaskDataDiff.toString()&apos;&#x0A;- Variable expression: &apos;attributeDiff.getLabel()&apos;&#x0A;- Replace occurrences of expression with variable" description="Extract local variable &apos;label&apos;" final="false" id="org.eclipse.jdt.ui.extract.temp" input="/src&lt;org.eclipse.mylyn.internal.tasks.ui.notifications{TaskDataDiff.java" name="label" replace="true" selection="4466 24" stamp="1212388250355" version="1.0"/>&#x0A;<refactoring comment="Move 1 elements(s) to &apos;org.eclipse.mylyn.jira.ui/src/org.eclipse.mylyn.internal.jira.ui.editor&apos;&#x0D;&#x0A;- Original project: &apos;org.eclipse.mylyn.tasks.ui&apos;&#x0D;&#x0A;- Destination element: &apos;org.eclipse.mylyn.jira.ui/src/org.eclipse.mylyn.internal.jira.ui.editor&apos;&#x0D;&#x0A;- Original element: &apos;org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorWikiTextPart.java&apos;&#x0D;&#x0A;- Update references to refactored element" description="Move compilation unit" destination="=org.eclipse.mylyn.jira.ui/src&lt;org.eclipse.mylyn.internal.jira.ui.editor" element1="/src&lt;org.eclipse.mylyn.internal.tasks.ui.editors{TaskEditorWikiTextPart.java" files="0" flags="589830" folders="0" id="org.eclipse.jdt.ui.move" patterns="*" policy="org.eclipse.jdt.ui.moveResources" qualified="false" references="true" stamp="1212453678453" units="1" version="1.0"/>&#x0A;<refactoring comment="Convert local variable &apos;org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorWikiTextPart.createControl().folder&apos; in &apos;org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorWikiTextPart.createControl()&apos; to field&#x0D;&#x0A;- Original project: &apos;org.eclipse.mylyn.tasks.ui&apos;&#x0D;&#x0A;- Original element: &apos;org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorWikiTextPart.createControl().folder&apos;&#x0D;&#x0A;- Field name: &apos;folder&apos;&#x0D;&#x0A;- Initialize field in method&#x0D;&#x0A;- Declared visibility: &apos;private&apos;" description="Convert local variable &apos;folder&apos; to field" final="false" flags="2" id="org.eclipse.jdt.ui.promote.temp" initialize="1" input="/src&lt;org.eclipse.mylyn.internal.tasks.ui.editors{TaskEditorWikiTextPart.java" name="folder" selection="1397 6" stamp="1212471788453" static="false" version="1.0" visibility="2"/>&#x0A;<refactoring comment="Convert local variable &apos;org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorWikiTextPart.createControl().viewr&apos; in &apos;org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorWikiTextPart.createControl()&apos; to field&#x0D;&#x0A;- Original project: &apos;org.eclipse.mylyn.tasks.ui&apos;&#x0D;&#x0A;- Original element: &apos;org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorWikiTextPart.createControl().viewr&apos;&#x0D;&#x0A;- Field name: &apos;viewr&apos;&#x0D;&#x0A;- Initialize field in method&#x0D;&#x0A;- Declared visibility: &apos;private&apos;" description="Convert local variable &apos;viewr&apos; to field" final="false" flags="2" id="org.eclipse.jdt.ui.promote.temp" initialize="1" input="/src&lt;org.eclipse.mylyn.internal.tasks.ui.editors{TaskEditorWikiTextPart.java" name="viewr" selection="3124 5" stamp="1212478092171" static="false" version="1.0" visibility="2"/>&#x0A;<refactoring comment="Convert local variable &apos;org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorWikiTextPart.createControl().document&apos; in &apos;org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorWikiTextPart.createControl()&apos; to field&#x0D;&#x0A;- Original project: &apos;org.eclipse.mylyn.tasks.ui&apos;&#x0D;&#x0A;- Original element: &apos;org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorWikiTextPart.createControl().document&apos;&#x0D;&#x0A;- Field name: &apos;document&apos;&#x0D;&#x0A;- Initialize field in method&#x0D;&#x0A;- Declared visibility: &apos;private&apos;" description="Convert local variable &apos;document&apos; to field" final="false" flags="2" id="org.eclipse.jdt.ui.promote.temp" initialize="1" input="/src&lt;org.eclipse.mylyn.internal.tasks.ui.editors{TaskEditorWikiTextPart.java" name="document" selection="3889 8" stamp="1212481630750" static="false" version="1.0" visibility="2"/>&#x0A;<refactoring comment="Move 1 package(s) to &apos;org.eclipse.mylyn.jira.ui/src&apos;&#x0D;&#x0A;- Original project: &apos;org.eclipse.mylyn.tasks.ui&apos;&#x0D;&#x0A;- Destination element: &apos;org.eclipse.mylyn.jira.ui/src&apos;&#x0D;&#x0A;- Original element: &apos;org.eclipse.mylyn.tasks.ui/src/org.eclipse.mylyn.internal.jira.wiki&apos;" description="Move package" destination="=org.eclipse.mylyn.jira.ui/src" element1="/src&lt;org.eclipse.mylyn.internal.jira.wiki" flags="589830" fragments="1" id="org.eclipse.jdt.ui.move" policy="org.eclipse.jdt.ui.movePackages" stamp="1212482179921" version="1.0"/>&#x0A;<refactoring comment="Rename package &apos;org.eclipse.mylyn.internal.tasks.wiki&apos; to &apos;org.eclipse.mylyn.internal.tasks.ui.wiki&apos;&#x0D;&#x0A;- Original project: &apos;org.eclipse.mylyn.tasks.ui&apos;&#x0D;&#x0A;- Original element: &apos;org.eclipse.mylyn.tasks.ui/src/org.eclipse.mylyn.internal.tasks.wiki&apos;&#x0D;&#x0A;- Renamed element: &apos;org.eclipse.mylyn.tasks.ui/src/org.eclipse.mylyn.internal.tasks.ui.wiki&apos;&#x0D;&#x0A;- Update references to refactored element&#x0D;&#x0A;- Update textual occurrences in comments and strings" description="Rename package &apos;org.eclipse.mylyn.internal.tasks.wiki&apos;" flags="589830" hierarchical="false" id="org.eclipse.jdt.ui.rename.package" input="/src&lt;org.eclipse.mylyn.internal.tasks.wiki" name="org.eclipse.mylyn.internal.tasks.ui.wiki" qualified="false" references="true" stamp="1212482655906" textual="false" version="1.0"/>&#x0A;<refactoring accessors="true" comment="Delete 1 element(s) from project &apos;org.eclipse.mylyn.tasks.ui&apos;&#x0D;&#x0A;- Original project: &apos;org.eclipse.mylyn.tasks.ui&apos;&#x0D;&#x0A;- Original element: &apos;org.eclipse.mylyn.internal.tasks.ui.wiki.Snippet.java&apos;" description="Delete element" element1="/src&lt;org.eclipse.mylyn.internal.tasks.ui.wiki{Snippet.java" elements="1" flags="589830" id="org.eclipse.jdt.ui.delete" resources="0" stamp="1212482712906" subPackages="false" version="1.0"/>&#x0A;<refactoring comment="Move 1 elements(s) to &apos;org.eclipse.mylyn.tasks.ui/src/org.eclipse.mylyn.internal.tasks.ui.wiki&apos;&#x0D;&#x0A;- Original project: &apos;org.eclipse.mylyn.tasks.ui&apos;&#x0D;&#x0A;- Destination element: &apos;org.eclipse.mylyn.tasks.ui/src/org.eclipse.mylyn.internal.tasks.ui.wiki&apos;&#x0D;&#x0A;- Original element: &apos;org.eclipse.mylyn.tasks.ui.editors.AbstractRenderingEngine2.java&apos;&#x0D;&#x0A;- Update references to refactored element" description="Move compilation unit" destination="/src&lt;org.eclipse.mylyn.internal.tasks.ui.wiki" element1="/src&lt;org.eclipse.mylyn.tasks.ui.editors{AbstractRenderingEngine2.java" files="0" flags="589830" folders="0" id="org.eclipse.jdt.ui.move" patterns="*" policy="org.eclipse.jdt.ui.moveResources" qualified="false" references="true" stamp="1212483094343" units="1" version="1.0"/>
> </session>
>\ No newline at end of file
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF,v
>retrieving revision 1.399
>diff -u -r1.399 MANIFEST.MF
>--- META-INF/MANIFEST.MF	14 May 2008 05:34:29 -0000	1.399
>+++ META-INF/MANIFEST.MF	3 Jun 2008 08:55:14 -0000
>@@ -25,7 +25,8 @@
>  org.eclipse.mylyn.commons.net;bundle-version="[3.0.0,4.0.0)",
>  org.eclipse.mylyn.commons.ui;bundle-version="[3.0.0,4.0.0)",
>  org.eclipse.mylyn.monitor.core;bundle-version="[3.0.0,4.0.0)",
>- org.apache.commons.logging;bundle-version="1.0.4"
>+ org.apache.commons.logging;bundle-version="1.0.4",
>+ org.eclipse.mylyn.wikitext;bundle-version="1.0.0"
> Bundle-ActivationPolicy: lazy
> Bundle-Vendor: Eclipse.org
> Export-Package: org.eclipse.mylyn.internal.tasks.ui;x-internal:=true,
>@@ -40,6 +41,7 @@
>  org.eclipse.mylyn.internal.tasks.ui.search;x-internal:=true,
>  org.eclipse.mylyn.internal.tasks.ui.util;x-internal:=true,
>  org.eclipse.mylyn.internal.tasks.ui.views;x-internal:=true,
>+ org.eclipse.mylyn.internal.tasks.ui.wiki,
>  org.eclipse.mylyn.internal.tasks.ui.wizards;x-internal:=true,
>  org.eclipse.mylyn.internal.tasks.ui.workingsets;x-internal:=true,
>  org.eclipse.mylyn.tasks.ui,
>Index: .settings/.api_filters
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/.settings/.api_filters,v
>retrieving revision 1.19
>diff -u -r1.19 .api_filters
>--- .settings/.api_filters	8 May 2008 05:45:19 -0000	1.19
>+++ .settings/.api_filters	3 Jun 2008 08:55:14 -0000
>@@ -8,4 +8,12 @@
>             </message_arguments>
>         </filter>
>     </resource>
>+    <resource path="src/org/eclipse/mylyn/internal/jira/wiki/JiraTaskEditorWikiTextPart.java" type="org.eclipse.mylyn.internal.jira.wiki.JiraTaskEditorWikiTextPart">
>+        <filter id="576720909">
>+            <message_arguments>
>+                <message_argument value="TaskEditorWikiTextPart"/>
>+                <message_argument value="JiraTaskEditorWikiTextPart"/>
>+            </message_arguments>
>+        </filter>
>+    </resource>
> </component>
>Index: src/org/eclipse/mylyn/internal/tasks/ui/wiki/JiraRenderingEngine.java
>===================================================================
>RCS file: src/org/eclipse/mylyn/internal/tasks/ui/wiki/JiraRenderingEngine.java
>diff -N src/org/eclipse/mylyn/internal/tasks/ui/wiki/JiraRenderingEngine.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/mylyn/internal/tasks/ui/wiki/JiraRenderingEngine.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,25 @@
>+/*******************************************************************************
>+ * Copyright (c) 2004, 2007 Mylyn project committers and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *******************************************************************************/
>+
>+package org.eclipse.mylyn.internal.tasks.ui.wiki;
>+
>+import org.eclipse.mylyn.wikitext.parser.markup.MarkupLanguage;
>+
>+/**
>+ * @author Owen
>+ * @since 3.0
>+ */
>+public class JiraRenderingEngine extends AbstractRenderingEngine2 {
>+
>+	//for testing purpose to use Textile
>+	@Override
>+	public MarkupLanguage buildMarkupLaguage() {
>+		return getMarkupLanguage(AbstractRenderingEngine2.TEXTILE);
>+	}
>+
>+}
>Index: src/org/eclipse/mylyn/internal/tasks/ui/wiki/JiraTaskEditorWikiTextPart.java
>===================================================================
>RCS file: src/org/eclipse/mylyn/internal/tasks/ui/wiki/JiraTaskEditorWikiTextPart.java
>diff -N src/org/eclipse/mylyn/internal/tasks/ui/wiki/JiraTaskEditorWikiTextPart.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/mylyn/internal/tasks/ui/wiki/JiraTaskEditorWikiTextPart.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,31 @@
>+/*******************************************************************************
>+ * Copyright (c) 2004, 2007 Mylyn project committers and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *******************************************************************************/
>+
>+package org.eclipse.mylyn.internal.tasks.ui.wiki;
>+
>+import org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorWikiTextPart;
>+import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
>+import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPage;
>+import org.eclipse.ui.forms.widgets.ExpandableComposite;
>+
>+/**
>+ * @since 3.0
>+ */
>+public class JiraTaskEditorWikiTextPart extends TaskEditorWikiTextPart {
>+	public JiraTaskEditorWikiTextPart() {
>+		setPartName("New Comment");
>+		setSectionStyle(ExpandableComposite.TITLE_BAR | ExpandableComposite.EXPANDED);
>+		setExpandVertically(true);
>+	}
>+
>+	@Override
>+	public void initialize(AbstractTaskEditorPage taskEditorPage) {
>+		super.initialize(taskEditorPage);
>+		setAttribute(getModel().getTaskData().getRoot().getMappedAttribute(TaskAttribute.COMMENT_NEW));
>+	}
>+}
>Index: src/org/eclipse/mylyn/internal/tasks/ui/wiki/AbstractRenderingEngine2.java
>===================================================================
>RCS file: src/org/eclipse/mylyn/internal/tasks/ui/wiki/AbstractRenderingEngine2.java
>diff -N src/org/eclipse/mylyn/internal/tasks/ui/wiki/AbstractRenderingEngine2.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/mylyn/internal/tasks/ui/wiki/AbstractRenderingEngine2.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,107 @@
>+/*******************************************************************************
>+ * Copyright (c) 2004, 2007 Mylyn project committers and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *******************************************************************************/
>+
>+package org.eclipse.mylyn.internal.tasks.ui.wiki;
>+
>+import java.io.PrintWriter;
>+import java.io.StringWriter;
>+
>+import org.eclipse.mylyn.tasks.core.TaskRepository;
>+import org.eclipse.mylyn.wikitext.WikiTextPlugin;
>+import org.eclipse.mylyn.wikitext.parser.Attributes;
>+import org.eclipse.mylyn.wikitext.parser.MarkupParser;
>+import org.eclipse.mylyn.wikitext.parser.DocumentBuilder.BlockType;
>+import org.eclipse.mylyn.wikitext.parser.builder.HtmlDocumentBuilder;
>+import org.eclipse.mylyn.wikitext.parser.markup.MarkupLanguage;
>+
>+/**
>+ * @author Owen
>+ * @since 3.0 probably can replace AbstractRenderingEngine
>+ */
>+public abstract class AbstractRenderingEngine2 {
>+
>+	public static String TEXTILE = "Textile";
>+
>+	public static String MEDIAWIKI = "MediaWiki";
>+
>+	public static String TRACWIKI = "TracWiki";
>+
>+	public static String CONFLUENCE = "Confluence";
>+
>+	public static String DEFAULT_LANGUAGE = TEXTILE;
>+
>+	public abstract MarkupLanguage buildMarkupLaguage();
>+
>+	protected MarkupLanguage getMarkupLanguage(String markupLanguageName) {
>+		MarkupLanguage dialect = WikiTextPlugin.getDefault().getMarkupLanguage(markupLanguageName);
>+
>+		return dialect != null ? dialect : WikiTextPlugin.getDefault().getMarkupLanguage(DEFAULT_LANGUAGE);
>+	}
>+
>+	public String renderAsHtml(TaskRepository repository, String text) {
>+		String xhtml = null;
>+		if (!(text.length() > 0)) {
>+			xhtml = "<?xml version=\"1.0\" ?><html xmlns=\"http://www.w3.org/1999/xhtml\"><body></body></html>";
>+		} else {
>+			try {
>+				MarkupParser markupParser = new MarkupParser();
>+
>+//				IFile file = getFile();
>+//				String title = file.getName();
>+//				if (title.lastIndexOf('.') != -1) {
>+//					title = title.substring(0, title.lastIndexOf('.'));
>+//				}
>+
>+				// ignore for now
>+				String title = "TEST";
>+
>+				StringWriter writer = new StringWriter();
>+				HtmlDocumentBuilder builder = new HtmlDocumentBuilder(writer);
>+				builder.setTitle(title);
>+
>+				// ignore for now				
>+//				IPath location = file.getLocation();
>+//				if (location != null) {
>+//					builder.setBaseInHead(true);
>+//					builder.setBase(location.removeLastSegments(1).toFile().toURI());
>+//				}
>+
>+				markupParser.setBuilder(builder);
>+				markupParser.setMarkupLanaguage(buildMarkupLaguage());
>+				if (markupParser.getMarkupLanguage() == null) {
>+					builder.beginDocument();
>+					builder.beginBlock(BlockType.PREFORMATTED, new Attributes());
>+					builder.characters(text);
>+					builder.endBlock();
>+					builder.endDocument();
>+				} else {
>+					markupParser.getMarkupLanguage().setBlocksOnly(false);
>+					markupParser.getMarkupLanguage().setFilterGenerativeContents(false);
>+					markupParser.parse(text);
>+				}
>+				xhtml = writer.toString();
>+			} catch (Exception e) {
>+				StringWriter stackTrace = new StringWriter();
>+				PrintWriter writer = new PrintWriter(stackTrace);
>+				e.printStackTrace(writer);
>+				writer.close();
>+
>+				StringWriter documentWriter = new StringWriter();
>+				HtmlDocumentBuilder builder = new HtmlDocumentBuilder(documentWriter);
>+				builder.beginDocument();
>+				builder.beginBlock(BlockType.PREFORMATTED, new Attributes());
>+				builder.characters(stackTrace.toString());
>+				builder.endBlock();
>+				builder.endDocument();
>+
>+				xhtml = writer.toString();
>+			}
>+		}
>+		return xhtml;
>+	}
>+}
>Index: src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorWikiTextPart.java
>===================================================================
>RCS file: src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorWikiTextPart.java
>diff -N src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorWikiTextPart.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorWikiTextPart.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,238 @@
>+/*******************************************************************************
>+ * Copyright (c) 2004, 2007 Mylyn project committers and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *******************************************************************************/
>+
>+package org.eclipse.mylyn.internal.tasks.ui.editors;
>+
>+import org.eclipse.jface.text.Document;
>+import org.eclipse.jface.text.IDocument;
>+import org.eclipse.jface.text.reconciler.IReconciler;
>+import org.eclipse.jface.text.source.IOverviewRuler;
>+import org.eclipse.jface.text.source.ISourceViewer;
>+import org.eclipse.jface.text.source.IVerticalRuler;
>+import org.eclipse.jface.text.source.SourceViewer;
>+import org.eclipse.jface.text.source.VerticalRuler;
>+import org.eclipse.jface.viewers.Viewer;
>+import org.eclipse.mylyn.internal.provisional.commons.ui.CommonThemes;
>+import org.eclipse.mylyn.internal.tasks.ui.wiki.AbstractRenderingEngine2;
>+import org.eclipse.mylyn.internal.tasks.ui.wiki.JiraRenderingEngine;
>+import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
>+import org.eclipse.mylyn.tasks.ui.editors.AbstractAttributeEditor;
>+import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPart;
>+import org.eclipse.swt.SWT;
>+import org.eclipse.swt.browser.Browser;
>+import org.eclipse.swt.custom.CTabFolder;
>+import org.eclipse.swt.custom.CTabItem;
>+import org.eclipse.swt.custom.StyledText;
>+import org.eclipse.swt.events.SelectionEvent;
>+import org.eclipse.swt.events.SelectionListener;
>+import org.eclipse.swt.graphics.Font;
>+import org.eclipse.swt.graphics.Point;
>+import org.eclipse.swt.layout.GridData;
>+import org.eclipse.swt.layout.GridLayout;
>+import org.eclipse.swt.widgets.Composite;
>+import org.eclipse.ui.PlatformUI;
>+import org.eclipse.ui.forms.widgets.ExpandableComposite;
>+import org.eclipse.ui.forms.widgets.FormToolkit;
>+import org.eclipse.ui.forms.widgets.Section;
>+import org.eclipse.ui.internal.EditorAreaHelper;
>+import org.eclipse.ui.internal.WorkbenchPage;
>+import org.eclipse.ui.themes.IThemeManager;
>+
>+public class TaskEditorWikiTextPart extends AbstractTaskEditorPart {
>+
>+	private Browser browser;
>+
>+	private CTabFolder folder;
>+
>+	private int sectionStyle;
>+
>+	private Composite composite;
>+
>+	private StyledText text;
>+
>+	private TaskAttribute attribute;
>+
>+	/** The width of the vertical ruler. */
>+	protected static final int VERTICAL_RULER_WIDTH = 12;
>+
>+	private ISourceViewer viewer;
>+
>+	private boolean previewDirty;
>+
>+	private IDocument document;
>+
>+	public TaskEditorWikiTextPart() {
>+		setSectionStyle(ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
>+	}
>+
>+	public void appendText(String text) {
>+		//ignore for now
>+	}
>+
>+	public int getSectionStyle() {
>+		return sectionStyle;
>+	}
>+
>+	public void setSectionStyle(int sectionStyle) {
>+		this.sectionStyle = sectionStyle;
>+	}
>+
>+	@Override
>+	public void createControl(Composite parent, FormToolkit toolkit) {
>+
>+		if (attribute == null) {
>+			return;
>+		}
>+
>+		Section section = createSection(parent, toolkit, sectionStyle);
>+
>+		composite = toolkit.createComposite(section);
>+		GridLayout layout = new GridLayout();
>+		layout.numColumns = 1;
>+		composite.setLayout(layout);
>+
>+		folder = new CTabFolder(composite, SWT.BOTTOM | SWT.FLAT | SWT.BORDER);
>+
>+		{
>+			CTabItem viewerItem = new CTabItem(folder, SWT.NONE);
>+			viewerItem.setText("Source");
>+			viewerItem.setToolTipText("Edit Source");
>+
>+			viewer = new MarkupSourceViewer(folder, new VerticalRuler(VERTICAL_RULER_WIDTH), SWT.V_SCROLL
>+					| SWT.H_SCROLL | SWT.MULTI | SWT.FULL_SELECTION | SWT.WRAP);
>+			document = new Document(attribute.getValue());
>+			viewer.setEditable(true);
>+			viewer.setDocument(document);
>+			IThemeManager themeManager = PlatformUI.getWorkbench().getThemeManager();
>+			Font font = themeManager.getCurrentTheme().getFontRegistry().get(CommonThemes.FONT_EDITOR_COMMENT);
>+			viewer.getTextWidget().setFont(font);
>+
>+			viewerItem.setControl(viewer instanceof Viewer ? ((Viewer) viewer).getControl() : viewer.getTextWidget());
>+			folder.setSelection(viewerItem);
>+
>+		}
>+
>+		{
>+			CTabItem previewItem = new CTabItem(folder, SWT.NONE);
>+			previewItem.setText("Preview");
>+			previewItem.setToolTipText("Preview Source");
>+
>+			browser = new Browser(folder, SWT.NONE);
>+			previewItem.setControl(browser);
>+		}
>+
>+		folder.addSelectionListener(new SelectionListener() {
>+			public void widgetDefaultSelected(SelectionEvent selectionevent) {
>+				widgetSelected(selectionevent);
>+			}
>+
>+			public void widgetSelected(SelectionEvent selectionevent) {
>+				updatePreview();
>+			}
>+
>+		});
>+
>+		final GridData gd = new GridData();
>+		// wrap text at this margin, see comment below
>+		int width = getEditorWidth();
>+		// the goal is to make the text viewer as big as the text so it does not require scrolling when first drawn 
>+		// on screen
>+		Point size = folder.computeSize(width, SWT.DEFAULT, true);
>+		gd.widthHint = AbstractAttributeEditor.MAXIMUM_WIDTH;
>+		gd.horizontalAlignment = SWT.FILL;
>+		gd.grabExcessHorizontalSpace = true;
>+		// limit height to be avoid dynamic resizing of the text widget: 
>+		// MAXIMUM_HEIGHT < height < MAXIMUM_HEIGHT * 4  
>+		//gd.minimumHeight = AbstractAttributeEditor.MAXIMUM_HEIGHT;
>+		gd.heightHint = Math.min(Math.max(AbstractAttributeEditor.MAXIMUM_HEIGHT, size.y),
>+				AbstractAttributeEditor.MAXIMUM_HEIGHT * 4);
>+		if (getExpandVertically()) {
>+			gd.verticalAlignment = SWT.FILL;
>+			gd.grabExcessVerticalSpace = true;
>+		}
>+		folder.setLayoutData(gd);
>+		//folder.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER);
>+
>+		//toolkit.adapt(folder, true, true);
>+		toolkit.paintBordersFor(composite);
>+		section.setClient(composite);
>+		setSection(toolkit, section);
>+	}
>+
>+	private int getEditorWidth() {
>+		int widthHint = 0;
>+		if (getManagedForm() != null && getManagedForm().getForm() != null) {
>+			widthHint = getManagedForm().getForm().getClientArea().width - 90;
>+		}
>+		if (widthHint <= 0 && getTaskEditorPage().getEditor().getEditorSite() != null
>+				&& getTaskEditorPage().getEditor().getEditorSite().getPage() != null) {
>+			EditorAreaHelper editorManager = ((WorkbenchPage) getTaskEditorPage().getEditor().getEditorSite().getPage()).getEditorPresentation();
>+			if (editorManager != null && editorManager.getLayoutPart() != null) {
>+				widthHint = editorManager.getLayoutPart().getControl().getBounds().width - 90;
>+			}
>+		}
>+		if (widthHint <= 0) {
>+			widthHint = AbstractAttributeEditor.MAXIMUM_WIDTH;
>+		}
>+		return widthHint;
>+	}
>+
>+	protected Composite getComposite() {
>+		return composite;
>+	}
>+
>+	public TaskAttribute getAttribute() {
>+		return attribute;
>+	}
>+
>+	protected StyledText getText() {
>+		return text;
>+	}
>+
>+	public void setAttribute(TaskAttribute attribute) {
>+		this.attribute = attribute;
>+	}
>+
>+	@Override
>+	public void setFocus() {
>+		if (folder != null && folder.getSelection() != null) {
>+			folder.getSelection().getControl().setFocus();
>+		}
>+	}
>+
>+	private static class MarkupSourceViewer extends SourceViewer {
>+
>+		public MarkupSourceViewer(Composite parent, IVerticalRuler ruler, int styles) {
>+			super(parent, ruler, styles);
>+		}
>+
>+		public MarkupSourceViewer(Composite parent, IVerticalRuler verticalRuler, IOverviewRuler overviewRuler,
>+				boolean showAnnotationsOverview, int styles) {
>+			super(parent, verticalRuler, overviewRuler, showAnnotationsOverview, styles);
>+		}
>+
>+		public IReconciler getReconciler() {
>+			return fReconciler;
>+		}
>+	}
>+
>+	private void updatePreview() {
>+		if (/*previewDirty && */browser != null) {
>+			String xhtml = null;
>+			if (document == null) {
>+				xhtml = "<?xml version=\"1.0\" ?><html xmlns=\"http://www.w3.org/1999/xhtml\"><body></body></html>"; //$NON-NLS-1$
>+			} else {
>+				AbstractRenderingEngine2 engine = new JiraRenderingEngine();
>+				xhtml = engine.renderAsHtml(null, document.get());
>+			}
>+
>+			browser.setText(xhtml);
>+			//previewDirty = false;
>+		}
>+	}
>+}
>#P org.eclipse.mylyn.jira.ui
>Index: src/org/eclipse/mylyn/internal/jira/ui/editor/JiraTaskEditorPage.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.jira.ui/src/org/eclipse/mylyn/internal/jira/ui/editor/JiraTaskEditorPage.java,v
>retrieving revision 1.6
>diff -u -r1.6 JiraTaskEditorPage.java
>--- src/org/eclipse/mylyn/internal/jira/ui/editor/JiraTaskEditorPage.java	27 May 2008 00:36:13 -0000	1.6
>+++ src/org/eclipse/mylyn/internal/jira/ui/editor/JiraTaskEditorPage.java	3 Jun 2008 08:55:16 -0000
>@@ -8,12 +8,15 @@
> 
> package org.eclipse.mylyn.internal.jira.ui.editor;
> 
>+import java.util.Set;
>+
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.mylyn.internal.jira.core.JiraAttribute;
> import org.eclipse.mylyn.internal.jira.core.JiraClientFactory;
> import org.eclipse.mylyn.internal.jira.core.JiraCorePlugin;
> import org.eclipse.mylyn.internal.jira.core.JiraTaskDataHandler;
> import org.eclipse.mylyn.internal.jira.core.service.JiraClient;
>+import org.eclipse.mylyn.internal.tasks.ui.wiki.JiraTaskEditorWikiTextPart;
> import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
> import org.eclipse.mylyn.tasks.core.TaskRepository;
> import org.eclipse.mylyn.tasks.core.data.ITaskDataWorkingCopy;
>@@ -22,16 +25,41 @@
> import org.eclipse.mylyn.tasks.core.data.TaskDataModel;
> import org.eclipse.mylyn.tasks.ui.TasksUi;
> import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPage;
>+import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPart;
> import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
> import org.eclipse.mylyn.tasks.ui.editors.TaskEditorInput;
>+import org.eclipse.mylyn.tasks.ui.editors.TaskEditorPartDescriptor;
> 
> /**
>  * NOTE: This class is work in progress and currently not used.
>  * 
>  * @author Steffen Pingel
>+ * @author Owen
>  */
> public class JiraTaskEditorPage extends AbstractTaskEditorPage {
> 
>+	@Override
>+	protected Set<TaskEditorPartDescriptor> createPartDescriptors() {
>+		Set<TaskEditorPartDescriptor> descriptors = super.createPartDescriptors();
>+
>+		// remove unnecessary default editor parts
>+		for (TaskEditorPartDescriptor taskEditorPartDescriptor : descriptors) {
>+			if (taskEditorPartDescriptor.getId().equals(ID_PART_NEW_COMMENT)) {
>+				descriptors.remove(taskEditorPartDescriptor);
>+				break;
>+			}
>+		}
>+
>+		descriptors.add(new TaskEditorPartDescriptor(ID_PART_NEW_COMMENT) {
>+			@Override
>+			public AbstractTaskEditorPart createPart() {
>+				return new JiraTaskEditorWikiTextPart();
>+			}
>+		}.setPath(PATH_COMMENTS));
>+
>+		return descriptors;
>+	}
>+
> 	public JiraTaskEditorPage(TaskEditor editor) {
> 		super(editor, JiraCorePlugin.CONNECTOR_KIND);
> 	}
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.jira.ui/META-INF/MANIFEST.MF,v
>retrieving revision 1.298
>diff -u -r1.298 MANIFEST.MF
>--- META-INF/MANIFEST.MF	30 Apr 2008 15:34:18 -0000	1.298
>+++ META-INF/MANIFEST.MF	3 Jun 2008 08:55:16 -0000
>@@ -5,23 +5,32 @@
> Bundle-Version: 3.0.0.qualifier
> Bundle-Activator: org.eclipse.mylyn.internal.jira.ui.JiraUiPlugin
> Bundle-Vendor: Eclipse.org
>-Require-Bundle: org.eclipse.core.resources,
>- org.eclipse.core.runtime,
>+Require-Bundle: org.eclipse.core.runtime,
>  org.eclipse.jface.text,
>- org.eclipse.search,
>  org.eclipse.ui,
>- org.eclipse.ui.editors,
>  org.eclipse.ui.forms,
>- org.eclipse.ui.views,
>- org.eclipse.mylyn.context.core;bundle-version="[3.0.0,4.0.0)",
>  org.eclipse.mylyn.jira.core;bundle-version="[3.0.0,4.0.0)",
>  org.eclipse.mylyn.commons.core;bundle-version="[3.0.0,4.0.0)",
>  org.eclipse.mylyn.tasks.core;bundle-version="[3.0.0,4.0.0)",
>- org.eclipse.mylyn.tasks.ui;bundle-version="[3.0.0,4.0.0)",
>  org.eclipse.mylyn.commons.net;bundle-version="[3.0.0,4.0.0)",
>- org.eclipse.mylyn.commons.ui;bundle-version="[3.0.0,4.0.0)"
>+ org.eclipse.mylyn.commons.ui;bundle-version="[3.0.0,4.0.0)",
>+ org.eclipse.mylyn.tasks.ui;bundle-version="3.0.0"
> Bundle-ActivationPolicy: lazy
> Bundle-RequiredExecutionEnvironment: J2SE-1.5
>-Export-Package: org.eclipse.mylyn.internal.jira.ui;x-internal:=true,
>+Export-Package: org.eclipse.mylyn.internal.jira.ui;
>+  uses:="org.eclipse.mylyn.internal.tasks.core.deprecated,
>+   org.eclipse.jface.wizard,
>+   org.eclipse.mylyn.tasks.core,
>+   org.eclipse.jface.resource,
>+   org.eclipse.mylyn.tasks.ui,
>+   org.eclipse.mylyn.tasks.core.data,
>+   org.eclipse.ui.plugin,
>+   org.w3c.dom,
>+   org.eclipse.mylyn.internal.tasks.core,
>+   org.eclipse.swt.graphics,
>+   org.eclipse.jface.viewers,
>+   org.osgi.framework,
>+   org.eclipse.mylyn.tasks.ui.wizards",
>  org.eclipse.mylyn.internal.jira.ui.editor;x-internal:=true,
>  org.eclipse.mylyn.internal.jira.ui.wizards;x-internal:=true
>+Import-Package: org.eclipse.mylyn.wikitext.parser.markup

Actions: View | Diff

Attachments on bug 235222: 103264 | 103615 | 104084 | 104233 | 104234 | 104240 | 104576 | 104592 | 104650 | 104651 | 104678 | 104721