Fix regression in CodeCompletionTest.testCompleteCallin7
- part 2: distinguish flags and additionalFlags, conflicted with varargs
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java
index 28d0b8c..5b44c72 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java
@@ -6716,7 +6716,7 @@
 //{ObjectTeams: mark callout-to-field in flags as needed by the CompletionAdaptor:
 					if (   kind == CompletionProposal.OT_CALLOUT_GET
 						|| kind == CompletionProposal.OT_CALLOUT_SET)
-						proposal.setFlags(isOverride ? TerminalTokens.TokenNameCALLOUT_OVERRIDE : TerminalTokens.TokenNameBINDOUT); // pass down for label computation: callout
+						proposal.setAdditionalFlags(isOverride ? TerminalTokens.TokenNameCALLOUT_OVERRIDE : TerminalTokens.TokenNameBINDOUT); // pass down for label computation: callout
 // SH}
 					proposal.setReplaceRange(this.startPosition - this.offset, this.endPosition - this.offset);
 					proposal.setTokenRange(this.tokenStart - this.offset, this.tokenEnd - this.offset);
@@ -8906,9 +8906,9 @@
 //{ObjectTeams: callout?
 				switch (curKind) {
 				case CompletionProposal.OT_CALLOUT_OVERRIDE_DECLARATION:
-					proposal.setFlags(TerminalTokens.TokenNameCALLOUT_OVERRIDE); break;
+					proposal.setAdditionalFlags(TerminalTokens.TokenNameCALLOUT_OVERRIDE); break;
 				case CompletionProposal.OT_CALLOUT_DECLARATION:
-					proposal.setFlags(TerminalTokens.TokenNameBINDOUT); break;
+					proposal.setAdditionalFlags(TerminalTokens.TokenNameBINDOUT); break;
 				}
 // SH}
 				proposal.setReplaceRange(this.startPosition - this.offset, this.endPosition - this.offset);
@@ -9275,10 +9275,10 @@
 //{ObjectTeams: encode kind of method mapping:
 					if (this.currentMethodMapping != null) {
 						if (this.currentMethodMapping.isCallin()) {
-							proposal.setFlags(((CallinMappingDeclaration)this.currentMethodMapping).callinModifier); // pass down for label computation.
+							proposal.setAdditionalFlags(((CallinMappingDeclaration)this.currentMethodMapping).callinModifier); // pass down for label computation.
 						} else {
 							boolean isOverride = ((CalloutMappingDeclaration)this.currentMethodMapping).isCalloutOverride();
-							proposal.setFlags(isOverride ? TerminalTokens.TokenNameCALLOUT_OVERRIDE : TerminalTokens.TokenNameBINDOUT); // pass down for label computation: callout
+							proposal.setAdditionalFlags(isOverride ? TerminalTokens.TokenNameCALLOUT_OVERRIDE : TerminalTokens.TokenNameBINDOUT); // pass down for label computation: callout
 						}
 					}
 // SH}
diff --git a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/assist/CompletionAdaptor.java b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/assist/CompletionAdaptor.java
index 241cef2..bb5f164 100644
--- a/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/assist/CompletionAdaptor.java
+++ b/plugins/org.eclipse.objectteams.otdt.jdt.ui/src/org/eclipse/objectteams/otdt/internal/ui/assist/CompletionAdaptor.java
@@ -190,7 +190,7 @@
 		
 		private IJavaCompletionProposal createRoleProposal(CompletionProposal proposal) {
 			// compute label: image ...
-			int modifiers = proposal.getFlags();			
+			int modifiers = proposal.getAdditionalFlags();			
 			String roleclassImg = Flags.isTeam(modifiers) ? ImageConstants.TEAM_ROLE_IMG : ImageConstants.ROLECLASS_IMG;
 			ImageDescriptor baseDesc = ImageManager.getSharedInstance().getDescriptor(roleclassImg);
 			Image image= getImage(new JavaElementImageDescriptor(baseDesc, JavaElementImageDescriptor.OVERRIDES, JavaElementImageProvider.SMALL_SIZE));
@@ -215,7 +215,7 @@
 				paramTypes[index]= Signature.toString(paramTypes[index]);
 			int length=       getLength(proposal);
 			
-			int bindingModifier = proposal.getFlags();
+			int bindingModifier = proposal.getAdditionalFlags();
 			boolean isCallin= true;
 			boolean isOverride= false;
 			switch(bindingModifier) {