mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-09-08 19:13:27 +02:00
Warnings elimination
This commit is contained in:
parent
5625cca2ba
commit
26be610ccf
7 changed files with 19 additions and 14 deletions
|
@ -16,9 +16,9 @@ import org.eclipse.swt.widgets.Composite;
|
|||
|
||||
import org.eclipse.cdt.core.settings.model.COutputEntry;
|
||||
import org.eclipse.cdt.core.settings.model.ICExclusionPatternPathEntry;
|
||||
import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
|
||||
import org.eclipse.cdt.core.settings.model.ICOutputEntry;
|
||||
import org.eclipse.cdt.core.settings.model.ICResourceDescription;
|
||||
import org.eclipse.cdt.core.settings.model.ICSettingEntry;
|
||||
|
||||
|
||||
public class CLocationOutputTab extends CLocationTab {
|
||||
|
@ -40,9 +40,9 @@ public class CLocationOutputTab extends CLocationTab {
|
|||
cfgd.getConfiguration().getBuildSetting().setOutputDirectories(out);
|
||||
}
|
||||
public ICExclusionPatternPathEntry newEntry(IPath p, IPath[] ex, boolean isWorkspacePath) {
|
||||
return new COutputEntry(p, ex, isWorkspacePath ? ICLanguageSettingEntry.VALUE_WORKSPACE_PATH : 0);
|
||||
return new COutputEntry(p, ex, isWorkspacePath ? ICSettingEntry.VALUE_WORKSPACE_PATH : 0);
|
||||
}
|
||||
public ICExclusionPatternPathEntry newEntry(IFolder f, IPath[] ex, boolean isWorkspacePath) {
|
||||
return new COutputEntry(f, ex, isWorkspacePath ? ICLanguageSettingEntry.VALUE_WORKSPACE_PATH : 0);
|
||||
return new COutputEntry(f, ex, isWorkspacePath ? ICSettingEntry.VALUE_WORKSPACE_PATH : 0);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -17,8 +17,8 @@ import org.eclipse.swt.widgets.Composite;
|
|||
|
||||
import org.eclipse.cdt.core.settings.model.CSourceEntry;
|
||||
import org.eclipse.cdt.core.settings.model.ICExclusionPatternPathEntry;
|
||||
import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
|
||||
import org.eclipse.cdt.core.settings.model.ICResourceDescription;
|
||||
import org.eclipse.cdt.core.settings.model.ICSettingEntry;
|
||||
import org.eclipse.cdt.core.settings.model.ICSourceEntry;
|
||||
|
||||
public class CLocationSourceTab extends CLocationTab {
|
||||
|
@ -29,10 +29,10 @@ public class CLocationSourceTab extends CLocationTab {
|
|||
}
|
||||
|
||||
public ICExclusionPatternPathEntry newEntry(IPath p, IPath[] ex, boolean isWorkspacePath) {
|
||||
return new CSourceEntry(p, ex, isWorkspacePath ? ICLanguageSettingEntry.VALUE_WORKSPACE_PATH : 0);
|
||||
return new CSourceEntry(p, ex, isWorkspacePath ? ICSettingEntry.VALUE_WORKSPACE_PATH : 0);
|
||||
}
|
||||
public ICExclusionPatternPathEntry newEntry(IFolder f, IPath[] ex, boolean isWorkspacePath) {
|
||||
return new CSourceEntry(f, ex, isWorkspacePath ? ICLanguageSettingEntry.VALUE_WORKSPACE_PATH : 0);
|
||||
return new CSourceEntry(f, ex, isWorkspacePath ? ICSettingEntry.VALUE_WORKSPACE_PATH : 0);
|
||||
}
|
||||
public ICExclusionPatternPathEntry[] getEntries(ICResourceDescription cfgd) {
|
||||
return cfgd.getConfiguration().getSourceEntries();
|
||||
|
|
|
@ -12,13 +12,14 @@ package org.eclipse.cdt.ui.newui;
|
|||
|
||||
import org.eclipse.cdt.core.settings.model.CIncludePathEntry;
|
||||
import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
|
||||
import org.eclipse.cdt.core.settings.model.ICSettingEntry;
|
||||
|
||||
public class ExpIncludeTab extends AbstractExportTab {
|
||||
|
||||
public ICLanguageSettingEntry doAdd(String s1, String s2) {
|
||||
int flags = 0;
|
||||
if (s1.equals(s2))
|
||||
flags = ICLanguageSettingEntry.VALUE_WORKSPACE_PATH;
|
||||
flags = ICSettingEntry.VALUE_WORKSPACE_PATH;
|
||||
return new CIncludePathEntry(s2, flags);
|
||||
}
|
||||
|
||||
|
@ -26,6 +27,6 @@ public class ExpIncludeTab extends AbstractExportTab {
|
|||
return doAdd(s1, s2);
|
||||
}
|
||||
|
||||
public int getKind() { return ICLanguageSettingEntry.INCLUDE_PATH; }
|
||||
public int getKind() { return ICSettingEntry.INCLUDE_PATH; }
|
||||
public boolean hasValues() { return false; }
|
||||
}
|
||||
|
|
|
@ -15,6 +15,7 @@ import org.eclipse.cdt.core.resources.IPathEntryStoreListener;
|
|||
import org.eclipse.cdt.core.resources.PathEntryStoreChangedEvent;
|
||||
import org.eclipse.cdt.core.settings.model.CLibraryPathEntry;
|
||||
import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
|
||||
import org.eclipse.cdt.core.settings.model.ICSettingEntry;
|
||||
|
||||
public class ExpLibraryPathTab extends AbstractExportTab implements IPathEntryStoreListener {
|
||||
IPathEntryStore fStore;
|
||||
|
@ -25,7 +26,7 @@ public class ExpLibraryPathTab extends AbstractExportTab implements IPathEntrySt
|
|||
|
||||
public ICLanguageSettingEntry doAdd(String s1, String s2) {
|
||||
int flags = 0;
|
||||
if (s1.equals(s2)) flags = ICLanguageSettingEntry.VALUE_WORKSPACE_PATH;
|
||||
if (s1.equals(s2)) flags = ICSettingEntry.VALUE_WORKSPACE_PATH;
|
||||
return new CLibraryPathEntry(s2, flags);
|
||||
}
|
||||
|
||||
|
@ -33,6 +34,6 @@ public class ExpLibraryPathTab extends AbstractExportTab implements IPathEntrySt
|
|||
return doAdd(s1, s2);
|
||||
}
|
||||
|
||||
public int getKind() { return ICLanguageSettingEntry.LIBRARY_PATH; }
|
||||
public int getKind() { return ICSettingEntry.LIBRARY_PATH; }
|
||||
public boolean hasValues() { return false; }
|
||||
}
|
||||
|
|
|
@ -15,6 +15,7 @@ import org.eclipse.cdt.core.resources.IPathEntryStoreListener;
|
|||
import org.eclipse.cdt.core.resources.PathEntryStoreChangedEvent;
|
||||
import org.eclipse.cdt.core.settings.model.CLibraryFileEntry;
|
||||
import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
|
||||
import org.eclipse.cdt.core.settings.model.ICSettingEntry;
|
||||
|
||||
public class ExpLibraryTab extends AbstractExportTab implements IPathEntryStoreListener {
|
||||
IPathEntryStore fStore;
|
||||
|
@ -25,7 +26,7 @@ public class ExpLibraryTab extends AbstractExportTab implements IPathEntryStoreL
|
|||
|
||||
public ICLanguageSettingEntry doAdd(String s1, String s2) {
|
||||
int flags = 0;
|
||||
if (s1.equals(s2)) flags = ICLanguageSettingEntry.VALUE_WORKSPACE_PATH;
|
||||
if (s1.equals(s2)) flags = ICSettingEntry.VALUE_WORKSPACE_PATH;
|
||||
return new CLibraryFileEntry(s2, flags);
|
||||
}
|
||||
|
||||
|
@ -33,7 +34,7 @@ public class ExpLibraryTab extends AbstractExportTab implements IPathEntryStoreL
|
|||
return doAdd(s1, s2);
|
||||
}
|
||||
|
||||
public int getKind() { return ICLanguageSettingEntry.LIBRARY_FILE; }
|
||||
public int getKind() { return ICSettingEntry.LIBRARY_FILE; }
|
||||
public boolean hasValues() { return false; }
|
||||
}
|
||||
|
||||
|
|
|
@ -12,6 +12,7 @@ package org.eclipse.cdt.ui.newui;
|
|||
|
||||
import org.eclipse.cdt.core.settings.model.CMacroEntry;
|
||||
import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
|
||||
import org.eclipse.cdt.core.settings.model.ICSettingEntry;
|
||||
|
||||
public class ExpSymbolTab extends AbstractExportTab {
|
||||
|
||||
|
@ -23,6 +24,6 @@ public class ExpSymbolTab extends AbstractExportTab {
|
|||
return doAdd(s1, s2);
|
||||
}
|
||||
|
||||
public int getKind() { return ICLanguageSettingEntry.MACRO; }
|
||||
public int getKind() { return ICSettingEntry.MACRO; }
|
||||
public boolean hasValues() { return true; }
|
||||
}
|
||||
|
|
|
@ -15,6 +15,7 @@ import org.eclipse.swt.widgets.TableColumn;
|
|||
|
||||
import org.eclipse.cdt.core.settings.model.CMacroEntry;
|
||||
import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
|
||||
import org.eclipse.cdt.core.settings.model.ICSettingEntry;
|
||||
|
||||
public class SymbolTab extends AbstractLangsListTab {
|
||||
|
||||
|
@ -49,5 +50,5 @@ public class SymbolTab extends AbstractLangsListTab {
|
|||
return null;
|
||||
}
|
||||
|
||||
public int getKind() { return ICLanguageSettingEntry.MACRO; }
|
||||
public int getKind() { return ICSettingEntry.MACRO; }
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue