mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-10 17:55:39 +02:00
Code Issues Wiki Activity

compilation warnings

Browse source
This commit is contained in:
Andrew Gvozdev 2010-05-04 05:05:09 +00:00
parent ea4c22620a
commit 12eb24805f
1 changed files with 55 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

123
build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/DiscoveredPathContainerPage.java
View file

@ -16,6 +16,7 @@ import java.util.Iterator;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.CoreModel;
@ -46,6 +47,7 @@ import org.eclipse.cdt.make.internal.ui.scannerconfig.DiscoveredElementLabelProv
import org.eclipse.cdt.make.internal.ui.scannerconfig.DiscoveredElementSorter; import org.eclipse.cdt.make.internal.ui.scannerconfig.DiscoveredElementSorter;
import org.eclipse.cdt.ui.wizards.IPathEntryContainerPage; import org.eclipse.cdt.ui.wizards.IPathEntryContainerPage;
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IPath;
import org.eclipse.jface.action.Action; import org.eclipse.jface.action.Action;
@ -113,10 +115,10 @@ public class DiscoveredPathContainerPage extends WizardPage implements IPathEntr
private ICProject fCProject; private ICProject fCProject;
private IContainerEntry fPathEntry; private IContainerEntry fPathEntry;
private TreeListDialogField fDiscoveredContainerList; private TreeListDialogField<DiscoveredElement> fDiscoveredContainerList;
private IDiscoveredPathInfo info = null; private IDiscoveredPathInfo info = null;
private boolean dirty; private boolean dirty;
private List deletedEntries; private List<DiscoveredElement> deletedEntries;
private CopyTextAction copyTextAction; private CopyTextAction copyTextAction;
private HandlerSubmission submission; private HandlerSubmission submission;
@ -139,14 +141,14 @@ public class DiscoveredPathContainerPage extends WizardPage implements IPathEntr
DiscoveredContainerAdapter adapter = new DiscoveredContainerAdapter(); DiscoveredContainerAdapter adapter = new DiscoveredContainerAdapter();
fDiscoveredContainerList = new TreeListDialogField(adapter, buttonLabels, new DiscoveredElementLabelProvider()); fDiscoveredContainerList = new TreeListDialogField<DiscoveredElement>(adapter, buttonLabels, new DiscoveredElementLabelProvider());
fDiscoveredContainerList.setDialogFieldListener(adapter); fDiscoveredContainerList.setDialogFieldListener(adapter);
fDiscoveredContainerList.setLabelText(MakeUIPlugin.getResourceString(CONTAINER_LIST_LABEL)); //$NON-NLS-1$ fDiscoveredContainerList.setLabelText(MakeUIPlugin.getResourceString(CONTAINER_LIST_LABEL));
fDiscoveredContainerList.setTreeExpansionLevel(2); fDiscoveredContainerList.setTreeExpansionLevel(2);
fDiscoveredContainerList.setViewerSorter(new DiscoveredElementSorter()); fDiscoveredContainerList.setViewerSorter(new DiscoveredElementSorter());
dirty = false; dirty = false;
deletedEntries = new ArrayList(); deletedEntries = new ArrayList<DiscoveredElement>();
} }
/* (non-Javadoc) /* (non-Javadoc)
@ -185,13 +187,10 @@ public class DiscoveredPathContainerPage extends WizardPage implements IPathEntr
IScannerInfoCollector collector = profileInstance.getScannerInfoCollector(); IScannerInfoCollector collector = profileInstance.getScannerInfoCollector();
if (collector instanceof IScannerInfoCollectorCleaner) { if (collector instanceof IScannerInfoCollectorCleaner) {
IScannerInfoCollectorCleaner collectorUtil = (IScannerInfoCollectorCleaner) collector; IScannerInfoCollectorCleaner collectorUtil = (IScannerInfoCollectorCleaner) collector;
boolean exitLoop = false; for (DiscoveredElement elem : deletedEntries) {
for (Iterator i = deletedEntries.iterator(); i.hasNext() && !exitLoop; ) {
DiscoveredElement elem = (DiscoveredElement) i.next();
switch (elem.getEntryKind()) { switch (elem.getEntryKind()) {
case DiscoveredElement.CONTAINER: case DiscoveredElement.CONTAINER:
collectorUtil.deleteAll(project); collectorUtil.deleteAll(project);
exitLoop = true;
break; break;
case DiscoveredElement.PATHS_GROUP: case DiscoveredElement.PATHS_GROUP:
collectorUtil.deleteAllPaths(project); collectorUtil.deleteAllPaths(project);
@ -213,8 +212,8 @@ public class DiscoveredPathContainerPage extends WizardPage implements IPathEntr
if (info instanceof IPerProjectDiscoveredPathInfo) { if (info instanceof IPerProjectDiscoveredPathInfo) {
IPerProjectDiscoveredPathInfo projectPathInfo = (IPerProjectDiscoveredPathInfo) info; IPerProjectDiscoveredPathInfo projectPathInfo = (IPerProjectDiscoveredPathInfo) info;
LinkedHashMap includes = new LinkedHashMap(); LinkedHashMap<String, Boolean> includes = new LinkedHashMap<String, Boolean>();
LinkedHashMap symbols = new LinkedHashMap(); LinkedHashMap<String, SymbolEntry> symbols = new LinkedHashMap<String, SymbolEntry>();
DiscoveredElement container = (DiscoveredElement) fDiscoveredContainerList.getElement(0); DiscoveredElement container = (DiscoveredElement) fDiscoveredContainerList.getElement(0);
if (container != null && container.getEntryKind() == DiscoveredElement.CONTAINER) { if (container != null && container.getEntryKind() == DiscoveredElement.CONTAINER) {
@ -255,7 +254,7 @@ public class DiscoveredPathContainerPage extends WizardPage implements IPathEntr
try { try {
// update scanner configuration // update scanner configuration
List resourceDelta = new ArrayList(1); List<IResource> resourceDelta = new ArrayList<IResource>(1);
resourceDelta.add(fCProject.getProject()); resourceDelta.add(fCProject.getProject());
MakeCorePlugin.getDefault().getDiscoveryManager().updateDiscoveredInfo(info, resourceDelta); MakeCorePlugin.getDefault().getDiscoveryManager().updateDiscoveredInfo(info, resourceDelta);
return true; return true;
@ -280,20 +279,16 @@ public class DiscoveredPathContainerPage extends WizardPage implements IPathEntr
fPathEntry = containerEntry; fPathEntry = containerEntry;
} }
else { else {
fPathEntry = CoreModel.newContainerEntry(DiscoveredPathContainer.CONTAINER_ID); fPathEntry = CoreModel.newContainerEntry(DiscoveredPathContainer.CONTAINER_ID);
} }
if (fPathEntry != null) { if (fPathEntry != null) {
DiscoveredElement element = populateDiscoveredElements(fPathEntry); DiscoveredElement element = populateDiscoveredElements(fPathEntry);
ArrayList elements = new ArrayList(); ArrayList<DiscoveredElement> elements = new ArrayList<DiscoveredElement>();
elements.add(element); elements.add(element);
fDiscoveredContainerList.addElements(elements); fDiscoveredContainerList.addElements(elements);
} }
} }
/**
* @param pathEntry
* @return
*/
private DiscoveredElement populateDiscoveredElements(IContainerEntry pathEntry) { private DiscoveredElement populateDiscoveredElements(IContainerEntry pathEntry) {
DiscoveredElement container = null; DiscoveredElement container = null;
try { try {
@ -307,26 +302,26 @@ public class DiscoveredPathContainerPage extends WizardPage implements IPathEntr
if (info instanceof IPerProjectDiscoveredPathInfo) { if (info instanceof IPerProjectDiscoveredPathInfo) {
IPerProjectDiscoveredPathInfo projectPathInfo = (IPerProjectDiscoveredPathInfo) info; IPerProjectDiscoveredPathInfo projectPathInfo = (IPerProjectDiscoveredPathInfo) info;
// get include paths // get include paths
LinkedHashMap paths = projectPathInfo.getIncludeMap(); LinkedHashMap<String, Boolean> paths = projectPathInfo.getIncludeMap();
for (Iterator i = paths.keySet().iterator(); i.hasNext(); ) { Set<String> includesKeySet = paths.keySet();
String include = (String) i.next(); for (String include : includesKeySet) {
Boolean removed = (Boolean) paths.get(include); Boolean removed = paths.get(include);
removed = (removed == null) ? Boolean.FALSE : removed; removed = (removed == null) ? Boolean.FALSE : removed;
DiscoveredElement.createNew(container, fCProject.getProject(), include, DiscoveredElement.createNew(container, fCProject.getProject(), include,
DiscoveredElement.INCLUDE_PATH, removed.booleanValue(), false); DiscoveredElement.INCLUDE_PATH, removed.booleanValue(), false);
} }
// get defined symbols // get defined symbols
LinkedHashMap symbols = projectPathInfo.getSymbolMap(); LinkedHashMap<String, SymbolEntry> symbols = projectPathInfo.getSymbolMap();
for (Iterator i = symbols.keySet().iterator(); i.hasNext(); ) { Set<String> symbolsKeySet = symbols.keySet();
String symbol = (String) i.next(); for (String symbol : symbolsKeySet) {
SymbolEntry se = (SymbolEntry) symbols.get(symbol); SymbolEntry se = symbols.get(symbol);
for (Iterator j = se.getActiveRaw().iterator(); j.hasNext();) { List<String> activeValues = se.getActiveRaw();
String value = (String) j.next(); for (String value : activeValues) {
DiscoveredElement.createNew(container, fCProject.getProject(), value, DiscoveredElement.createNew(container, fCProject.getProject(), value,
DiscoveredElement.SYMBOL_DEFINITION, false, false); DiscoveredElement.SYMBOL_DEFINITION, false, false);
} }
for (Iterator j = se.getRemovedRaw().iterator(); j.hasNext();) { List<String> removedValues = se.getRemovedRaw();
String value = (String) j.next(); for (String value : removedValues) {
DiscoveredElement.createNew(container, fCProject.getProject(), value, DiscoveredElement.createNew(container, fCProject.getProject(), value,
DiscoveredElement.SYMBOL_DEFINITION, true, false); DiscoveredElement.SYMBOL_DEFINITION, true, false);
} }
@ -342,25 +337,25 @@ public class DiscoveredPathContainerPage extends WizardPage implements IPathEntr
DiscoveredElement.INCLUDE_PATH, false, false); DiscoveredElement.INCLUDE_PATH, false, false);
} }
// get defined symbols // get defined symbols
Map symbols = filePathInfo.getSymbols(); Map<String, String> symbols = filePathInfo.getSymbols();
for (Iterator iter = symbols.keySet().iterator(); iter.hasNext();) { Set<String> symbolsKeySet = symbols.keySet();
String key = (String) iter.next(); for (String key : symbolsKeySet) {
String value = (String) symbols.get(key); String value = symbols.get(key);
String symbol = (value != null && value.length() > 0) ? key + "=" + value : key; //$NON-NLS-1$ String symbol = (value != null && value.length() > 0) ? key + "=" + value : key; //$NON-NLS-1$
DiscoveredElement.createNew(container, fCProject.getProject(), symbol, DiscoveredElement.createNew(container, fCProject.getProject(), symbol,
DiscoveredElement.SYMBOL_DEFINITION, false, false); DiscoveredElement.SYMBOL_DEFINITION, false, false);
} }
// get include files // get include files
IPath[] includeFiles = filePathInfo.getIncludeFiles(fCProject.getPath()); IPath[] includeFiles = filePathInfo.getIncludeFiles(fCProject.getPath());
for (int i = 0; i < includeFiles.length; i++) { for (IPath incFile : includeFiles) {
String includeFile = includeFiles[i].toPortableString(); String includeFile = incFile.toPortableString();
DiscoveredElement.createNew(container, fCProject.getProject(), includeFile, DiscoveredElement.createNew(container, fCProject.getProject(), includeFile,
DiscoveredElement.INCLUDE_FILE, false, false); DiscoveredElement.INCLUDE_FILE, false, false);
} }
// get macros files // get macros files
IPath[] macrosFiles = filePathInfo.getMacroFiles(fCProject.getPath()); IPath[] macrosFiles = filePathInfo.getMacroFiles(fCProject.getPath());
for (int i = 0; i < macrosFiles.length; i++) { for (IPath macrosFilePath : macrosFiles) {
String macrosFile = macrosFiles[i].toPortableString(); String macrosFile = macrosFilePath.toPortableString();
DiscoveredElement.createNew(container, fCProject.getProject(), macrosFile, DiscoveredElement.createNew(container, fCProject.getProject(), macrosFile,
DiscoveredElement.MACROS_FILE, false, false); DiscoveredElement.MACROS_FILE, false, false);
} }
@ -452,7 +447,7 @@ public class DiscoveredPathContainerPage extends WizardPage implements IPathEntr
/** /**
* @author vhirsl * @author vhirsl
*/ */
private class DiscoveredContainerAdapter implements IDialogFieldListener, ITreeListAdapter { private class DiscoveredContainerAdapter implements IDialogFieldListener, ITreeListAdapter<DiscoveredElement> {
private final Object[] EMPTY_ARR = new Object[0]; private final Object[] EMPTY_ARR = new Object[0];
// ---------- IDialogFieldListener -------- // ---------- IDialogFieldListener --------
@ -468,14 +463,14 @@ public class DiscoveredPathContainerPage extends WizardPage implements IPathEntr
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter#customButtonPressed(org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField, int) * @see org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter#customButtonPressed(org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField, int)
*/ */
public void customButtonPressed(TreeListDialogField field, int index) { public void customButtonPressed(TreeListDialogField<DiscoveredElement> field, int index) {
containerPageCustomButtonPressed(field, index); containerPageCustomButtonPressed(field, index);
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter#selectionChanged(org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField) * @see org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter#selectionChanged(org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField)
*/ */
public void selectionChanged(TreeListDialogField field) { public void selectionChanged(TreeListDialogField<DiscoveredElement> field) {
if (copyTextAction != null) { if (copyTextAction != null) {
copyTextAction.canBeApplied(field.getSelectedElements()); copyTextAction.canBeApplied(field.getSelectedElements());
} }
@ -485,7 +480,7 @@ public class DiscoveredPathContainerPage extends WizardPage implements IPathEntr
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter#doubleClicked(org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField) * @see org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter#doubleClicked(org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField)
*/ */
public void doubleClicked(TreeListDialogField field) { public void doubleClicked(TreeListDialogField<DiscoveredElement> field) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
@ -493,7 +488,7 @@ public class DiscoveredPathContainerPage extends WizardPage implements IPathEntr
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter#keyPressed(org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField, org.eclipse.swt.events.KeyEvent) * @see org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter#keyPressed(org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField, org.eclipse.swt.events.KeyEvent)
*/ */
public void keyPressed(TreeListDialogField field, KeyEvent event) { public void keyPressed(TreeListDialogField<DiscoveredElement> field, KeyEvent event) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
@ -501,7 +496,7 @@ public class DiscoveredPathContainerPage extends WizardPage implements IPathEntr
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter#getChildren(org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField, java.lang.Object) * @see org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter#getChildren(org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField, java.lang.Object)
*/ */
public Object[] getChildren(TreeListDialogField field, Object element) { public Object[] getChildren(TreeListDialogField<DiscoveredElement> field, Object element) {
if (element instanceof DiscoveredElement) { if (element instanceof DiscoveredElement) {
DiscoveredElement elem = (DiscoveredElement) element; DiscoveredElement elem = (DiscoveredElement) element;
return elem.getChildren(); return elem.getChildren();
@ -512,7 +507,7 @@ public class DiscoveredPathContainerPage extends WizardPage implements IPathEntr
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter#getParent(org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField, java.lang.Object) * @see org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter#getParent(org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField, java.lang.Object)
*/ */
public Object getParent(TreeListDialogField field, Object element) { public Object getParent(TreeListDialogField<DiscoveredElement> field, Object element) {
if (element instanceof DiscoveredElement) { if (element instanceof DiscoveredElement) {
DiscoveredElement elem = (DiscoveredElement) element; DiscoveredElement elem = (DiscoveredElement) element;
return elem.getParent(); return elem.getParent();
@ -523,7 +518,7 @@ public class DiscoveredPathContainerPage extends WizardPage implements IPathEntr
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter#hasChildren(org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField, java.lang.Object) * @see org.eclipse.cdt.internal.ui.wizards.dialogfields.ITreeListAdapter#hasChildren(org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField, java.lang.Object)
*/ */
public boolean hasChildren(TreeListDialogField field, Object element) { public boolean hasChildren(TreeListDialogField<DiscoveredElement> field, Object element) {
if (element instanceof DiscoveredElement) { if (element instanceof DiscoveredElement) {
DiscoveredElement elem = (DiscoveredElement) element; DiscoveredElement elem = (DiscoveredElement) element;
return elem.hasChildren(); return elem.hasChildren();
@ -532,11 +527,7 @@ public class DiscoveredPathContainerPage extends WizardPage implements IPathEntr
} }
} }
/** private void containerPageCustomButtonPressed(TreeListDialogField<DiscoveredElement> field, int index) {
* @param field
* @param index
*/
private void containerPageCustomButtonPressed(TreeListDialogField field, int index) {
switch (index) { switch (index) {
case IDX_UP: case IDX_UP:
/* move entry up */ /* move entry up */
@ -567,13 +558,13 @@ public class DiscoveredPathContainerPage extends WizardPage implements IPathEntr
private boolean moveUp() { private boolean moveUp() {
boolean rc = false; boolean rc = false;
List selElements = fDiscoveredContainerList.getSelectedElements(); List<Object> selElements = fDiscoveredContainerList.getSelectedElements();
for (Iterator i = selElements.iterator(); i.hasNext(); ) { for (Iterator<Object> i = selElements.iterator(); i.hasNext(); ) {
DiscoveredElement elem = (DiscoveredElement) i.next(); DiscoveredElement elem = (DiscoveredElement) i.next();
DiscoveredElement parent = elem.getParent(); DiscoveredElement parent = elem.getParent();
DiscoveredElement[] children = parent.getChildren(); DiscoveredElement[] children = parent.getChildren();
for (int j = 0; j < children.length; ++j) { for (int j = 0; j < children.length; ++j) {
DiscoveredElement child = (DiscoveredElement) children[j]; DiscoveredElement child = children[j];
if (elem.equals(child)) { if (elem.equals(child)) {
int prevIndex = j - 1; int prevIndex = j - 1;
if (prevIndex >= 0) { if (prevIndex >= 0) {
@ -593,15 +584,15 @@ public class DiscoveredPathContainerPage extends WizardPage implements IPathEntr
private boolean moveDown() { private boolean moveDown() {
boolean rc = false; boolean rc = false;
List selElements = fDiscoveredContainerList.getSelectedElements(); List<Object> selElements = fDiscoveredContainerList.getSelectedElements();
List revSelElements = new ArrayList(selElements); List<Object> revSelElements = new ArrayList<Object>(selElements);
Collections.reverse(revSelElements); Collections.reverse(revSelElements);
for (Iterator i = revSelElements.iterator(); i.hasNext(); ) { for (Iterator<Object> i = revSelElements.iterator(); i.hasNext(); ) {
DiscoveredElement elem = (DiscoveredElement) i.next(); DiscoveredElement elem = (DiscoveredElement) i.next();
DiscoveredElement parent = elem.getParent(); DiscoveredElement parent = elem.getParent();
DiscoveredElement[] children = parent.getChildren(); DiscoveredElement[] children = parent.getChildren();
for (int j = children.length - 1; j >= 0; --j) { for (int j = children.length - 1; j >= 0; --j) {
DiscoveredElement child = (DiscoveredElement) children[j]; DiscoveredElement child = children[j];
if (elem.equals(child)) { if (elem.equals(child)) {
int prevIndex = j + 1; int prevIndex = j + 1;
if (prevIndex < children.length) { if (prevIndex < children.length) {
@ -619,14 +610,10 @@ public class DiscoveredPathContainerPage extends WizardPage implements IPathEntr
return rc; return rc;
} }
/**
* @param action
* @return
*/
private boolean enableDisableEntry(int action) { private boolean enableDisableEntry(int action) {
boolean rc = false; boolean rc = false;
boolean remove = (action == DO_DISABLE); boolean remove = (action == DO_DISABLE);
List selElements = fDiscoveredContainerList.getSelectedElements(); List<Object> selElements = fDiscoveredContainerList.getSelectedElements();
for (int i = selElements.size() - 1; i >= 0; --i) { for (int i = selElements.size() - 1; i >= 0; --i) {
DiscoveredElement elem = (DiscoveredElement) selElements.get(i); DiscoveredElement elem = (DiscoveredElement) selElements.get(i);
switch (elem.getEntryKind()) { switch (elem.getEntryKind()) {
@ -641,8 +628,8 @@ public class DiscoveredPathContainerPage extends WizardPage implements IPathEntr
private boolean deleteEntry() { private boolean deleteEntry() {
boolean rc = false; boolean rc = false;
List newSelection = new ArrayList(); List<DiscoveredElement> newSelection = new ArrayList<DiscoveredElement>();
List selElements = fDiscoveredContainerList.getSelectedElements(); List<Object> selElements = fDiscoveredContainerList.getSelectedElements();
boolean skipIncludes = false, skipSymbols = false; boolean skipIncludes = false, skipSymbols = false;
for (int i = 0; i < selElements.size(); ++i) { for (int i = 0; i < selElements.size(); ++i) {
DiscoveredElement elem = (DiscoveredElement) selElements.get(i); DiscoveredElement elem = (DiscoveredElement) selElements.get(i);
@ -692,10 +679,10 @@ public class DiscoveredPathContainerPage extends WizardPage implements IPathEntr
if (elem.equals(child)) { if (elem.equals(child)) {
newSelection.clear(); newSelection.clear();
if (j + 1 < children.length) { if (j + 1 < children.length) {
newSelection.add(children[j + 1]); newSelection.add((DiscoveredElement)children[j + 1]);
} }
else if (j - 1 >= 0) { else if (j - 1 >= 0) {
newSelection.add(children[j - 1]); newSelection.add((DiscoveredElement)children[j - 1]);
} }
else { else {
newSelection.add(parent); newSelection.add(parent);
@ -705,7 +692,7 @@ public class DiscoveredPathContainerPage extends WizardPage implements IPathEntr
} }
} }
} }
} }
fDiscoveredContainerList.postSetSelection(new StructuredSelection(newSelection)); fDiscoveredContainerList.postSetSelection(new StructuredSelection(newSelection));
return rc; return rc;
} }