Merge "389468: Fixes for Add Due Date to EMF R4EReview EClass"
diff --git a/org.eclipse.mylyn.reviews.VCalendar/META-INF/MANIFEST.MF b/org.eclipse.mylyn.reviews.VCalendar/META-INF/MANIFEST.MF
index 82d0b88..0614412 100644
--- a/org.eclipse.mylyn.reviews.VCalendar/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.reviews.VCalendar/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.mylyn.reviews.VCalendar
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 0.13.0.qualifier
Require-Bundle: org.eclipse.mylyn.reviews.notifications;bundle-version="0.10.0"
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
diff --git a/org.eclipse.mylyn.reviews.VCalendar/pom.xml b/org.eclipse.mylyn.reviews.VCalendar/pom.xml
index 5b25e37..8c56399 100644
--- a/org.eclipse.mylyn.reviews.VCalendar/pom.xml
+++ b/org.eclipse.mylyn.reviews.VCalendar/pom.xml
@@ -5,10 +5,10 @@
<parent>
<artifactId>org.eclipse.mylyn.reviews.r4e-parent</artifactId>
<groupId>org.eclipse.mylyn.reviews.r4e</groupId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.mylyn.reviews.VCalendar</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
diff --git a/org.eclipse.mylyn.reviews.frame.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.reviews.frame.core/META-INF/MANIFEST.MF
index b2d45a4..f90680c 100644
--- a/org.eclipse.mylyn.reviews.frame.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.reviews.frame.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.mylyn.reviews.frame.core;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 0.13.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.mylyn.reviews.frame.core/pom.xml b/org.eclipse.mylyn.reviews.frame.core/pom.xml
index 1e22467..ff19dc0 100644
--- a/org.eclipse.mylyn.reviews.frame.core/pom.xml
+++ b/org.eclipse.mylyn.reviews.frame.core/pom.xml
@@ -5,10 +5,10 @@
<parent>
<artifactId>org.eclipse.mylyn.reviews.r4e-parent</artifactId>
<groupId>org.eclipse.mylyn.reviews.r4e</groupId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.mylyn.reviews.frame.core</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
diff --git a/org.eclipse.mylyn.reviews.frame.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.reviews.frame.ui/META-INF/MANIFEST.MF
index 3723ba3..1aed77e 100644
--- a/org.eclipse.mylyn.reviews.frame.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.reviews.frame.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.mylyn.reviews.frame.ui;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 0.13.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.mylyn.reviews.frame.ui/pom.xml b/org.eclipse.mylyn.reviews.frame.ui/pom.xml
index 653a288..2218964 100644
--- a/org.eclipse.mylyn.reviews.frame.ui/pom.xml
+++ b/org.eclipse.mylyn.reviews.frame.ui/pom.xml
@@ -5,10 +5,10 @@
<parent>
<artifactId>org.eclipse.mylyn.reviews.r4e-parent</artifactId>
<groupId>org.eclipse.mylyn.reviews.r4e</groupId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.mylyn.reviews.frame.ui</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
diff --git a/org.eclipse.mylyn.reviews.notifications/META-INF/MANIFEST.MF b/org.eclipse.mylyn.reviews.notifications/META-INF/MANIFEST.MF
index d800cb0..5ccf39f 100644
--- a/org.eclipse.mylyn.reviews.notifications/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.reviews.notifications/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.mylyn.reviews.notifications;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 0.13.0.qualifier
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.mylyn.commons.core;bundle-version="3.3.0"
diff --git a/org.eclipse.mylyn.reviews.notifications/pom.xml b/org.eclipse.mylyn.reviews.notifications/pom.xml
index fb1fea2..15c0484 100644
--- a/org.eclipse.mylyn.reviews.notifications/pom.xml
+++ b/org.eclipse.mylyn.reviews.notifications/pom.xml
@@ -5,10 +5,10 @@
<parent>
<artifactId>org.eclipse.mylyn.reviews.r4e-parent</artifactId>
<groupId>org.eclipse.mylyn.reviews.r4e</groupId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.mylyn.reviews.notifications</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
diff --git a/org.eclipse.mylyn.reviews.notifications/src/org/eclipse/mylyn/reviews/notifications/spi/NotificationsConnector.java b/org.eclipse.mylyn.reviews.notifications/src/org/eclipse/mylyn/reviews/notifications/spi/NotificationsConnector.java
index 6c628ad..2e6d9b4 100644
--- a/org.eclipse.mylyn.reviews.notifications/src/org/eclipse/mylyn/reviews/notifications/spi/NotificationsConnector.java
+++ b/org.eclipse.mylyn.reviews.notifications/src/org/eclipse/mylyn/reviews/notifications/spi/NotificationsConnector.java
@@ -38,9 +38,10 @@
* @param aBody
* @param aAttachment
* @param aFilter
+ * @return Boolean OK
* @throws CoreException
*/
- public abstract void sendEmail(String aEmailFrom, String[] aEmailsTo, String aSubject, String aBody,
+ public abstract Boolean sendEmail(String aEmailFrom, String[] aEmailsTo, String aSubject, String aBody,
String aAttachment, NotificationFilter aFilter) throws CoreException;
/**
diff --git a/org.eclipse.mylyn.reviews.r4e-site/pom.xml b/org.eclipse.mylyn.reviews.r4e-site/pom.xml
index ec5acb6..153ead1 100644
--- a/org.eclipse.mylyn.reviews.r4e-site/pom.xml
+++ b/org.eclipse.mylyn.reviews.r4e-site/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>org.eclipse.mylyn.reviews.r4e-parent</artifactId>
<groupId>org.eclipse.mylyn.reviews.r4e</groupId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.mylyn.reviews.r4e-site</artifactId>
<packaging>eclipse-update-site</packaging>
diff --git a/org.eclipse.mylyn.reviews.r4e-target/pom.xml b/org.eclipse.mylyn.reviews.r4e-target/pom.xml
index 1e7e0e4..0563a21 100644
--- a/org.eclipse.mylyn.reviews.r4e-target/pom.xml
+++ b/org.eclipse.mylyn.reviews.r4e-target/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>org.eclipse.mylyn.reviews.r4e-parent</artifactId>
<groupId>org.eclipse.mylyn.reviews.r4e</groupId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.mylyn.reviews.r4e-target</artifactId>
<packaging>pom</packaging>
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.reviews.r4e.core.tests/META-INF/MANIFEST.MF
index c6928d4..00eef5a 100644
--- a/org.eclipse.mylyn.reviews.r4e.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.mylyn.reviews.r4e.core.tests;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 0.13.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.mylyn.reviews.r4e.core.tests/pom.xml b/org.eclipse.mylyn.reviews.r4e.core.tests/pom.xml
index 164406e..a72fb85 100644
--- a/org.eclipse.mylyn.reviews.r4e.core.tests/pom.xml
+++ b/org.eclipse.mylyn.reviews.r4e.core.tests/pom.xml
@@ -5,10 +5,10 @@
<parent>
<artifactId>org.eclipse.mylyn.reviews.r4e-parent</artifactId>
<groupId>org.eclipse.mylyn.reviews.r4e</groupId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.mylyn.reviews.r4e.core.tests</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
<plugins>
diff --git a/org.eclipse.mylyn.reviews.r4e.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.reviews.r4e.core/META-INF/MANIFEST.MF
index 3353be3..acacd37 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.reviews.r4e.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.mylyn.reviews.r4e.core;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 0.13.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.mylyn.reviews.r4e.core/pom.xml b/org.eclipse.mylyn.reviews.r4e.core/pom.xml
index 122f472..5aae8ad 100644
--- a/org.eclipse.mylyn.reviews.r4e.core/pom.xml
+++ b/org.eclipse.mylyn.reviews.r4e.core/pom.xml
@@ -5,10 +5,10 @@
<parent>
<artifactId>org.eclipse.mylyn.reviews.r4e-parent</artifactId>
<groupId>org.eclipse.mylyn.reviews.r4e</groupId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.mylyn.reviews.r4e.core</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
diff --git a/org.eclipse.mylyn.reviews.r4e.feature/feature.xml b/org.eclipse.mylyn.reviews.r4e.feature/feature.xml
index db0d5e5..e8a12c5 100644
--- a/org.eclipse.mylyn.reviews.r4e.feature/feature.xml
+++ b/org.eclipse.mylyn.reviews.r4e.feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.mylyn.reviews.r4e.feature"
label="%featureName"
- version="0.12.0.qualifier"
+ version="0.13.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.mylyn.reviews.r4e.core">
diff --git a/org.eclipse.mylyn.reviews.r4e.feature/pom.xml b/org.eclipse.mylyn.reviews.r4e.feature/pom.xml
index 05d868f..68efdca 100644
--- a/org.eclipse.mylyn.reviews.r4e.feature/pom.xml
+++ b/org.eclipse.mylyn.reviews.r4e.feature/pom.xml
@@ -6,9 +6,9 @@
<parent>
<artifactId>org.eclipse.mylyn.reviews.r4e-parent</artifactId>
<groupId>org.eclipse.mylyn.reviews.r4e</groupId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.mylyn.reviews.r4e.feature</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/org.eclipse.mylyn.reviews.r4e.help.install-feature/feature.xml b/org.eclipse.mylyn.reviews.r4e.help.install-feature/feature.xml
index 069d5f6..172c551 100644
--- a/org.eclipse.mylyn.reviews.r4e.help.install-feature/feature.xml
+++ b/org.eclipse.mylyn.reviews.r4e.help.install-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.mylyn.reviews.r4e.help.install.feature"
label="%featureName"
- version="0.12.0.qualifier"
+ version="0.13.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.mylyn.reviews.r4e.help.install">
diff --git a/org.eclipse.mylyn.reviews.r4e.help.install-feature/pom.xml b/org.eclipse.mylyn.reviews.r4e.help.install-feature/pom.xml
index 7dbfe48..10b33df 100644
--- a/org.eclipse.mylyn.reviews.r4e.help.install-feature/pom.xml
+++ b/org.eclipse.mylyn.reviews.r4e.help.install-feature/pom.xml
@@ -6,9 +6,9 @@
<parent>
<artifactId>org.eclipse.mylyn.reviews.r4e-parent</artifactId>
<groupId>org.eclipse.mylyn.reviews.r4e</groupId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.mylyn.reviews.r4e.help.install.feature</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/org.eclipse.mylyn.reviews.r4e.help.install/META-INF/MANIFEST.MF b/org.eclipse.mylyn.reviews.r4e.help.install/META-INF/MANIFEST.MF
index a6d5ed1..4828519 100644
--- a/org.eclipse.mylyn.reviews.r4e.help.install/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.reviews.r4e.help.install/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.mylyn.reviews.r4e.help.install;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 0.13.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.mylyn.reviews.r4e.help.install/doc/InstallR4E.png b/org.eclipse.mylyn.reviews.r4e.help.install/doc/InstallR4E.png
index 1bb8680..c85e14a 100644
--- a/org.eclipse.mylyn.reviews.r4e.help.install/doc/InstallR4E.png
+++ b/org.eclipse.mylyn.reviews.r4e.help.install/doc/InstallR4E.png
Binary files differ
diff --git a/org.eclipse.mylyn.reviews.r4e.help.install/pom.xml b/org.eclipse.mylyn.reviews.r4e.help.install/pom.xml
index 86bd9eb..6df81d8 100644
--- a/org.eclipse.mylyn.reviews.r4e.help.install/pom.xml
+++ b/org.eclipse.mylyn.reviews.r4e.help.install/pom.xml
@@ -5,10 +5,10 @@
<parent>
<artifactId>org.eclipse.mylyn.reviews.r4e-parent</artifactId>
<groupId>org.eclipse.mylyn.reviews.r4e</groupId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.mylyn.reviews.r4e.help.install</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
diff --git a/org.eclipse.mylyn.reviews.r4e.help/META-INF/MANIFEST.MF b/org.eclipse.mylyn.reviews.r4e.help/META-INF/MANIFEST.MF
index 09fc11e..3637cce 100644
--- a/org.eclipse.mylyn.reviews.r4e.help/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.reviews.r4e.help/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.mylyn.reviews.r4e.help; singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 0.13.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.mylyn.reviews.r4e.help/doc/FindReviewItems.png b/org.eclipse.mylyn.reviews.r4e.help/doc/FindReviewItems.png
index 4272558..2880ed6 100644
--- a/org.eclipse.mylyn.reviews.r4e.help/doc/FindReviewItems.png
+++ b/org.eclipse.mylyn.reviews.r4e.help/doc/FindReviewItems.png
Binary files differ
diff --git a/org.eclipse.mylyn.reviews.r4e.help/doc/Tasks.html b/org.eclipse.mylyn.reviews.r4e.help/doc/Tasks.html
index f8e3036..aaaec22 100644
--- a/org.eclipse.mylyn.reviews.r4e.help/doc/Tasks.html
+++ b/org.eclipse.mylyn.reviews.r4e.help/doc/Tasks.html
@@ -341,9 +341,8 @@
<i>Add</i> button to add them to the list of participants. The participants will now appear in the participants list just below. If present, participants lists from Preferences are resolved and their contents is added to the list as well. If an LDAP database is setup up and configured in the preferences, R4E will also try to resolve the added users and automatically fetch the information from the database. Participants can be removed from the list by using the
<i>Erase</i> button, and the list can be reset by using the
<i>Clear</i> button. If an LDAP database is set up, it can also be accessed using the
- <i>Find</i> button (see below).
+ <i>Find</i> button (see below). The participant id entered within the R4E review data will be in lower case and R4E will enforce that (this to prevent duplicated users Ids for the same user).
</li>
- <li>The participant id entered within the R4E review data will be in lower case and R4E will enforce that (this to prevent duplicated users Ids for the same user).</li>
<li>Basic Parameters: Once participants are added to the participants list. This section displays the basic information for the currently selected entry in the list. The email address can be edited, but not the Id or the participant details field (which in only filled if an LDAP database is set up and there is information about the user in it).</li>
</ul>
<p>
diff --git a/org.eclipse.mylyn.reviews.r4e.help/pom.xml b/org.eclipse.mylyn.reviews.r4e.help/pom.xml
index 731e1f2..311953b 100644
--- a/org.eclipse.mylyn.reviews.r4e.help/pom.xml
+++ b/org.eclipse.mylyn.reviews.r4e.help/pom.xml
@@ -5,10 +5,10 @@
<parent>
<artifactId>org.eclipse.mylyn.reviews.r4e-parent</artifactId>
<groupId>org.eclipse.mylyn.reviews.r4e</groupId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.mylyn.reviews.r4e.help</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
diff --git a/org.eclipse.mylyn.reviews.r4e.ldap/META-INF/MANIFEST.MF b/org.eclipse.mylyn.reviews.r4e.ldap/META-INF/MANIFEST.MF
index a3b672c..354bcc1 100644
--- a/org.eclipse.mylyn.reviews.r4e.ldap/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.reviews.r4e.ldap/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.mylyn.reviews.ldap;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 0.13.0.qualifier
Bundle-Activator: org.eclipse.mylyn.reviews.ldap.LdapPlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.mylyn.reviews.r4e.ldap/pom.xml b/org.eclipse.mylyn.reviews.r4e.ldap/pom.xml
index 1d77672..e6eba3e 100644
--- a/org.eclipse.mylyn.reviews.r4e.ldap/pom.xml
+++ b/org.eclipse.mylyn.reviews.r4e.ldap/pom.xml
@@ -5,10 +5,10 @@
<parent>
<artifactId>org.eclipse.mylyn.reviews.r4e-parent</artifactId>
<groupId>org.eclipse.mylyn.reviews.r4e</groupId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.mylyn.reviews.ldap</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
diff --git a/org.eclipse.mylyn.reviews.r4e.mail.smtp/META-INF/MANIFEST.MF b/org.eclipse.mylyn.reviews.r4e.mail.smtp/META-INF/MANIFEST.MF
index 93607d2..9e00ba7 100644
--- a/org.eclipse.mylyn.reviews.r4e.mail.smtp/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.reviews.r4e.mail.smtp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.mylyn.reviews.r4e.mail.smtp;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 0.13.0.qualifier
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/org.eclipse.mylyn.reviews.r4e.mail.smtp/pom.xml b/org.eclipse.mylyn.reviews.r4e.mail.smtp/pom.xml
index ed6f559..babbe4d 100644
--- a/org.eclipse.mylyn.reviews.r4e.mail.smtp/pom.xml
+++ b/org.eclipse.mylyn.reviews.r4e.mail.smtp/pom.xml
@@ -5,10 +5,10 @@
<parent>
<artifactId>org.eclipse.mylyn.reviews.r4e-parent</artifactId>
<groupId>org.eclipse.mylyn.reviews.r4e</groupId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.mylyn.reviews.r4e.mail.smtp</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
diff --git a/org.eclipse.mylyn.reviews.r4e.mail.smtp/src/org/eclipse/mylyn/reviews/r4e/mail/smtp/SMTPHostString.properties b/org.eclipse.mylyn.reviews.r4e.mail.smtp/src/org/eclipse/mylyn/reviews/r4e/mail/smtp/SMTPHostString.properties
index 5d4d115..82184ce 100644
--- a/org.eclipse.mylyn.reviews.r4e.mail.smtp/src/org/eclipse/mylyn/reviews/r4e/mail/smtp/SMTPHostString.properties
+++ b/org.eclipse.mylyn.reviews.r4e.mail.smtp/src/org/eclipse/mylyn/reviews/r4e/mail/smtp/SMTPHostString.properties
@@ -29,9 +29,10 @@
start_time_label=Starts:
duration_label=Duration (minutes):
location_label=Location:
-dialog_title_error= "R4E Error"
+dialog_title_error= R4E Error
no_input_given=No Input given
start_time_Error=No input given for start time field
+smtp_emtpy_server=No input given for the SMTP server
duration_Error=No input given for duration field
location_Error=No input given for location field
to_Error=No destination input given for To: field
diff --git a/org.eclipse.mylyn.reviews.r4e.mail.smtp/src/org/eclipse/mylyn/reviews/r4e/mail/smtp/mailVersion/Smtp.java b/org.eclipse.mylyn.reviews.r4e.mail.smtp/src/org/eclipse/mylyn/reviews/r4e/mail/smtp/mailVersion/Smtp.java
index 303e6ea..72e37ba 100644
--- a/org.eclipse.mylyn.reviews.r4e.mail.smtp/src/org/eclipse/mylyn/reviews/r4e/mail/smtp/mailVersion/Smtp.java
+++ b/org.eclipse.mylyn.reviews.r4e.mail.smtp/src/org/eclipse/mylyn/reviews/r4e/mail/smtp/mailVersion/Smtp.java
@@ -29,6 +29,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.window.Window;
import org.eclipse.mylyn.commons.core.StatusHandler;
@@ -38,6 +39,7 @@
import org.eclipse.mylyn.reviews.notifications.spi.NotificationsConnector;
import org.eclipse.mylyn.reviews.r4e.mail.smtp.SmtpPlugin;
import org.eclipse.mylyn.reviews.r4e.mail.smtp.mailVersion.internal.MailData;
+import org.eclipse.mylyn.reviews.r4e.mail.smtp.mailVersion.internal.SMTPHostString;
import org.eclipse.mylyn.reviews.r4e.mail.smtp.mailVersion.internal.dialogs.ScheduleMeetingInputDialog;
import org.eclipse.mylyn.reviews.r4e.mail.smtp.mailVersion.internal.preferences.SmtpHostPreferencePage;
import org.eclipse.mylyn.reviews.vcalendar.core.VCalendar;
@@ -94,9 +96,10 @@
* @param aFilter
* NotificationFilter
* @throws CoreException
+ * @return Boolean OK
*/
@Override
- public void sendEmail(String aEmailFrom, String[] aEmailsTo, String aSubject, String aBody, String aAttachment,
+ public Boolean sendEmail(String aEmailFrom, String[] aEmailsTo, String aSubject, String aBody, String aAttachment,
NotificationFilter aFilter) throws CoreException {
// The SMTP connection will be tried in this order stored in the preference page.
// After all try the exception is thrown to the caller.
@@ -104,6 +107,21 @@
String[] smtpHost = getSMTPHost();
int numHost = smtpHost.length;
for (int i = 0; i < numHost; i++) {
+ if (smtpHost[i].trim().length() == 0) {
+ //There is no SMTP server defined
+ final ErrorDialog dialog = new ErrorDialog(
+ null,
+ SMTPHostString.getString("dialog_title_error"),
+ SMTPHostString.getString("smtp_emtpy_server"),
+ new Status(
+ IStatus.ERROR,
+ SmtpPlugin.FPLUGIN_ID,
+ 0,
+ "You should define the SMTP server under \n Window -> Preferences-> R4E-> SMTP Host, \n No E-mail sent",
+ null), IStatus.ERROR);
+ dialog.open();
+ return false;
+ }
try {
createAndSendEmail(smtpHost[i], aEmailFrom, aEmailsTo, aSubject, aBody, aAttachment);
break;
@@ -118,6 +136,7 @@
}
}
+ return true;
}
/**
@@ -199,8 +218,12 @@
final String vcalAttachment = vcal.createVCalendar(r4eMeetingData, defaultUserId, aEmailsTo);
//Now send the message
- sendEmail(defaultUserId, aEmailsTo, r4eMeetingData.getSubject(), r4eMeetingData.getBody(), vcalAttachment,
- null);
+ Boolean ok = sendEmail(defaultUserId, aEmailsTo, r4eMeetingData.getSubject(), r4eMeetingData.getBody(),
+ vcalAttachment, null);
+ if (!ok) {
+ //If not send, then re-initialize the data structure
+ r4eMeetingData = null;
+ }
}
return r4eMeetingData;
@@ -253,8 +276,12 @@
//Now send the message
if (null != newMeetingData) {
try {
- sendEmail(defaultUserId, newMeetingData.getReceivers(), newMeetingData.getSubject(),
+ Boolean ok = sendEmail(defaultUserId, newMeetingData.getReceivers(), newMeetingData.getSubject(),
newMeetingData.getBody(), vcalAttachment, null);
+ if (!ok) {
+ //If not send, then re-initialize the data structure
+ newMeetingData = null;
+ }
} catch (CoreException e) {
StatusHandler.log(new Status(IStatus.ERROR, SmtpPlugin.FPLUGIN_ID, IStatus.OK, e.toString(), e));
}
diff --git a/org.eclipse.mylyn.reviews.r4e.mail.smtp/src/org/eclipse/mylyn/reviews/r4e/mail/smtp/mailVersion/internal/dialogs/ScheduleMeetingInputDialog.java b/org.eclipse.mylyn.reviews.r4e.mail.smtp/src/org/eclipse/mylyn/reviews/r4e/mail/smtp/mailVersion/internal/dialogs/ScheduleMeetingInputDialog.java
index 9b154d4..69c9a94 100644
--- a/org.eclipse.mylyn.reviews.r4e.mail.smtp/src/org/eclipse/mylyn/reviews/r4e/mail/smtp/mailVersion/internal/dialogs/ScheduleMeetingInputDialog.java
+++ b/org.eclipse.mylyn.reviews.r4e.mail.smtp/src/org/eclipse/mylyn/reviews/r4e/mail/smtp/mailVersion/internal/dialogs/ScheduleMeetingInputDialog.java
@@ -151,7 +151,7 @@
//Validation of input failed
final ErrorDialog dialog = new ErrorDialog(null, SMTPHostString.getString("dialog_title_error"),
- SMTPHostString.getString("start time_Error"), new Status(IStatus.ERROR, SmtpPlugin.FPLUGIN_ID,
+ SMTPHostString.getString("start_time_Error"), new Status(IStatus.ERROR, SmtpPlugin.FPLUGIN_ID,
0, validateResult, null), IStatus.ERROR);
dialog.open();
this.getShell().setCursor(this.getShell().getDisplay().getSystemCursor(SWT.CURSOR_ARROW));
diff --git a/org.eclipse.mylyn.reviews.r4e.report/META-INF/MANIFEST.MF b/org.eclipse.mylyn.reviews.r4e.report/META-INF/MANIFEST.MF
index a5f2898..92b2981 100644
--- a/org.eclipse.mylyn.reviews.r4e.report/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.reviews.r4e.report/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.mylyn.reviews.r4e.report;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 0.13.0.qualifier
Bundle-Activator: org.eclipse.mylyn.reviews.r4e.report.internal.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.birt.report.engine,
diff --git a/org.eclipse.mylyn.reviews.r4e.report/pom.xml b/org.eclipse.mylyn.reviews.r4e.report/pom.xml
index 70b430b..ec10338 100644
--- a/org.eclipse.mylyn.reviews.r4e.report/pom.xml
+++ b/org.eclipse.mylyn.reviews.r4e.report/pom.xml
@@ -5,10 +5,10 @@
<parent>
<artifactId>org.eclipse.mylyn.reviews.r4e-parent</artifactId>
<groupId>org.eclipse.mylyn.reviews.r4e</groupId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.mylyn.reviews.r4e.report</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
diff --git a/org.eclipse.mylyn.reviews.r4e.reports-feature/feature.xml b/org.eclipse.mylyn.reviews.r4e.reports-feature/feature.xml
index 1aa2d26..ded01cf 100644
--- a/org.eclipse.mylyn.reviews.r4e.reports-feature/feature.xml
+++ b/org.eclipse.mylyn.reviews.r4e.reports-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.mylyn.reviews.r4e.reports"
label="%featureName"
- version="0.12.0.qualifier"
+ version="0.13.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.mylyn.reviews.r4e.report">
diff --git a/org.eclipse.mylyn.reviews.r4e.reports-feature/pom.xml b/org.eclipse.mylyn.reviews.r4e.reports-feature/pom.xml
index 2354359..605d41d 100644
--- a/org.eclipse.mylyn.reviews.r4e.reports-feature/pom.xml
+++ b/org.eclipse.mylyn.reviews.r4e.reports-feature/pom.xml
@@ -6,9 +6,9 @@
<parent>
<artifactId>org.eclipse.mylyn.reviews.r4e-parent</artifactId>
<groupId>org.eclipse.mylyn.reviews.r4e</groupId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.mylyn.reviews.r4e.reports</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/org.eclipse.mylyn.reviews.r4e.sdk.feature/feature.xml b/org.eclipse.mylyn.reviews.r4e.sdk.feature/feature.xml
index 1746fc9..02ea5bf 100644
--- a/org.eclipse.mylyn.reviews.r4e.sdk.feature/feature.xml
+++ b/org.eclipse.mylyn.reviews.r4e.sdk.feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.mylyn.reviews.r4e.sdk.feature"
label="%featureName"
- version="0.12.0.qualifier"
+ version="0.13.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.mylyn.reviews.r4e.core">
diff --git a/org.eclipse.mylyn.reviews.r4e.sdk.feature/pom.xml b/org.eclipse.mylyn.reviews.r4e.sdk.feature/pom.xml
index 21a39e6..299f032 100644
--- a/org.eclipse.mylyn.reviews.r4e.sdk.feature/pom.xml
+++ b/org.eclipse.mylyn.reviews.r4e.sdk.feature/pom.xml
@@ -6,9 +6,9 @@
<parent>
<artifactId>org.eclipse.mylyn.reviews.r4e-parent</artifactId>
<groupId>org.eclipse.mylyn.reviews.r4e</groupId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.mylyn.reviews.r4e.sdk.feature</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/org.eclipse.mylyn.reviews.r4e.transform/META-INF/MANIFEST.MF b/org.eclipse.mylyn.reviews.r4e.transform/META-INF/MANIFEST.MF
index 6ab1708..420c6aa 100644
--- a/org.eclipse.mylyn.reviews.r4e.transform/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.reviews.r4e.transform/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.mylyn.reviews.r4e.transform;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 0.13.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.mylyn.reviews.r4e.transform/pom.xml b/org.eclipse.mylyn.reviews.r4e.transform/pom.xml
index 71ebaf0..4a9495c 100644
--- a/org.eclipse.mylyn.reviews.r4e.transform/pom.xml
+++ b/org.eclipse.mylyn.reviews.r4e.transform/pom.xml
@@ -5,10 +5,10 @@
<parent>
<artifactId>org.eclipse.mylyn.reviews.r4e-parent</artifactId>
<groupId>org.eclipse.mylyn.reviews.r4e</groupId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.mylyn.reviews.r4e.transform</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
diff --git a/org.eclipse.mylyn.reviews.r4e.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.reviews.r4e.ui.tests/META-INF/MANIFEST.MF
index aa8822d..dad022f 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.reviews.r4e.ui.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.mylyn.reviews.r4e.ui.tests;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 0.13.0.qualifier
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: %providerName
diff --git a/org.eclipse.mylyn.reviews.r4e.ui.tests/pom.xml b/org.eclipse.mylyn.reviews.r4e.ui.tests/pom.xml
index 076fa65..593b730 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui.tests/pom.xml
+++ b/org.eclipse.mylyn.reviews.r4e.ui.tests/pom.xml
@@ -5,10 +5,10 @@
<parent>
<artifactId>org.eclipse.mylyn.reviews.r4e-parent</artifactId>
<groupId>org.eclipse.mylyn.reviews.r4e</groupId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.mylyn.reviews.r4e.ui.tests</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
<plugins>
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.reviews.r4e.ui/META-INF/MANIFEST.MF
index 840b7e8..f8bd09c 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.reviews.r4e.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.mylyn.reviews.r4e.ui;singleton:=true
-Bundle-Version: 0.12.0.qualifier
+Bundle-Version: 0.13.0.qualifier
Bundle-Activator: org.eclipse.mylyn.reviews.r4e.ui.R4EUIPlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/plugin.xml b/org.eclipse.mylyn.reviews.r4e.ui/plugin.xml
index abba54d..0ecc6c1 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/plugin.xml
+++ b/org.eclipse.mylyn.reviews.r4e.ui/plugin.xml
@@ -1020,11 +1020,6 @@
<handler
class="org.eclipse.mylyn.reviews.r4e.ui.internal.commands.handlers.RefreshHandler"
commandId="org.eclipse.mylyn.reviews.r4e.ui.commands.Refresh">
- <enabledWhen>
- <test
- property="org.eclipse.mylyn.reviews.r4e.ui.commands.dialog.dialogOpen">
- </test>
- </enabledWhen>
</handler>
<handler
class="org.eclipse.mylyn.reviews.r4e.ui.internal.commands.handlers.ExpandAllHandler"
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/pom.xml b/org.eclipse.mylyn.reviews.r4e.ui/pom.xml
index 6921279..a35a870 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/pom.xml
+++ b/org.eclipse.mylyn.reviews.r4e.ui/pom.xml
@@ -5,10 +5,10 @@
<parent>
<artifactId>org.eclipse.mylyn.reviews.r4e-parent</artifactId>
<groupId>org.eclipse.mylyn.reviews.r4e</groupId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.mylyn.reviews.r4e.ui</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4EAnnotation.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4EAnnotation.java
index 3fccc59..f230952 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4EAnnotation.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4EAnnotation.java
@@ -81,7 +81,7 @@
*
* @return IR4EUIPosition
*/
- protected abstract IR4EUIPosition getR4EPosition();
+ public abstract IR4EUIPosition getR4EPosition();
/**
* Method getPosition.
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4EAnnotationModel.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4EAnnotationModel.java
index 6038a26..dd60fb1 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4EAnnotationModel.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4EAnnotationModel.java
@@ -394,12 +394,8 @@
} else {
fSortedAnnotationsIndexMap.put(remAnnotation.getType(), --remAnnotationIndex);
}
- } else {
- //should never happen
- String msg = "Cannot remove invalid Annonation of type " + aAnnotation.getClass().toString();
- R4EUIPlugin.Ftracer.traceWarning(msg);
- R4EUIPlugin.getDefault().logWarning(msg, null);
}
+ //Ignore any other Annotation type
}
/**
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4EAnomalyAnnotation.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4EAnomalyAnnotation.java
index 90ffbcc..0f51bc8 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4EAnomalyAnnotation.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4EAnomalyAnnotation.java
@@ -78,7 +78,7 @@
* @return IR4EUIPosition
*/
@Override
- protected IR4EUIPosition getR4EPosition() {
+ public IR4EUIPosition getR4EPosition() {
return ((R4EUIAnomalyBasic) fSourceElement).getPosition();
}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4ECommentAnnotation.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4ECommentAnnotation.java
index 679a83f..0fc9890 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4ECommentAnnotation.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4ECommentAnnotation.java
@@ -78,7 +78,7 @@
* @return IR4EUIPosition
*/
@Override
- protected IR4EUIPosition getR4EPosition() {
+ public IR4EUIPosition getR4EPosition() {
return null;
}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4EContentAnnotation.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4EContentAnnotation.java
index 7eb9a60..b180d9a 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4EContentAnnotation.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/annotation/content/R4EContentAnnotation.java
@@ -56,7 +56,7 @@
* @return IR4EUIPosition
*/
@Override
- protected IR4EUIPosition getR4EPosition() {
+ public IR4EUIPosition getR4EPosition() {
return ((R4EUIContent) fSourceElement).getPosition();
}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/AddAssignHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/AddAssignHandler.java
index 92f73cf..26bffb7 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/AddAssignHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/AddAssignHandler.java
@@ -75,6 +75,7 @@
@Override
public IStatus run(IProgressMonitor monitor) {
+ R4EUIModelController.setJobInProgress(true);
if (!selectedElements.isEmpty()) {
//Get participants to assign
@@ -83,7 +84,6 @@
//Assign them
if (participants.size() > 0) {
monitor.beginTask(COMMAND_MESSAGE, selectedElements.size());
- R4EUIModelController.setJobInProgress(true);
for (IR4EUIModelElement element : selectedElements) {
R4EUIPlugin.Ftracer.traceInfo("Add Assignees..." + element.getName()); //$NON-NLS-1$
@@ -96,10 +96,10 @@
return Status.CANCEL_STATUS;
}
}
- R4EUIModelController.setJobInProgress(false);
}
UIUtils.setNavigatorViewFocus(selectedElements.get(0), 0);
}
+ R4EUIModelController.setJobInProgress(false);
monitor.done();
return Status.OK_STATUS;
}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/ChangeReviewStateHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/ChangeReviewStateHandler.java
index 51ad63e..02a6afe 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/ChangeReviewStateHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/ChangeReviewStateHandler.java
@@ -88,9 +88,8 @@
@Override
public IStatus run(IProgressMonitor monitor) {
if (!selectedElements.isEmpty()) {
-
- monitor.beginTask(COMMAND_MESSAGE, selectedElements.size());
R4EUIModelController.setJobInProgress(true);
+ monitor.beginTask(COMMAND_MESSAGE, selectedElements.size());
Resource resource = null;
try {
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/CloneAnomalyHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/CloneAnomalyHandler.java
index e898bc2..a4ad200 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/CloneAnomalyHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/CloneAnomalyHandler.java
@@ -96,8 +96,8 @@
public IStatus run(IProgressMonitor monitor) {
//Act differently depending on the type of selection we get
- final ISelection selection = HandlerUtil.getCurrentSelection(event);
R4EUIModelController.setJobInProgress(true);
+ final ISelection selection = HandlerUtil.getCurrentSelection(event);
if (selection instanceof ITextSelection) {
monitor.beginTask(COMMAND_MESSAGE, IProgressMonitor.UNKNOWN);
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/CloseElementHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/CloseElementHandler.java
index 66e90e0..986ab71 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/CloseElementHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/CloseElementHandler.java
@@ -73,16 +73,16 @@
@Override
public IStatus run(IProgressMonitor monitor) {
+ R4EUIModelController.setJobInProgress(true);
monitor.beginTask(COMMAND_MESSAGE, IProgressMonitor.UNKNOWN);
if (!selectedElements.isEmpty()) {
- R4EUIModelController.setJobInProgress(true);
final IR4EUIModelElement element = selectedElements.get(0);
R4EUIPlugin.Ftracer.traceInfo("Closing element " + element.getName()); //$NON-NLS-1$
element.close();
- R4EUIModelController.setJobInProgress(false);
UIUtils.setNavigatorViewFocus(element, 0);
}
+ R4EUIModelController.setJobInProgress(false);
monitor.done();
return Status.OK_STATUS;
}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/ImportPostponedHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/ImportPostponedHandler.java
index 9ae51a0..d3598ec 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/ImportPostponedHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/ImportPostponedHandler.java
@@ -96,11 +96,10 @@
@Override
public IStatus run(IProgressMonitor monitor) {
+ R4EUIModelController.setJobInProgress(true);
final R4EUIReviewGroup parentGroup = (R4EUIReviewGroup) R4EUIModelController.getActiveReview()
.getParent();
-
monitor.beginTask(COMMAND_MESSAGE, parentGroup.getChildren().length);
- R4EUIModelController.setJobInProgress(true);
importPostponedElements(true, monitor);
R4EUIModelController.setJobInProgress(false);
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewAnomalyHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewAnomalyHandler.java
index c0cda28..4015dec 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewAnomalyHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewAnomalyHandler.java
@@ -96,8 +96,8 @@
public IStatus run(IProgressMonitor monitor) {
//Act differently depending on the type of selection we get
- final ISelection selection = HandlerUtil.getCurrentSelection(event);
R4EUIModelController.setJobInProgress(true);
+ final ISelection selection = HandlerUtil.getCurrentSelection(event);
if (selection instanceof ITextSelection) {
monitor.beginTask(COMMAND_MESSAGE, IProgressMonitor.UNKNOWN);
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewChildElementHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewChildElementHandler.java
index fcb4992..b9c860b 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewChildElementHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewChildElementHandler.java
@@ -88,8 +88,8 @@
@Override
public IStatus run(IProgressMonitor monitor) {
- monitor.beginTask(COMMAND_MESSAGE, IProgressMonitor.UNKNOWN);
R4EUIModelController.setJobInProgress(true);
+ monitor.beginTask(COMMAND_MESSAGE, IProgressMonitor.UNKNOWN);
for (final ReviewComponent tempModelComponent : tempModelComponents) {
R4EUIPlugin.Ftracer.traceInfo("Adding child to element " + element.getName());
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewLinkedAnomalyHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewLinkedAnomalyHandler.java
index 150c157..6195a06 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewLinkedAnomalyHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewLinkedAnomalyHandler.java
@@ -77,8 +77,8 @@
@Override
public IStatus run(IProgressMonitor monitor) {
- monitor.beginTask(COMMAND_MESSAGE, IProgressMonitor.UNKNOWN);
R4EUIModelController.setJobInProgress(true);
+ monitor.beginTask(COMMAND_MESSAGE, IProgressMonitor.UNKNOWN);
//Add a linked anomaly to the selected contents
if (!selectedElements.isEmpty()) {
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewReviewItemHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewReviewItemHandler.java
index ce79d33..389eaf0 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewReviewItemHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewReviewItemHandler.java
@@ -117,8 +117,8 @@
final Job job = new Job(COMMAND_MESSAGE) {
@Override
public IStatus run(IProgressMonitor monitor) {
- final ISelection selection = HandlerUtil.getCurrentSelection(event);
R4EUIModelController.setJobInProgress(true);
+ final ISelection selection = HandlerUtil.getCurrentSelection(event);
//Act differently depending on the type of selection we get
if (selection instanceof ITextSelection) {
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewRuleSetElementHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewRuleSetElementHandler.java
index 6242714..cab27ed 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewRuleSetElementHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewRuleSetElementHandler.java
@@ -88,8 +88,8 @@
final Job job = new Job(COMMAND_MESSAGE) {
@Override
public IStatus run(IProgressMonitor monitor) {
- monitor.beginTask(COMMAND_MESSAGE, IProgressMonitor.UNKNOWN);
R4EUIModelController.setJobInProgress(true);
+ monitor.beginTask(COMMAND_MESSAGE, IProgressMonitor.UNKNOWN);
IR4EUIModelElement newElement = null;
try {
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NextStateHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NextStateHandler.java
index 74a886b..d34a2b7 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NextStateHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NextStateHandler.java
@@ -89,8 +89,8 @@
@Override
public IStatus run(IProgressMonitor monitor) {
if (!selectedElements.isEmpty()) {
- monitor.beginTask(COMMAND_MESSAGE, selectedElements.size());
R4EUIModelController.setJobInProgress(true);
+ monitor.beginTask(COMMAND_MESSAGE, selectedElements.size());
for (IR4EUIModelElement element : selectedElements) {
R4EUIPlugin.Ftracer.traceInfo("Progressing state for element " + element.getName()); //$NON-NLS-1$
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/OpenElementHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/OpenElementHandler.java
index f6e1930..eecdcbc 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/OpenElementHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/OpenElementHandler.java
@@ -79,8 +79,8 @@
@Override
public IStatus run(IProgressMonitor aMonitor) {
- aMonitor.beginTask(COMMAND_MESSAGE, IProgressMonitor.UNKNOWN);
R4EUIModelController.setJobInProgress(true);
+ aMonitor.beginTask(COMMAND_MESSAGE, IProgressMonitor.UNKNOWN);
if (!selectedElements.isEmpty()) {
IR4EUIModelElement element = null;
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/PreviousStateHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/PreviousStateHandler.java
index 809b027..5b1fcf1 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/PreviousStateHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/PreviousStateHandler.java
@@ -83,8 +83,8 @@
@Override
public IStatus run(IProgressMonitor monitor) {
if (!selectedElements.isEmpty()) {
- monitor.beginTask(COMMAND_MESSAGE, selectedElements.size());
R4EUIModelController.setJobInProgress(true);
+ monitor.beginTask(COMMAND_MESSAGE, selectedElements.size());
for (IR4EUIModelElement element : selectedElements) {
R4EUIPlugin.Ftracer.traceInfo("Regressing State for element " + element.getName()); //$NON-NLS-1$
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RemoveAssignHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RemoveAssignHandler.java
index 9e3a65f..c10cb3b 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RemoveAssignHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RemoveAssignHandler.java
@@ -76,6 +76,7 @@
@Override
public IStatus run(IProgressMonitor monitor) {
+ R4EUIModelController.setJobInProgress(true);
if (!selectedElements.isEmpty()) {
//Get participants to assign
@@ -84,7 +85,6 @@
//Unassign them
if (participants.size() > 0) {
monitor.beginTask(COMMAND_MESSAGE, selectedElements.size());
- R4EUIModelController.setJobInProgress(true);
for (IR4EUIModelElement element : selectedElements) {
R4EUIPlugin.Ftracer.traceInfo("Remove Assignees..." //$NON-NLS-1$
@@ -99,10 +99,10 @@
}
}
}
- R4EUIModelController.setJobInProgress(false);
UIUtils.setNavigatorViewFocus(selectedElements.get(0), 0);
R4EUIDialogFactory.getInstance().removeParticipantUnassignDialog();
}
+ R4EUIModelController.setJobInProgress(false);
monitor.done();
return Status.OK_STATUS;
}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RemoveElementHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RemoveElementHandler.java
index 0833ed7..493912e 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RemoveElementHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RemoveElementHandler.java
@@ -91,8 +91,8 @@
@Override
public IStatus run(IProgressMonitor monitor) {
if (!selectedElements.isEmpty()) {
- monitor.beginTask(COMMAND_MESSAGE, selectedElements.size());
R4EUIModelController.setJobInProgress(true);
+ monitor.beginTask(COMMAND_MESSAGE, selectedElements.size());
R4EReview review = null;
if (null != R4EUIModelController.getActiveReview()) {
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/ReportElementHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/ReportElementHandler.java
index 092099a..c1db184 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/ReportElementHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/ReportElementHandler.java
@@ -77,8 +77,8 @@
@Override
public IStatus run(IProgressMonitor monitor) {
- monitor.beginTask(COMMAND_MESSAGE, IProgressMonitor.UNKNOWN);
R4EUIModelController.setJobInProgress(true);
+ monitor.beginTask(COMMAND_MESSAGE, IProgressMonitor.UNKNOWN);
if (!selectedElements.isEmpty()) {
String groupFile = null;
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RestoreElementHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RestoreElementHandler.java
index af9e6f0..43b76dc 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RestoreElementHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/RestoreElementHandler.java
@@ -89,9 +89,10 @@
@Override
public IStatus run(IProgressMonitor monitor) {
+ R4EUIModelController.setJobInProgress(true);
+
if (!selectedElements.isEmpty()) {
monitor.beginTask(COMMAND_MESSAGE, selectedElements.size());
- R4EUIModelController.setJobInProgress(true);
R4EReview review = null;
if (null != R4EUIModelController.getActiveReview()) {
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/SelectNextHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/SelectNextHandler.java
index d9ba76a..974ce45 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/SelectNextHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/SelectNextHandler.java
@@ -76,7 +76,7 @@
public IStatus runInUIThread(IProgressMonitor monitor) {
monitor.beginTask(COMMAND_MESSAGE, 1);
- if (!selectedElements.isEmpty()) {
+ if (selectedElements != null && !selectedElements.isEmpty()) {
final ReviewNavigatorView view = R4EUIModelController.getNavigatorView();
//Get the previous element
@@ -113,8 +113,14 @@
* @return IR4EUIModelElement
*/
private IR4EUIModelElement getNextElement(ReviewNavigatorTreeViewer aTreeViewer) {
- final TreeItem item = aTreeViewer.getTree().getSelection()[0];
- final TreeItem nextItem = aTreeViewer.getNext(item);
- return (IR4EUIModelElement) nextItem.getData();
+ final TreeItem[] item = aTreeViewer.getTree().getSelection();
+ if (item.length == 0) {
+ //No item selected, so just return
+ return null;
+ } else {
+ final TreeItem nextItem = aTreeViewer.getNext(item[0]);
+ return (IR4EUIModelElement) nextItem.getData();
+
+ }
}
}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/SelectPreviousHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/SelectPreviousHandler.java
index 80766d8..afc054a 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/SelectPreviousHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/SelectPreviousHandler.java
@@ -76,7 +76,7 @@
public IStatus runInUIThread(IProgressMonitor monitor) {
monitor.beginTask(COMMAND_MESSAGE, 1);
- if (!selectedElements.isEmpty()) {
+ if (selectedElements != null && !selectedElements.isEmpty()) {
final ReviewNavigatorView view = R4EUIModelController.getNavigatorView();
//Get the previous element
@@ -113,8 +113,14 @@
* @return IR4EUIModelElement
*/
private IR4EUIModelElement getPreviousElement(ReviewNavigatorTreeViewer aTreeViewer) {
- final TreeItem item = aTreeViewer.getTree().getSelection()[0];
- final TreeItem previousItem = aTreeViewer.getPrevious(item);
- return (IR4EUIModelElement) previousItem.getData();
+ final TreeItem[] item = aTreeViewer.getTree().getSelection();
+ if (item.length == 0) {
+ //No item selected, so just return
+ return null;
+ } else {
+ final TreeItem previousItem = aTreeViewer.getPrevious(item[0]);
+ return (IR4EUIModelElement) previousItem.getData();
+ }
+
}
}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/dialogs/CloneAnomalyInputDialog.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/dialogs/CloneAnomalyInputDialog.java
index b38e7d3..03322b6 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/dialogs/CloneAnomalyInputDialog.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/dialogs/CloneAnomalyInputDialog.java
@@ -19,6 +19,7 @@
package org.eclipse.mylyn.reviews.r4e.ui.internal.dialogs;
import java.text.SimpleDateFormat;
+import java.util.Calendar;
import java.util.Date;
import java.util.HashSet;
import java.util.Set;
@@ -448,8 +449,17 @@
final int result = dialog.open();
if (result == Window.OK) {
final SimpleDateFormat dateFormat = new SimpleDateFormat(R4EUIConstants.SIMPLE_DATE_FORMAT);
- fDateText.setText(dateFormat.format(dialog.getDate()));
- fAnomalyDueDateValue = dialog.getDate();
+ Date dialogDate = dialog.getDate();
+ String dialogDateStr = dateFormat.format(dialogDate);
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(new Date());
+ cal.add(Calendar.DAY_OF_YEAR, -1);
+ if (dialogDate.after(cal.getTime())) {
+ fDateText.setText(dialogDateStr);
+ fAnomalyDueDateValue = dialogDate;
+ } else {
+ UIUtils.displayPastDateError(dialogDate, dialogDateStr);
+ }
}
}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/dialogs/NewAnomalyInputDialog.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/dialogs/NewAnomalyInputDialog.java
index a4587de..d9af94a 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/dialogs/NewAnomalyInputDialog.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/dialogs/NewAnomalyInputDialog.java
@@ -21,6 +21,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -502,8 +503,17 @@
final int result = dialog.open();
if (result == Window.OK) {
final SimpleDateFormat dateFormat = new SimpleDateFormat(R4EUIConstants.SIMPLE_DATE_FORMAT);
- fDateText.setText(dateFormat.format(dialog.getDate()));
- fAnomalyDueDateValue = dialog.getDate();
+ Date dialogDate = dialog.getDate();
+ String dialogDateStr = dateFormat.format(dialogDate);
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(new Date());
+ cal.add(Calendar.DAY_OF_YEAR, -1);
+ if (dialogDate.after(cal.getTime())) {
+ fDateText.setText(dialogDateStr);
+ fAnomalyDueDateValue = dialogDate;
+ } else {
+ UIUtils.displayPastDateError(dialogDate, dialogDateStr);
+ }
}
}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/dialogs/ReviewInputDialog.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/dialogs/ReviewInputDialog.java
index 94f4ae3..dc6c436 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/dialogs/ReviewInputDialog.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/dialogs/ReviewInputDialog.java
@@ -21,6 +21,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Date;
import org.eclipse.core.runtime.IStatus;
@@ -37,6 +38,7 @@
import org.eclipse.mylyn.reviews.r4e.ui.internal.model.R4EUIReviewGroup;
import org.eclipse.mylyn.reviews.r4e.ui.internal.utils.EditableListWidget;
import org.eclipse.mylyn.reviews.r4e.ui.internal.utils.R4EUIConstants;
+import org.eclipse.mylyn.reviews.r4e.ui.internal.utils.UIUtils;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.events.ModifyEvent;
@@ -537,8 +539,17 @@
final int result = dialog.open();
if (result == Window.OK) {
final SimpleDateFormat dateFormat = new SimpleDateFormat(R4EUIConstants.SIMPLE_DATE_FORMAT);
- fDueDateText.setText(dateFormat.format(dialog.getDate()));
- fDueDateValue = dialog.getDate();
+ Date dialogDate = dialog.getDate();
+ String dialogDateStr = dateFormat.format(dialogDate);
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(new Date());
+ cal.add(Calendar.DAY_OF_YEAR, -1);
+ if (dialogDate.after(cal.getTime())) {
+ fDueDateText.setText(dialogDateStr);
+ fDueDateValue = dialogDate;
+ } else {
+ UIUtils.displayPastDateError(dialogDate, dialogDateStr);
+ }
}
}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/editors/R4ECompareEditorInput.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/editors/R4ECompareEditorInput.java
index 15cdbf9..e648f96 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/editors/R4ECompareEditorInput.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/editors/R4ECompareEditorInput.java
@@ -36,7 +36,6 @@
import org.eclipse.jface.action.IContributionItem;
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.text.Position;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.Viewer;
@@ -47,6 +46,7 @@
import org.eclipse.mylyn.reviews.r4e.ui.internal.annotation.content.R4EAnnotation;
import org.eclipse.mylyn.reviews.r4e.ui.internal.annotation.content.R4EAnnotationModel;
import org.eclipse.mylyn.reviews.r4e.ui.internal.model.IR4EUIModelElement;
+import org.eclipse.mylyn.reviews.r4e.ui.internal.model.IR4EUIPosition;
import org.eclipse.mylyn.reviews.r4e.ui.internal.model.R4EUIAnomalyBasic;
import org.eclipse.mylyn.reviews.r4e.ui.internal.model.R4EUIContent;
import org.eclipse.mylyn.reviews.r4e.ui.internal.model.R4EUIFileContext;
@@ -412,21 +412,33 @@
* @return R4EAnnotation
*/
public R4EAnnotation gotoNextAnnotation(String aType) {
- R4EAnnotation annotation = null;
+ R4EAnnotation originalAnnotation = null;
+ R4EAnnotation foundAnnotation = null;
+
+ //We need to only consider the anomalies currently visible in the viewport
if (null != fAnnotationSupport) {
- IReviewAnnotationModel model = fAnnotationSupport.getTargetAnnotationModel();
- if (null != model) {
- annotation = (R4EAnnotation) model.getNextAnnotation(aType);
- if (null != annotation) {
- final Position annotationPositon = annotation.getPosition();
- ITextEditor editor = fAnnotationSupport.getTargetEditor();
- if (null != editor) {
- editor.selectAndReveal(annotationPositon.getOffset(), annotationPositon.getLength());
+ ITextEditor editor = fAnnotationSupport.getTargetEditor();
+ if (null != editor) {
+ IReviewAnnotationModel model = fAnnotationSupport.getTargetAnnotationModel();
+ if (null != model) {
+ ICompareNavigator navigator = ((R4ECompareEditorInput) editor.getEditorInput()).getNavigator();
+
+ originalAnnotation = (R4EAnnotation) model.getNextAnnotation(aType);
+ if (null != originalAnnotation) {
+ R4EAnnotation annotation = originalAnnotation;
+ do {
+ final IR4EUIPosition annotationPositon = annotation.getR4EPosition();
+ if (UIUtils.selectElementInEditorPane(navigator, annotationPositon, true)) {
+ foundAnnotation = annotation;
+ break;
+ }
+ annotation = (R4EAnnotation) model.getNextAnnotation(aType);
+ } while (!originalAnnotation.getR4EPosition().isSameAs(annotation.getR4EPosition()));
}
}
}
}
- return annotation;
+ return foundAnnotation;
}
/**
@@ -437,21 +449,33 @@
* @return R4EAnnotation
*/
public R4EAnnotation gotoPreviousAnnotation(String aType) {
- R4EAnnotation annotation = null;
+ R4EAnnotation originalAnnotation = null;
+ R4EAnnotation foundAnnotation = null;
+
+ //We need to only consider the anomalies currently visible in the viewport
if (null != fAnnotationSupport) {
- IReviewAnnotationModel model = fAnnotationSupport.getTargetAnnotationModel();
- if (null != model) {
- annotation = (R4EAnnotation) model.getPreviousAnnotation(aType);
- if (null != annotation) {
- final Position annotationPositon = annotation.getPosition();
- ITextEditor editor = fAnnotationSupport.getTargetEditor();
- if (null != editor) {
- editor.selectAndReveal(annotationPositon.getOffset(), annotationPositon.getLength());
+ ITextEditor editor = fAnnotationSupport.getTargetEditor();
+ if (null != editor) {
+ IReviewAnnotationModel model = fAnnotationSupport.getTargetAnnotationModel();
+ if (null != model) {
+ ICompareNavigator navigator = ((R4ECompareEditorInput) editor.getEditorInput()).getNavigator();
+
+ originalAnnotation = (R4EAnnotation) model.getPreviousAnnotation(aType);
+ if (null != originalAnnotation) {
+ R4EAnnotation annotation = originalAnnotation;
+ do {
+ final IR4EUIPosition annotationPositon = annotation.getR4EPosition();
+ if (UIUtils.selectElementInEditorPane(navigator, annotationPositon, true)) {
+ foundAnnotation = annotation;
+ break;
+ }
+ annotation = (R4EAnnotation) model.getPreviousAnnotation(aType);
+ } while (!originalAnnotation.getR4EPosition().isSameAs(annotation.getR4EPosition()));
}
}
}
}
- return annotation;
+ return foundAnnotation;
}
//Test Methods
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIParticipant.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIParticipant.java
index da3e64d..8dc9c3d 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIParticipant.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIParticipant.java
@@ -357,34 +357,40 @@
* Method setParticipantDetails.
*/
public void setParticipantDetails() {
- if (fParticipant.getId().equals(
- R4EUIPlugin.getDefault().getPreferenceStore().getString(PreferenceConstants.P_USER_ID))) {
- //If this is the default user, get its email
- String email = R4EUIPlugin.getDefault().getPreferenceStore().getString(PreferenceConstants.P_USER_EMAIL);
- fParticipant.setEmail(email);
- }
+ if (fParticipant.getEmail() == null || fParticipant.getEmail().equals("")) {
- if (R4EUIModelController.isUserQueryAvailable()) {
- try {
- //Get detailed info from DB if available
- final IQueryUser query = new QueryUserFactory().getInstance();
- final List<IUserInfo> info = query.searchByUserId(fParticipant.getId());
- if (info.size() > 0) {
- final IUserInfo userInfo = info.get(0);
- fParticipantDetails = UIUtils.buildUserDetailsString(userInfo);
- if (null == fParticipant.getEmail() || fParticipant.getEmail().length() < 1) {
- fParticipant.setEmail(userInfo.getEmail());
- }
- }
- } catch (NamingException e) {
- R4EUIPlugin.Ftracer.traceWarning("Exception: " + e.toString() + " (" + e.getMessage() + ")");
- } catch (IOException e) {
- R4EUIPlugin.Ftracer.traceWarning("Exception: " + e.toString() + " (" + e.getMessage() + ")");
+ if (fParticipant.getId().equals(
+ R4EUIPlugin.getDefault().getPreferenceStore().getString(PreferenceConstants.P_USER_ID))) {
+ //If this is the default user, get its email
+ String email = R4EUIPlugin.getDefault()
+ .getPreferenceStore()
+ .getString(PreferenceConstants.P_USER_EMAIL);
+ fParticipant.setEmail(email);
}
- }
- if (fParticipant.getEmail() == null) {
- fParticipant.setEmail(""); //$NON-NLS-1$
+ if (R4EUIModelController.isUserQueryAvailable()) {
+ try {
+ //Get detailed info from DB if available
+ final IQueryUser query = new QueryUserFactory().getInstance();
+ final List<IUserInfo> info = query.searchByUserId(fParticipant.getId());
+ if (info.size() > 0) {
+ final IUserInfo userInfo = info.get(0);
+ fParticipantDetails = UIUtils.buildUserDetailsString(userInfo);
+ if (null == fParticipant.getEmail() || fParticipant.getEmail().length() < 1) {
+ fParticipant.setEmail(userInfo.getEmail());
+ }
+ }
+ } catch (NamingException e) {
+ R4EUIPlugin.Ftracer.traceWarning("Exception: " + e.toString() + " (" + e.getMessage() + ")");
+ } catch (IOException e) {
+ R4EUIPlugin.Ftracer.traceWarning("Exception: " + e.toString() + " (" + e.getMessage() + ")");
+ }
+ }
+
+ //Safety if the LDAP query is not resolved properly
+ if (fParticipant.getEmail() == null) {
+ fParticipant.setEmail(""); //$NON-NLS-1$
+ }
}
}
@@ -433,7 +439,7 @@
* @param parentReview
*/
private int reviewerRoleSize(R4EUIReviewBasic aReview, R4EUserRole aRole) {
- List<R4EParticipant> participants = aReview.getParticipants();
+ List<R4EParticipant> participants = aReview.getParticipants(false);
if (participants == null) {
return 0;
}
@@ -442,13 +448,11 @@
int roleCount = 0;
for (R4EParticipant participant : participants) {
//Don't consider disabled participants within the count
- if (participant.isEnabled()) {
- EList<R4EUserRole> roles = participant.getRoles();
- for (R4EUserRole role : roles) {
- if (role.equals(aRole)) {
- roleCount++;
- break;
- }
+ EList<R4EUserRole> roles = participant.getRoles();
+ for (R4EUserRole role : roles) {
+ if (role.equals(aRole)) {
+ roleCount++;
+ break;
}
}
}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIParticipantContainer.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIParticipantContainer.java
index 3dc03df..078d17c 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIParticipantContainer.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIParticipantContainer.java
@@ -198,7 +198,7 @@
*/
@Override
public void open() {
- final List<R4EParticipant> participants = ((R4EUIReviewBasic) getParent()).getParticipants();
+ final List<R4EParticipant> participants = ((R4EUIReviewBasic) getParent()).getParticipants(true);
if (null != participants) {
final int participantsSize = participants.size();
for (int i = 0; i < participantsSize; i++) {
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIReviewBasic.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIReviewBasic.java
index 46fbf42..e6a25cf 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIReviewBasic.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/model/R4EUIReviewBasic.java
@@ -485,17 +485,21 @@
/**
* Method getParticipants.
- *
+ * @param aIncludeDisabled - boolean
* @return List<R4EParticipant>
*/
- public List<R4EParticipant> getParticipants() {
+ public List<R4EParticipant> getParticipants(boolean aIncludeDisabled) {
final Object[] users = fReview.getUsersMap().values().toArray();
//Cast list to R4EParticipants
final List<R4EParticipant> participants = new ArrayList<R4EParticipant>();
for (Object user : users) {
- if (((R4EParticipant) user).isEnabled()) {
+ if (aIncludeDisabled) {
participants.add((R4EParticipant) user);
+ } else {
+ if (((R4EParticipant) user).isEnabled()) {
+ participants.add((R4EParticipant) user);
+ }
}
}
return participants;
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/general/ReviewDecisionProperties.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/general/ReviewDecisionProperties.java
index ac32999..4617afa 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/general/ReviewDecisionProperties.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/general/ReviewDecisionProperties.java
@@ -133,7 +133,7 @@
if (REVIEW_DECISION_MEETING_ID.equals(aId)) {
return new ReviewMeetingProperties(getElement());
} else if (REVIEW_DECISION_PARTICIPANTS_ID.equals(aId)) {
- final List<R4EParticipant> participants = ((R4EUIReviewBasic) getElement()).getParticipants();
+ final List<R4EParticipant> participants = ((R4EUIReviewBasic) getElement()).getParticipants(false);
final List<String> decisionParticipantIds = new ArrayList<String>();
for (R4EParticipant participant : participants) {
if (participant.isIsPartOfDecision()) {
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/ReviewTabPropertySection.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/ReviewTabPropertySection.java
index 603d50b..c4fae70 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/ReviewTabPropertySection.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/properties/tabbed/ReviewTabPropertySection.java
@@ -1303,7 +1303,7 @@
final R4EUIReviewExtended uiExtendedReview = (R4EUIReviewExtended) fProperties.getElement();
final R4EFormalReview modelFormalReview = (R4EFormalReview) uiReview.getReview();
- final List<R4EParticipant> participants = uiExtendedReview.getParticipants();
+ final List<R4EParticipant> participants = uiExtendedReview.getParticipants(false);
item = null;
final int numParticipants = participants.size();
fDecisionUsersList.removeAll();
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/MailServicesProxy.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/MailServicesProxy.java
index e1bbf7c..5cc285d 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/MailServicesProxy.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/MailServicesProxy.java
@@ -401,7 +401,7 @@
*/
private static String[] createItemsUpdatedDestinations() {
final ArrayList<String> destinations = new ArrayList<String>();
- final List<R4EParticipant> participants = R4EUIModelController.getActiveReview().getParticipants();
+ final List<R4EParticipant> participants = R4EUIModelController.getActiveReview().getParticipants(false);
for (R4EParticipant participant : participants) {
if (isEmailValid(participant)) {
//All active participants should receive this email
@@ -418,7 +418,7 @@
*/
private static String[] createProgressDestinations() {
final ArrayList<String> destinations = new ArrayList<String>();
- final List<R4EParticipant> participants = R4EUIModelController.getActiveReview().getParticipants();
+ final List<R4EParticipant> participants = R4EUIModelController.getActiveReview().getParticipants(false);
for (R4EParticipant participant : participants) {
if (isEmailValid(participant)) {
if (!(R4EUIModelController.getActiveReview().getReview().getType().equals(R4EReviewType.R4E_REVIEW_TYPE_FORMAL))) {
@@ -443,7 +443,7 @@
*/
private static String[] createQuestionDestinations() {
final ArrayList<String> destinations = new ArrayList<String>();
- final List<R4EParticipant> participants = R4EUIModelController.getActiveReview().getParticipants();
+ final List<R4EParticipant> participants = R4EUIModelController.getActiveReview().getParticipants(false);
for (R4EParticipant participant : participants) {
if (isEmailValid(participant)) {
if (!(R4EUIModelController.getActiveReview().getReview().getType().equals(R4EReviewType.R4E_REVIEW_TYPE_FORMAL))) {
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/UIUtils.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/UIUtils.java
index dd1261d..d160c8b 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/UIUtils.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/UIUtils.java
@@ -509,6 +509,27 @@
}
/**
+ * Method displayPastDateError.
+ *
+ * @param aPastDate
+ * Date
+ * @param aPastDateStr
+ * String
+ * @return boolean
+ */
+ public static void displayPastDateError(Date aPastDate, String aPastDateStr) {
+ final ErrorDialog dialog = new ErrorDialog(null, R4EUIConstants.DIALOG_TITLE_ERROR,
+ "Date Passed Error Detected", new Status(IStatus.ERROR, R4EUIPlugin.PLUGIN_ID, 0,
+ "You cannot specify a date (" + aPastDateStr + ") that occured in the past", null),
+ IStatus.ERROR);
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ dialog.open();
+ }
+ });
+ }
+
+ /**
* Method isFilterPreferenceSet.
*
* @param aFilterSet
@@ -595,7 +616,7 @@
if (null == R4EUIModelController.getActiveReview()) {
return 0;
}
- final List<R4EParticipant> participants = R4EUIModelController.getActiveReview().getParticipants();
+ final List<R4EParticipant> participants = R4EUIModelController.getActiveReview().getParticipants(false);
final int numParticipants = participants.size();
int index = 0;
for (int i = 0; i < numParticipants; i++) {
@@ -765,63 +786,75 @@
}
if (null != position) {
- final ICompareNavigator navigator = aInput.getNavigator();
+ return selectElementInEditorPane(aInput.getNavigator(), position, isLeftPane);
+ }
+ }
+ return true;
+ }
- //Use free form to select position in file
- //NOTE: This is a dirty hack that involves accessing class and field we shouldn't, but that's
- // the only way to select the current position in the compare editor. Hopefully this code can
- // be removed later when the Eclipse compare editor allows this.
- if (navigator instanceof CompareEditorInputNavigator) {
- final Object[] panes = ((CompareEditorInputNavigator) navigator).getPanes();
- for (Object pane : panes) {
- if (pane instanceof CompareContentViewerSwitchingPane) {
- Viewer viewer = ((CompareContentViewerSwitchingPane) pane).getViewer();
- if (viewer instanceof TextMergeViewer) {
- TextMergeViewer textViewer = (TextMergeViewer) viewer;
- Class textViewerClass = textViewer.getClass();
- if (!textViewerClass.getName().equals(COMPARE_EDITOR_TEXT_CLASS_NAME)) {
- do {
- textViewerClass = textViewerClass.getSuperclass();
- if (textViewerClass.getName().equals(DEFAULT_OBJECT_CLASS_NAME)) {
- break;
- }
- } while (!textViewerClass.getName().equals(COMPARE_EDITOR_TEXT_CLASS_NAME));
+ /**
+ * Method selectElementInEditor.
+ *
+ * @param aInput
+ * R4ECompareEditorInput
+ * @return boolean
+ */
+ public static boolean selectElementInEditorPane(ICompareNavigator aNavigator, IR4EUIPosition aPosition,
+ boolean aIsLeftPane) {
+
+ //Use free form to select position in file
+ //NOTE: This is a dirty hack that involves accessing class and field we shouldn't, but that's
+ // the only way to select the current position in the compare editor. Hopefully this code can
+ // be removed later when the Eclipse compare editor allows this.
+ if (aNavigator instanceof CompareEditorInputNavigator) {
+ final Object[] panes = ((CompareEditorInputNavigator) aNavigator).getPanes();
+ for (Object pane : panes) {
+ if (pane instanceof CompareContentViewerSwitchingPane) {
+ Viewer viewer = ((CompareContentViewerSwitchingPane) pane).getViewer();
+ if (viewer instanceof TextMergeViewer) {
+ TextMergeViewer textViewer = (TextMergeViewer) viewer;
+ Class textViewerClass = textViewer.getClass();
+ if (!textViewerClass.getName().equals(COMPARE_EDITOR_TEXT_CLASS_NAME)) {
+ do {
+ textViewerClass = textViewerClass.getSuperclass();
+ if (textViewerClass.getName().equals(DEFAULT_OBJECT_CLASS_NAME)) {
+ break;
}
- try {
- Field field;
- if (isLeftPane) {
- field = textViewerClass.getDeclaredField(COMPARE_EDITOR_TEXT_FIELD_LEFT);
- } else {
- field = textViewerClass.getDeclaredField(COMPARE_EDITOR_TEXT_FIELD_RIGHT);
- }
- field.setAccessible(true);
- MergeSourceViewer sourceViewer = (MergeSourceViewer) field.get(textViewer);
-
- //Now check if the element can be displayed completely in the current viewport. If so, do it. Otherwise, tell
- //the caller
- int visibleOffset = sourceViewer.getSourceViewer().getVisibleRegion().getOffset();
- int visibleLength = sourceViewer.getSourceViewer().getVisibleRegion().getLength();
- int elementOffset = ((R4EUITextPosition) position).getOffset();
- int elementLength = ((R4EUITextPosition) position).getLength();
-
- if (elementOffset < visibleOffset
- || (elementOffset + elementLength) > (visibleOffset + visibleLength)) {
- return false; //Element falls outside the visible region
- } else {
- ITextEditor adapter = (ITextEditor) sourceViewer.getAdapter(ITextEditor.class);
- adapter.selectAndReveal(((R4EUITextPosition) position).getOffset(),
- ((R4EUITextPosition) position).getLength());
- }
- } catch (SecurityException e) {
- //just continue
- } catch (NoSuchFieldException e) {
- //just continue
- } catch (IllegalArgumentException e) {
- //just continue
- } catch (IllegalAccessException e) {
- //just continue
- }
+ } while (!textViewerClass.getName().equals(COMPARE_EDITOR_TEXT_CLASS_NAME));
+ }
+ try {
+ Field field;
+ if (aIsLeftPane) {
+ field = textViewerClass.getDeclaredField(COMPARE_EDITOR_TEXT_FIELD_LEFT);
+ } else {
+ field = textViewerClass.getDeclaredField(COMPARE_EDITOR_TEXT_FIELD_RIGHT);
}
+ field.setAccessible(true);
+ MergeSourceViewer sourceViewer = (MergeSourceViewer) field.get(textViewer);
+
+ //Now check if the element can be displayed completely in the current viewport. If so, do it. Otherwise, tell
+ //the caller
+ int visibleOffset = sourceViewer.getSourceViewer().getVisibleRegion().getOffset();
+ int visibleLength = sourceViewer.getSourceViewer().getVisibleRegion().getLength();
+ int elementOffset = ((R4EUITextPosition) aPosition).getOffset();
+ int elementLength = ((R4EUITextPosition) aPosition).getLength();
+
+ if (elementOffset < visibleOffset
+ || (elementOffset + elementLength) > (visibleOffset + visibleLength)) {
+ return false; //Element falls outside the visible region
+ } else {
+ ITextEditor adapter = (ITextEditor) sourceViewer.getAdapter(ITextEditor.class);
+ adapter.selectAndReveal(((R4EUITextPosition) aPosition).getOffset(),
+ ((R4EUITextPosition) aPosition).getLength());
+ }
+ } catch (SecurityException e) {
+ //just continue
+ } catch (NoSuchFieldException e) {
+ //just continue
+ } catch (IllegalArgumentException e) {
+ //just continue
+ } catch (IllegalAccessException e) {
+ //just continue
}
}
}
diff --git a/pom.xml b/pom.xml
index 44d56c7..65ceeda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
</parent>
<groupId>org.eclipse.mylyn.reviews.r4e</groupId>
<artifactId>org.eclipse.mylyn.reviews.r4e-parent</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>0.13.0-SNAPSHOT</version>
<packaging>pom</packaging>
<mailingLists>
<mailingList>
