[Pydev-cvs] org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited/javaintegration JavaElementToken.java, 1.3, 1.4 JavaZipModule.java, 1.2, 1.3

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited/javaintegration
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12157/src_completions/org/python/pydev/editor/codecompletion/revisited/javaintegration

Modified Files:
	JavaElementToken.java JavaZipModule.java 
Log Message:
Backwards support for Eclipse 3.2.

Index: JavaElementToken.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited/javaintegration/JavaElementToken.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JavaElementToken.java	14 Jun 2008 22:14:55 -0000	1.3
--- JavaElementToken.java	28 Jun 2008 12:35:38 -0000	1.4
***************
*** 4,7 ****
--- 4,8 ----
  import java.io.Reader;
  import java.io.StringReader;
+ import java.lang.reflect.Method;
  
  import org.eclipse.core.runtime.IProgressMonitor;
***************
*** 15,18 ****
--- 16,20 ----
  import org.eclipse.jface.resource.ImageDescriptor;
  import org.eclipse.swt.graphics.Image;
+ import org.python.pydev.core.REF;
  import org.python.pydev.core.docutils.StringUtils;
  import org.python.pydev.core.structure.FastStringBuffer;
***************
*** 37,40 ****
--- 39,57 ----
      private char[] completionPropsoalSignature;
  
+     /**
+      * Used for backward compatibility to eclipse 3.2
+      */
+     static boolean HAS_ADDITIONAL_FLAGS = true;
+     static{
+     	try{
+     		Method m = REF.findMethod(CompletionProposal.class, "getAdditionalFlags");
+     		if(m == null){
+     			HAS_ADDITIONAL_FLAGS = false;
+     		}
+     	}catch(Throwable e){
+     		HAS_ADDITIONAL_FLAGS = false;
+     	}
+     }
+     
      protected JavaElementToken(String rep, String doc, String args, String parentPackage, int type, IJavaElement javaElement,
              int completionProposalKind, int completionProposalFlags, int completionProposalAdditionalFlags,
***************
*** 50,55 ****
      public JavaElementToken(String rep, String doc, String args, String parentPackage, int type, IJavaElement javaElement,
              CompletionProposal completionProposal) {
!         this(rep, doc, args, parentPackage, type, javaElement, completionProposal.getKind(), completionProposal.getFlags(), 
!                 completionProposal.getAdditionalFlags(), completionProposal.getSignature());
      }
      
--- 67,78 ----
      public JavaElementToken(String rep, String doc, String args, String parentPackage, int type, IJavaElement javaElement,
              CompletionProposal completionProposal) {
!     	super(rep, doc, args, parentPackage, type);
!     	this.javaElement = javaElement;
!     	this.completionProposalKind = completionProposal.getKind();
!     	this.completionProposalFlags = completionProposal.getFlags();
!     	if(HAS_ADDITIONAL_FLAGS){
!     		this.completionProposalAdditionalFlags = completionProposal.getAdditionalFlags();
!     	}
!     	this.completionPropsoalSignature = completionProposal.getSignature();
      }
      
***************
*** 61,65 ****
          CompletionProposal generatedProposal = CompletionProposal.create(completionProposalKind, 0);
          generatedProposal.setFlags(completionProposalFlags);
!         generatedProposal.setAdditionalFlags(completionProposalAdditionalFlags);
          generatedProposal.setDeclarationSignature(completionPropsoalSignature);
          generatedProposal.setSignature(completionPropsoalSignature);
--- 84,90 ----
          CompletionProposal generatedProposal = CompletionProposal.create(completionProposalKind, 0);
          generatedProposal.setFlags(completionProposalFlags);
!         if(HAS_ADDITIONAL_FLAGS){
!         	generatedProposal.setAdditionalFlags(completionProposalAdditionalFlags);
!         }
          generatedProposal.setDeclarationSignature(completionPropsoalSignature);
          generatedProposal.setSignature(completionPropsoalSignature);

Index: JavaZipModule.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited/javaintegration/JavaZipModule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JavaZipModule.java	11 Jan 2008 01:01:18 -0000	1.2
--- JavaZipModule.java	28 Jun 2008 12:35:38 -0000	1.3
***************
*** 149,153 ****
          
          IClasspathEntry entries[] = getClasspathEntries();
!         ICompilationUnit unit = new WorkingCopyOwner(){}.newWorkingCopy(name, entries, new NullProgressMonitor());
          unit.getBuffer().setContents(contents);
          CompletionProposalCollector collector = createCollector(filterCompletionName, ret, unit);
--- 149,154 ----
          
          IClasspathEntry entries[] = getClasspathEntries();
!         //Using old version for compatibility with eclipse 3.2
!         ICompilationUnit unit = new WorkingCopyOwner(){}.newWorkingCopy(name, entries, null, new NullProgressMonitor());
          unit.getBuffer().setContents(contents);
          CompletionProposalCollector collector = createCollector(filterCompletionName, ret, unit);