From: aclement <aclement>
Date: Fri, 5 Aug 2011 16:23:28 +0000 (+0000)
Subject: minimalModel ON by default.  demotion ON by default (for AJDT as well as LTW)
X-Git-Tag: V1_6_12M2~34
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4679b001323a7836a0935ec3a09c4bb40b3f5c57;p=aspectj.git

minimalModel ON by default.  demotion ON by default (for AJDT as well as LTW)
---

diff --git a/ajde/testsrc/org/aspectj/ajde/ExtensionTests.java b/ajde/testsrc/org/aspectj/ajde/ExtensionTests.java
index f2fd49bcf..0a445ba8b 100644
--- a/ajde/testsrc/org/aspectj/ajde/ExtensionTests.java
+++ b/ajde/testsrc/org/aspectj/ajde/ExtensionTests.java
@@ -49,12 +49,12 @@ public class ExtensionTests extends AjcTestCase {
 		CompilationResult result = ajc(baseDir, args);
 		List l = result.getWarningMessages();
 		IMessage m = ((IMessage) l.get(0));
-		assertTrue("Expected ID of message to be " + IProblem.UnusedImport + " (UnusedImport) but found an ID of " + m.getID(), m
-				.getID() == IProblem.UnusedImport);
+		assertTrue("Expected ID of message to be " + IProblem.UnusedImport + " (UnusedImport) but found an ID of " + m.getID(),
+				m.getID() == IProblem.UnusedImport);
 	}
 
 	public void testInnerClassesInASM() {
-		String[] args = new String[] { "InnerClasses.java", "-emacssym" };
+		String[] args = new String[] { "InnerClasses.java", "-emacssym", "-Xset:minimalModel=false" };
 		CompilationResult result = ajc(baseDir, args);
 		/* List l = */result.getWarningMessages();
 		/* Properties p = */AsmManager.lastActiveStructureModel.summarizeModel().getProperties();
@@ -77,8 +77,8 @@ public class ExtensionTests extends AjcTestCase {
 	}
 
 	private IProgramElement getChild(IProgramElement parent, String s) {
-		List kids = parent.getChildren();
-		for (Iterator iter = kids.iterator(); iter.hasNext();) {
+		List<IProgramElement> kids = parent.getChildren();
+		for (Iterator<IProgramElement> iter = kids.iterator(); iter.hasNext();) {
 			IProgramElement element = (IProgramElement) iter.next();
 			if (element.getName().indexOf(s) != -1)
 				return element;