[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/actions PyOrganizeImports.java, 1.18, 1.19

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

Update of /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3384/src/org/python/pydev/editor/actions

Modified Files:
	PyOrganizeImports.java 
Log Message:
Wild imports considered when organizing imports.

Index: PyOrganizeImports.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/PyOrganizeImports.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** PyOrganizeImports.java	15 Jun 2008 13:15:10 -0000	1.18
--- PyOrganizeImports.java	16 Jun 2008 00:55:34 -0000	1.19
***************
*** 321,326 ****
              List<String> commentsForImports = v.getCommentsForImports();
              for(int i=0;i<importedStr.size();i++){
!                 String importedString = importedStr.get(i);
!                 String comment = commentsForImports.get(i);
                  if(comment.length() > 0){
                      importsAndComments.add(new Tuple<String, String>(importedString, comment));
--- 321,331 ----
              List<String> commentsForImports = v.getCommentsForImports();
              for(int i=0;i<importedStr.size();i++){
!                 String importedString = importedStr.get(i).trim();
!                 String comment = commentsForImports.get(i).trim();
!                 boolean isWildImport = importedString.equals("*");
!                 if(isWildImport){
!                     importsAndComments.clear();
!                     importsAndNoComments.clear();
!                 }
                  if(comment.length() > 0){
                      importsAndComments.add(new Tuple<String, String>(importedString, comment));
***************
*** 328,331 ****
--- 333,339 ----
                      importsAndNoComments.add(new Tuple<String, String>(importedString, comment));
                  }
+                 if(isWildImport){
+                     return;
+                 }
              }
          }