[rejuvenate-pc] r148 committed - Now conforms to new version of AJDT.

[rejuve...@googlecode.com]

Revision: 148
Author: raffi.t.khatchadourian
Date: Tue Mar 16 12:52:17 2010
Log: Now conforms to new version of AJDT.
http://code.google.com/p/rejuvenate-pc/source/detail?r=148

Modified:

/trunk/uk.ac.lancs.comp.khatchad.rejuvenatepc.core/src/uk/ac/lancs/comp/khatchad/rejuvenatepc/core/graph/IntentionGraph.java

/trunk/uk.ac.lancs.comp.khatchad.rejuvenatepc.core/src/uk/ac/lancs/comp/khatchad/rejuvenatepc/core/util/AJUtil.java

/trunk/uk.ac.lancs.comp.khatchad.rejuvenatepc.ui/src/uk/ac/lancs/comp/khatchad/rejuvenatepc/ui/AnalyzePointcutPlugin.java

/trunk/uk.ac.lancs.comp.khatchad.rejuvenatepc.ui/src/uk/ac/lancs/comp/khatchad/rejuvenatepc/ui/RejuvenatePointcutPlugin.java

=======================================
---
/trunk/uk.ac.lancs.comp.khatchad.rejuvenatepc.core/src/uk/ac/lancs/comp/khatchad/rejuvenatepc/core/graph/IntentionGraph.java
Sun Aug 3 07:37:13 2008
+++
/trunk/uk.ac.lancs.comp.khatchad.rejuvenatepc.core/src/uk/ac/lancs/comp/khatchad/rejuvenatepc/core/graph/IntentionGraph.java
Tue Mar 16 12:52:17 2010
@@ -122,20 +122,15 @@
ConversionException {

this.resetAllElements(new SubProgressMonitor(monitor, -1));
-
- final List<AJRelationship> relationshipList = AJUtil
- .getAdviceRelationshipList(advisingElement);
+
+ Collection<IJavaElement> advisedJavaElements =
AJUtil.getAdvisedJavaElements(advisingElement);

monitor.beginTask("Enabling elements according to advice pointcut.",
- relationshipList.size());
-
- for (final AJRelationship relationship : relationshipList) {
-
- if (relationship.getSource().equals(advisingElement)) {
- final IJavaElement target = relationship.getTarget();
- enableElementsAccordingTo(target, new SubProgressMonitor(
- monitor, -1));
- }
+ advisedJavaElements.size());
+
+ for (final IJavaElement advisedElement: advisedJavaElements) {
+ enableElementsAccordingTo(advisedElement, new SubProgressMonitor(
+ monitor, -1));
monitor.worked(1);
}
monitor.done();
=======================================
---
/trunk/uk.ac.lancs.comp.khatchad.rejuvenatepc.core/src/uk/ac/lancs/comp/khatchad/rejuvenatepc/core/util/AJUtil.java
Tue Mar 16 10:07:41 2010
+++
/trunk/uk.ac.lancs.comp.khatchad.rejuvenatepc.core/src/uk/ac/lancs/comp/khatchad/rejuvenatepc/core/util/AJUtil.java
Tue Mar 16 12:52:17 2010
@@ -37,30 +37,16 @@
*
*/
public class AJUtil {
+
private AJUtil() {
}
-
- /**
- * @param advElem
- * @return
- */
- @SuppressWarnings( { "restriction", "unchecked" })
- public static List<AJRelationship> getAdviceRelationshipList(
- final AdviceElement advElem) {
- final IProject proj = advElem.getJavaProject().getProject();
- final List<AJRelationship> relationshipList = AJModel
- .getInstance()
- .getAllRelationships(
- proj,
- new AJRelationshipType[] { AJRelationshipManager.ADVISES });
- return relationshipList;
- }

/**
* @param advElem
* @return
* @throws JavaModelException
*/
+ @SuppressWarnings("unchecked")
public static Set<IJavaElement> getAdvisedJavaElements(AdviceElement
advElem)
throws JavaModelException {
Set<IJavaElement> ret = new LinkedHashSet<IJavaElement>();
=======================================
---
/trunk/uk.ac.lancs.comp.khatchad.rejuvenatepc.ui/src/uk/ac/lancs/comp/khatchad/rejuvenatepc/ui/AnalyzePointcutPlugin.java
Wed Jan 20 10:00:58 2010
+++
/trunk/uk.ac.lancs.comp.khatchad.rejuvenatepc.ui/src/uk/ac/lancs/comp/khatchad/rejuvenatepc/ui/AnalyzePointcutPlugin.java
Tue Mar 16 12:52:17 2010
@@ -98,18 +98,18 @@
}
finally {
this.closeConnections();
- PostMan.postMail("Done", "Done", "khat...@cse.ohio-state.edu",
- "khat...@cse.ohio-state.edu");
- if (System.getProperty("os.name").equalsIgnoreCase("Mac OS X"))
- try {
- Runtime.getRuntime().exec(
- "/usr/local/bin/growlnotify -n Eclipse -a Eclipse -m "
- + this.getClass().getSimpleName()
- + " is done");
- }
- catch (final IOException e) {
- System.err.println("Can't send notification.");
- }
+// PostMan.postMail("Done", "Done", "khat...@cse.ohio-state.edu",
+// "khat...@cse.ohio-state.edu");
+// if (System.getProperty("os.name").equalsIgnoreCase("Mac OS X"))
+// try {
+// Runtime.getRuntime().exec(
+// "/usr/local/bin/growlnotify -n Eclipse -a Eclipse -m "
+// + this.getClass().getSimpleName()
+// + " is done");
+// }
+// catch (final IOException e) {
+// System.err.println("Can't send notification.");
+// }
}
}

=======================================
---
/trunk/uk.ac.lancs.comp.khatchad.rejuvenatepc.ui/src/uk/ac/lancs/comp/khatchad/rejuvenatepc/ui/RejuvenatePointcutPlugin.java
Sat Mar 13 13:10:51 2010
+++
/trunk/uk.ac.lancs.comp.khatchad.rejuvenatepc.ui/src/uk/ac/lancs/comp/khatchad/rejuvenatepc/ui/RejuvenatePointcutPlugin.java
Tue Mar 16 12:52:17 2010
@@ -97,7 +97,7 @@
emailMessage.append(average + '\n');
}

- PostMan.postMail("Rejuvenation complete.",
emailMessage.toString(), "khat...@cse.ohio-state.edu", "khat...@cse.ohio-state.edu");
+// PostMan.postMail("Rejuvenation complete.",
emailMessage.toString(), "khat...@cse.ohio-state.edu", "khat...@cse.ohio-state.edu");
monitor.done();
}