|
Lines 631-644
Link Here
|
| 631 |
if (!doStarImport || currDecl.isOnDemand() || (onDemandConflicts != null && onDemandConflicts.contains(currDecl.getSimpleName()))) { |
631 |
if (!doStarImport || currDecl.isOnDemand() || (onDemandConflicts != null && onDemandConflicts.contains(currDecl.getSimpleName()))) { |
| 632 |
String str= getNewImportString(currDecl.getElementName(), isStatic, lineDelim); |
632 |
String str= getNewImportString(currDecl.getElementName(), isStatic, lineDelim); |
| 633 |
stringsToInsert.add(str); |
633 |
stringsToInsert.add(str); |
|
|
634 |
} else if (doStarImport && !currDecl.isOnDemand()) { |
| 635 |
String simpleName = currDecl.getTypeQualifiedName(); |
| 636 |
if (simpleName.indexOf('.') != -1) { |
| 637 |
String str= getNewImportString(currDecl.getElementName(), isStatic, lineDelim); |
| 638 |
if (stringsToInsert.indexOf(str) == -1) { |
| 639 |
stringsToInsert.add(str); |
| 640 |
} |
| 641 |
} |
| 634 |
} |
642 |
} |
| 635 |
} else { |
643 |
} else if (!doStarImport || currDecl.isOnDemand() || onDemandConflicts == null || onDemandConflicts.contains(currDecl.getSimpleName())) { |
| 636 |
if (!doStarImport || currDecl.isOnDemand() || onDemandConflicts == null || onDemandConflicts.contains(currDecl.getSimpleName())) { |
644 |
int offset= region.getOffset(); |
| 637 |
int offset= region.getOffset(); |
645 |
removeAndInsertNew(buffer, currPos, offset, stringsToInsert, resEdit); |
| 638 |
removeAndInsertNew(buffer, currPos, offset, stringsToInsert, resEdit); |
646 |
stringsToInsert.clear(); |
| 639 |
stringsToInsert.clear(); |
647 |
currPos= offset + region.getLength(); |
| 640 |
currPos= offset + region.getLength(); |
|
|
| 641 |
} |
| 642 |
} |
648 |
} |
| 643 |
} |
649 |
} |
| 644 |
} |
650 |
} |
