0.3.3 build prep

4 files changed, 18 insertions, 14 deletions

diff --git a/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF
index 09f208b0d..dc2494fd5 100644
--- a/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mylar Bugs Plug-in
 Bundle-SymbolicName: org.eclipse.mylar.bugs; singleton:=true
-Bundle-Version: 0.3.2.2
+Bundle-Version: 0.3.3
 Bundle-Activator: org.eclipse.mylar.bugs.MylarBugzillaPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
@@ -23,4 +23,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jdt.ui
 Eclipse-AutoStart: true
 Export-Package: org.eclipse.mylar.bugs,
+ org.eclipse.mylar.bugs.java,
  org.eclipse.mylar.bugs.search
+Bundle-ClassPath: mylar-bugs.jar
diff --git a/org.eclipse.mylyn.tasks.core/build.properties b/org.eclipse.mylyn.tasks.core/build.properties
index 34d2e4d2d..13cddd21a 100644
--- a/org.eclipse.mylyn.tasks.core/build.properties
+++ b/org.eclipse.mylyn.tasks.core/build.properties
@@ -1,4 +1,9 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
-               .
+               mylar-bugs.jar,\
+               plugin.xml
+jars.compile.order = mylar-bugs.jar
+source.mylar-bugs.jar = src/
+output.mylar-bugs.jar = bin/
+src.includes = plugin.xml,\
+               src/,\
+               META-INF/
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaUiBridge.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaUiBridge.java
index ee76ab477..f558a686e 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaUiBridge.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/BugzillaUiBridge.java
@@ -25,11 +25,8 @@ import org.eclipse.mylar.bugzilla.ui.BugzillaOpenStructure;
 import org.eclipse.mylar.bugzilla.ui.ViewBugzillaAction;
 import org.eclipse.mylar.bugzilla.ui.editor.AbstractBugEditor;
 import org.eclipse.mylar.bugzilla.ui.outline.BugzillaOutlinePage;
-import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaTask;
 import org.eclipse.mylar.bugzilla.ui.tasklist.BugzillaTaskEditor;
 import org.eclipse.mylar.core.IMylarContextNode;
-import org.eclipse.mylar.tasklist.ITask;
-import org.eclipse.mylar.tasklist.MylarTasklistPlugin;
 import org.eclipse.mylar.ui.IMylarUiBridge;
 import org.eclipse.mylar.ui.MylarImages;
 import org.eclipse.ui.IEditorPart;
@@ -64,15 +61,15 @@ public class BugzillaUiBridge implements IMylarUiBridge {
         List<BugzillaOpenStructure> l = new ArrayList<BugzillaOpenStructure>(1);
         l.add(new BugzillaOpenStructure(server, bugId, commentNumer));
         
-        ITask task= MylarTasklistPlugin.getTaskListManager().getTaskForHandle(bugHandle);
-        if (task != null && task instanceof BugzillaTask) {
-            BugzillaTask bugzillaTask = (BugzillaTask)task;
-            bugzillaTask.openTask(commentNumer);
-        } else {
+//        ITask task= MylarTasklistPlugin.getTaskListManager().getTaskForHandle(bugHandle);
+//        if (task != null && task instanceof BugzillaTask) {
+//            BugzillaTask bugzillaTask = (BugzillaTask)task;
+//            bugzillaTask.openTask(commentNumer);
+//        } else {
             // open the bug in the editor
             ViewBugzillaAction viewBugs = new ViewBugzillaAction("Display bugs in editor", l);
             viewBugs.schedule();
-        }
+//        }
     }
     
     public ILabelProvider getLabelProvider() {
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/java/BugzillaHyperLinkDetector.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/java/BugzillaHyperLinkDetector.java
index 89aa70e87..96891f8f6 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/java/BugzillaHyperLinkDetector.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/bugs/java/BugzillaHyperLinkDetector.java
@@ -116,7 +116,7 @@ public class BugzillaHyperLinkDetector extends AbstractMylarHyperlinkDetector {
 			end += commentStart;
 		
 			if(startOffset >= start && endOffset <= end){
-				IRegion sregion= new Region(start, end);
+				IRegion sregion= new Region(start, end-start);
 				return new IHyperlink[] {new BugzillaHyperLink(sregion, bugId)};
 			}
 		}