diff --git a/edu.washington.cs.cupid.core.feature/feature.xml b/edu.washington.cs.cupid.core.feature/feature.xml index 0e61311..b351070 100644 --- a/edu.washington.cs.cupid.core.feature/feature.xml +++ b/edu.washington.cs.cupid.core.feature/feature.xml @@ -2,7 +2,7 @@ > { + + public TaskCommentsCapability(){ + super("Task Comments", "Get the comments for a Mylyn task", + TypeToken.of(ITask.class), new TypeToken>(){}, + ICapability.Flag.PURE); + } + + @Override + public LinearJob> getJob(ITask input) { + return new LinearJob>(this, input) { + @Override + protected LinearStatus> run(final IProgressMonitor monitor) { + try { + ITask task = getInput(); + + TaskData data = TasksUiPlugin.getTaskDataManager().getTaskData(getInput()); + List commentAttributes = data.getAttributeMapper().getAttributesByType(data, TaskAttribute.TYPE_COMMENT); + TaskRepository repository =TasksUiPlugin.getRepositoryManager().getRepository(data.getRepositoryUrl()); + + List result = Lists.newArrayList(); + + for (TaskAttribute a : commentAttributes){ + result.add(new TaskComment(repository, task, a)); + } + + return new LinearStatus>(TaskCommentsCapability.this, result); + + } catch (Exception e) { + return new LinearStatus>(e); + } finally { + monitor.done(); + } + } + }; + } +} diff --git a/edu.washington.cs.cupid.mylyn/src/edu/washington/cs/cupid/mylyn/internal/Activator.java b/edu.washington.cs.cupid.mylyn/src/edu/washington/cs/cupid/mylyn/internal/Activator.java index 07e675c..cc2c9d0 100644 --- a/edu.washington.cs.cupid.mylyn/src/edu/washington/cs/cupid/mylyn/internal/Activator.java +++ b/edu.washington.cs.cupid.mylyn/src/edu/washington/cs/cupid/mylyn/internal/Activator.java @@ -19,6 +19,7 @@ import edu.washington.cs.cupid.mylyn.ActiveContextCapability; import edu.washington.cs.cupid.mylyn.InActiveContextCapability; import edu.washington.cs.cupid.mylyn.MylynTaskCapability; +import edu.washington.cs.cupid.mylyn.TaskCommentsCapability; import edu.washington.cs.cupid.mylyn.TaskContextCapability; import edu.washington.cs.cupid.mylyn.TaskFilter; import edu.washington.cs.cupid.mylyn.TasksForResource; @@ -73,6 +74,7 @@ public void removeChangeListener(ICapabilityChangeListener listener) { @Override public ICapability[] publish() { return new ICapability[]{ + new TaskCommentsCapability(), new MylynTaskCapability(), new TaskContextCapability(), new ActiveContextCapability(), diff --git a/edu.washington.cs.cupid/META-INF/MANIFEST.MF b/edu.washington.cs.cupid/META-INF/MANIFEST.MF index d6b53b3..0588888 100644 --- a/edu.washington.cs.cupid/META-INF/MANIFEST.MF +++ b/edu.washington.cs.cupid/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Cupid Bundle-SymbolicName: edu.washington.cs.cupid;singleton:=true -Bundle-Version: 1.3.4.v20131030-1350 +Bundle-Version: 1.3.4.v20131106-1900 Bundle-Activator: edu.washington.cs.cupid.internal.CupidActivator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/Any.java b/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/Any.java index 70c7866..30d16ef 100644 --- a/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/Any.java +++ b/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/Any.java @@ -16,7 +16,7 @@ public class Any extends LinearCapability, Boolean> { * A capability that indicates whether any of the elements in the collection are true */ public Any() { - super("Any", + super("Any (One or More)", "True if any of the elements are true", new TypeToken>(){}, TypeToken.of(Boolean.class), diff --git a/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/Count.java b/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/Count.java index ba3f324..14596c0 100644 --- a/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/Count.java +++ b/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/Count.java @@ -30,7 +30,7 @@ public final class Count extends GenericLinearCapability, Integ */ public Count() { super( - "Count", + "Count (Number of Elements)", "Count the number of elements in a collection", Flag.PURE); } diff --git a/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/Distinct.java b/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/Distinct.java index 8524120..5925f54 100644 --- a/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/Distinct.java +++ b/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/Distinct.java @@ -32,7 +32,7 @@ public final class Distinct extends GenericLinearCapability, Se */ public Distinct() { super( - "Distinct", + "Distinct (Remove Duplicates)", "Returns the distinct elements in a collection", Flag.PURE); } diff --git a/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/Empty.java b/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/Empty.java index 8c6cb62..56e7120 100644 --- a/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/Empty.java +++ b/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/Empty.java @@ -29,7 +29,7 @@ public final class Empty extends GenericLinearCapability, Boole * A capability that indicates whether or not a collection is empty. */ public Empty() { - super("Empty", + super("Is Empty", "True if the input is empty", Flag.PURE); } diff --git a/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/Last.java b/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/Last.java index 43f4ef2..5517ef3 100644 --- a/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/Last.java +++ b/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/Last.java @@ -31,7 +31,7 @@ public final class Last extends GenericLinearCapability, V> { */ public Last() { super( - "Last", + "Last Element", "Gets the last item in a list", Flag.PURE); } diff --git a/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/Max.java b/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/Max.java index 56487fb..f4f7598 100644 --- a/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/Max.java +++ b/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/Max.java @@ -33,7 +33,7 @@ public final class Max> extends GenericLinearCapability< */ public Max() { super( - "Max", + "Maximum Element", "Get the maximum element in a collection", Flag.PURE); } diff --git a/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/MostFrequent.java b/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/MostFrequent.java index 36e4c3d..8ba306c 100644 --- a/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/MostFrequent.java +++ b/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/MostFrequent.java @@ -37,7 +37,7 @@ public final class MostFrequent extends GenericLinearCapability, V> { */ public MostFrequent() { super( - "Most Frequent", + "Most Frequent Element", "Get the most frequent element in a collection", Flag.PURE); } diff --git a/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/NonEmpty.java b/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/NonEmpty.java index 5a3db0f..0931293 100644 --- a/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/NonEmpty.java +++ b/edu.washington.cs.cupid/src/edu/washington/cs/cupid/standard/NonEmpty.java @@ -30,7 +30,7 @@ public final class NonEmpty extends GenericLinearCapability, Bo */ public NonEmpty() { super( - "NonEmpty", + "Is Non-Empty (Has Elements)", "True if the input is non empty", Flag.PURE); } diff --git a/snapshots/nightly/site.xml b/snapshots/nightly/site.xml index cc7a57c..9ea3793 100644 --- a/snapshots/nightly/site.xml +++ b/snapshots/nightly/site.xml @@ -24,12 +24,12 @@ - - - - + + + +