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-serv28475/src_completions/org/python/pydev/editor/codecompletion/revisited/javaintegration
Modified Files:
JavaProjectModulesManager.java AbstractJavaClassModule.java
Log Message:
Created structure to help dealing with imports in files, even if the file does not have a correct AST
Refactor: Moved methods from FullRepIterable to StringUtils
Index: AbstractJavaClassModule.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited/javaintegration/AbstractJavaClassModule.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AbstractJavaClassModule.java 14 Mar 2008 00:59:04 -0000 1.5
--- AbstractJavaClassModule.java 18 May 2008 20:02:16 -0000 1.6
***************
*** 23,26 ****
--- 23,27 ----
import org.python.pydev.core.IToken;
import org.python.pydev.core.Tuple;
+ import org.python.pydev.core.docutils.StringUtils;
import org.python.pydev.editor.actions.PyAction;
import org.python.pydev.editor.codecompletion.revisited.modules.AbstractModule;
***************
*** 262,266 ****
//to check if we're able to find modules with that name. If a module with that name is found, that means that
//we actually have a java class.
! String[] splitted = FullRepIterable.dotSplit(state.getActivationToken());
StringBuffer modNameBuf = new StringBuffer(this.getName());
IModule validModule = null;
--- 263,267 ----
//to check if we're able to find modules with that name. If a module with that name is found, that means that
//we actually have a java class.
! String[] splitted = StringUtils.dotSplit(state.getActivationToken());
StringBuffer modNameBuf = new StringBuffer(this.getName());
IModule validModule = null;
Index: JavaProjectModulesManager.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited/javaintegration/JavaProjectModulesManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** JavaProjectModulesManager.java 5 May 2008 01:31:22 -0000 1.10
--- JavaProjectModulesManager.java 18 May 2008 20:02:16 -0000 1.11
***************
*** 30,33 ****
--- 30,34 ----
import org.python.pydev.core.ModulesKey;
import org.python.pydev.core.Tuple;
+ import org.python.pydev.core.docutils.StringUtils;
/**
***************
*** 124,128 ****
public boolean accept(String elementName, IPackageFragmentRoot packageRoot, IJavaElement javaElement) {
! for (String mod : FullRepIterable.dotSplit(elementName)) {
if(mod.toLowerCase().startsWith(partStartingWithLowerCase)){
ret.add(elementName);
--- 125,129 ----
public boolean accept(String elementName, IPackageFragmentRoot packageRoot, IJavaElement javaElement) {
! for (String mod : StringUtils.dotSplit(elementName)) {
if(mod.toLowerCase().startsWith(partStartingWithLowerCase)){
ret.add(elementName);
|
