Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.mylyn-feature/feature.xml18
-rw-r--r--org.eclipse.mylyn.bugzilla-feature/feature.xml6
-rw-r--r--org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java6
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java10
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java1
-rw-r--r--org.eclipse.mylyn.trac-feature/feature.xml6
-rw-r--r--org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF2
13 files changed, 31 insertions, 30 deletions
diff --git a/org.eclipse.mylyn-feature/feature.xml b/org.eclipse.mylyn-feature/feature.xml
index 6b2a8f016..125d476f3 100644
--- a/org.eclipse.mylyn-feature/feature.xml
+++ b/org.eclipse.mylyn-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.mylar_feature"
label="Mylar Task List (Required)"
- version="2.0.0.v20070330-2030"
+ version="2.0.0.v20070403-1300"
provider-name="Eclipse.org"
plugin="org.eclipse.mylar">
@@ -239,56 +239,56 @@ litigation.
id="org.eclipse.mylar.doc"
download-size="0"
install-size="0"
- version="2.0.0.v20070330-2030"
+ version="2.0.0.v20070403-1300"
unpack="false"/>
<plugin
id="org.eclipse.mylar"
download-size="0"
install-size="0"
- version="2.0.0.v20070330-2030"
+ version="2.0.0.v20070403-1300"
unpack="false"/>
<plugin
id="org.eclipse.mylar.context.core"
download-size="0"
install-size="0"
- version="2.0.0.v20070330-2030"
+ version="2.0.0.v20070403-1300"
unpack="false"/>
<plugin
id="org.eclipse.mylar.tasks.ui"
download-size="0"
install-size="0"
- version="2.0.0.v20070330-2030"
+ version="2.0.0.v20070403-1300"
unpack="false"/>
<plugin
id="org.eclipse.mylar.tasks.core"
download-size="0"
install-size="0"
- version="2.0.0.v20070330-2030"
+ version="2.0.0.v20070403-1300"
unpack="false"/>
<plugin
id="org.eclipse.mylar.tasks.web"
download-size="0"
install-size="0"
- version="2.0.0.v20070330-2030"
+ version="2.0.0.v20070403-1300"
unpack="false"/>
<plugin
id="org.eclipse.mylar.monitor.core"
download-size="0"
install-size="0"
- version="2.0.0.v20070330-2030"
+ version="2.0.0.v20070403-1300"
unpack="false"/>
<plugin
id="org.eclipse.mylar.monitor.ui"
download-size="0"
install-size="0"
- version="2.0.0.v20070330-2030"
+ version="2.0.0.v20070403-1300"
unpack="false"/>
</feature>
diff --git a/org.eclipse.mylyn.bugzilla-feature/feature.xml b/org.eclipse.mylyn.bugzilla-feature/feature.xml
index 06c04b16f..146fb589e 100644
--- a/org.eclipse.mylyn.bugzilla-feature/feature.xml
+++ b/org.eclipse.mylyn.bugzilla-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.mylar.bugzilla_feature"
label="Mylar Connector: Bugzilla"
- version="2.0.0.v20070330-2030"
+ version="2.0.0.v20070403-1300"
provider-name="Eclipse.org"
plugin="org.eclipse.mylar">
@@ -243,14 +243,14 @@ litigation.
id="org.eclipse.mylar.bugzilla.core"
download-size="0"
install-size="0"
- version="2.0.0.v20070330-2030"
+ version="2.0.0.v20070403-1300"
unpack="false"/>
<plugin
id="org.eclipse.mylar.bugzilla.ui"
download-size="0"
install-size="0"
- version="2.0.0.v20070330-2030"
+ version="2.0.0.v20070403-1300"
unpack="false"/>
</feature>
diff --git a/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF
index 82fa6329f..9882763d7 100644
--- a/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Mylar Bugzilla Connector Core Plug-in
Bundle-SymbolicName: org.eclipse.mylar.bugzilla.core; singleton:=true
-Bundle-Version: 2.0.0.v20070330-2030
+Bundle-Version: 2.0.0.v20070403-1300
Bundle-Activator: org.eclipse.mylar.internal.bugzilla.core.BugzillaCorePlugin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.mylar.tasks.core,
diff --git a/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF
index cfd3d5e0d..845e06aff 100644
--- a/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.bugzilla.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Mylar Bugzilla Client Ui Plug-in
Bundle-SymbolicName: org.eclipse.mylar.bugzilla.ui; singleton:=true
-Bundle-Version: 2.0.0.v20070330-2030
+Bundle-Version: 2.0.0.v20070403-1300
Bundle-Activator: org.eclipse.mylar.internal.bugzilla.ui.BugzillaUiPlugin
Bundle-Vendor: Eclipse.org
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF
index f9b51d1da..b310dafb4 100644
--- a/org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Mylar Documentation Plug-in
Bundle-SymbolicName: org.eclipse.mylar.doc; singleton:=true
-Bundle-Version: 2.0.0.v20070330-2030
+Bundle-Version: 2.0.0.v20070403-1300
Eclipse-AutoStart: true
Bundle-Vendor: Eclipse.org
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF
index ef39ddffa..7341a7078 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 Tasks Core Plug-in
Bundle-SymbolicName: org.eclipse.mylar.tasks.core;singleton:=true
-Bundle-Version: 2.0.0.v20070330-2030
+Bundle-Version: 2.0.0.v20070403-1300
Eclipse-AutoStart: true
Bundle-Vendor: Eclipse.org
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF
index 5cd9ba70f..e4e517599 100644
--- a/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Mylar Tasks UI Plug-in
Bundle-SymbolicName: org.eclipse.mylar.tasks.ui;singleton:=true
-Bundle-Version: 2.0.0.v20070330-2030
+Bundle-Version: 2.0.0.v20070403-1300
Bundle-Activator: org.eclipse.mylar.tasks.ui.TasksUiPlugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java
index d25a5a5d8..4b5b740a9 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java
@@ -206,11 +206,9 @@ public class TaskPlanningEditor extends TaskFormPage {
summary.setText(updateTask.getSummary());
TaskPlanningEditor.this.markDirty(wasDirty);
}
- if (parentEditor != null) {
+ if (parentEditor != null && updateTask != null) {
parentEditor.changeTitle();
- }
- if (form != null && updateTask != null) {
- form.setText(updateTask.getSummary());
+ parentEditor.updateTitle(updateTask.getSummary());
}
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java
index baaf4ec3a..a85044ff1 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java
@@ -271,7 +271,11 @@ public class TaskListManager implements IPropertyChangeListener {
List<InteractionEvent> events = ContextCorePlugin.getContextManager().getActivityHistoryMetaContext()
.getInteractionHistory();
for (InteractionEvent event : events) {
- parseInteractionEvent(event);
+ try {
+ parseInteractionEvent(event);
+ } catch (Exception e) {
+ MylarStatusHandler.fail(e, "Error parsing interaction event", false);
+ }
}
taskActivityHistoryInitialized = true;
parseFutureReminders();
@@ -387,7 +391,7 @@ public class TaskListManager implements IPropertyChangeListener {
currentHandle = event.getStructureHandle();
}
} else if (event.getStructureHandle().equals(MylarContextManager.ACTIVITY_HANDLE_ATTENTION)) {
- if (!currentHandle.equals("")) {
+ if (currentTask != null && !currentHandle.equals("")) {
long active = event.getEndDate().getTime() - event.getDate().getTime();
// add to running total
@@ -405,9 +409,7 @@ public class TaskListManager implements IPropertyChangeListener {
} else {
taskElapsedTimeMap.put(currentTask, active);
}
-
}
-
}
} else if (event.getDelta().equals(MylarContextManager.ACTIVITY_DELTA_DEACTIVATED)) {
if (!event.getStructureHandle().equals(MylarContextManager.ACTIVITY_HANDLE_ATTENTION)
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java
index f6ce4a7e6..711aee75b 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java
@@ -493,6 +493,7 @@ public class TaskEditor extends FormEditor {
// setContentDescription(name);
setPartName(name);
setTitleToolTip(name);
+// updateFormTitle();
}
public void showBusy(boolean busy) {
diff --git a/org.eclipse.mylyn.trac-feature/feature.xml b/org.eclipse.mylyn.trac-feature/feature.xml
index b8f8809e1..9c42292b4 100644
--- a/org.eclipse.mylyn.trac-feature/feature.xml
+++ b/org.eclipse.mylyn.trac-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.mylar.trac_feature"
label="Mylar Connector: Trac"
- version="2.0.0.v20070330-2030"
+ version="2.0.0.v20070403-1300"
provider-name="Eclipse.org"
plugin="org.eclipse.mylar">
@@ -238,14 +238,14 @@ litigation.
id="org.eclipse.mylar.trac.ui"
download-size="0"
install-size="0"
- version="2.0.0.v20070330-2030"
+ version="2.0.0.v20070403-1300"
unpack="false"/>
<plugin
id="org.eclipse.mylar.trac.core"
download-size="0"
install-size="0"
- version="2.0.0.v20070330-2030"
+ version="2.0.0.v20070403-1300"
unpack="false"/>
</feature>
diff --git a/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF
index 1d3200859..36674b7ee 100644
--- a/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Mylar Trac Core Plug-in
Bundle-SymbolicName: org.eclipse.mylar.trac.core;singleton:=true
-Bundle-Version: 2.0.0.v20070330-2030
+Bundle-Version: 2.0.0.v20070403-1300
Bundle-Vendor: Eclipse.org
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.mylar.context.core,
diff --git a/org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF
index 2f6555721..0df00e1e1 100644
--- a/org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.trac.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Mylar Trac UI Plug-in
Bundle-SymbolicName: org.eclipse.mylar.trac.ui;singleton:=true
-Bundle-Version: 2.0.0.v20070330-2030
+Bundle-Version: 2.0.0.v20070403-1300
Bundle-Activator: org.eclipse.mylar.internal.trac.ui.TracUiPlugin
Bundle-Vendor: Eclipse.org
Require-Bundle: org.eclipse.ui,

Back to the top