mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
@Override annotations + organize imports + unnecessary
casts/$NON-NLS + trailing white spaces
This commit is contained in:
parent
10dd44163a
commit
ba7591a95b
11 changed files with 480 additions and 464 deletions
|
@ -99,6 +99,7 @@ public final class GCCBuildCommandParserOptionPage extends AbstractLanguageSetti
|
|||
inputCommand.setEnabled(fEditable);
|
||||
|
||||
inputCommand.addModifyListener(new ModifyListener() {
|
||||
@Override
|
||||
public void modifyText(ModifyEvent e) {
|
||||
String text = inputCommand.getText();
|
||||
AbstractBuildCommandParser provider = getRawProvider();
|
||||
|
|
|
@ -30,7 +30,6 @@ import org.eclipse.swt.layout.GridData;
|
|||
import org.eclipse.swt.layout.GridLayout;
|
||||
import org.eclipse.swt.widgets.Button;
|
||||
import org.eclipse.swt.widgets.Composite;
|
||||
import org.eclipse.swt.widgets.Group;
|
||||
import org.eclipse.swt.widgets.Label;
|
||||
import org.eclipse.swt.widgets.Text;
|
||||
|
||||
|
@ -89,6 +88,7 @@ public final class BuiltinSpecsDetectorOptionPage extends AbstractLanguageSettin
|
|||
inputCommand.setText(customParameter!=null ? customParameter : "");
|
||||
inputCommand.setEnabled(fEditable);
|
||||
inputCommand.addModifyListener(new ModifyListener() {
|
||||
@Override
|
||||
public void modifyText(ModifyEvent e) {
|
||||
String text = inputCommand.getText();
|
||||
AbstractBuiltinSpecsDetector provider = getRawProvider();
|
||||
|
|
|
@ -56,22 +56,27 @@ public class ScannerDiscoveryGlobalConsole implements ICConsole {
|
|||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void start(IProject project) {
|
||||
Assert.isTrue(project == null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ConsoleOutputStream getOutputStream() throws CoreException {
|
||||
return stream;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ConsoleOutputStream getInfoStream() throws CoreException {
|
||||
return stream;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ConsoleOutputStream getErrorStream() throws CoreException {
|
||||
return stream;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void init(String consoleId, String name, URL defaultIconUrl) {
|
||||
console = null;
|
||||
|
||||
|
|
|
@ -1460,6 +1460,7 @@ public class Configuration extends BuildObject implements IConfiguration, IBuild
|
|||
return set;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDefaultLanguageSettingsProvidersIds() {
|
||||
return defaultLanguageSettingsProvidersIds;
|
||||
}
|
||||
|
|
|
@ -440,6 +440,7 @@ public class MultiConfiguration extends MultiItemsHolder implements
|
|||
return s;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDefaultLanguageSettingsProvidersIds() {
|
||||
ManagedBuilderCorePlugin.error("Default Language Settings Providers are not supported in multiconfiguration mode");
|
||||
return null;
|
||||
|
|
|
@ -15,7 +15,6 @@ import java.util.ArrayList;
|
|||
import java.util.List;
|
||||
|
||||
import org.eclipse.cdt.core.AbstractExecutableExtensionBase;
|
||||
import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsEditableProvider;
|
||||
import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvider;
|
||||
import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
|
||||
import org.eclipse.cdt.core.settings.model.ICFileDescription;
|
||||
|
@ -31,6 +30,7 @@ import org.eclipse.core.runtime.IPath;
|
|||
//public class MBSLanguageSettingsProvider extends AbstractExecutableExtensionBase implements ILanguageSettingsEditableProvider {
|
||||
public class MBSLanguageSettingsProvider extends AbstractExecutableExtensionBase implements ILanguageSettingsProvider {
|
||||
|
||||
@Override
|
||||
public List<ICLanguageSettingEntry> getSettingEntries(ICConfigurationDescription cfgDescription, IResource rc, String languageId) {
|
||||
|
||||
IPath projectPath = rc.getProjectRelativePath();
|
||||
|
|
|
@ -82,6 +82,7 @@ public class LanguageSettingsExtensionManager {
|
|||
// sort by name - for the providers taken from platform extensions
|
||||
Set<ILanguageSettingsProvider> sortedProviders = new TreeSet<ILanguageSettingsProvider>(
|
||||
new Comparator<ILanguageSettingsProvider>() {
|
||||
@Override
|
||||
public int compare(ILanguageSettingsProvider pr1, ILanguageSettingsProvider pr2) {
|
||||
return pr1.getName().compareTo(pr2.getName());
|
||||
}
|
||||
|
|
|
@ -658,7 +658,8 @@ projects:
|
|||
}
|
||||
}
|
||||
|
||||
private static void loadProviderEntries(LanguageSettingsSerializableProvider provider, String cfgId, Element projectElementWsp) {
|
||||
private static void loadProviderEntries(LanguageSettingsSerializableProvider provider,
|
||||
String cfgId, Element projectElementWsp) {
|
||||
/*
|
||||
<project>
|
||||
<configuration id="cfg.id">
|
||||
|
|
|
@ -819,6 +819,7 @@ public class CConfigurationDescription extends CDataProxyContainer implements IC
|
|||
return status != null ? status : CConfigurationStatus.CFG_STATUS_OK;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setLanguageSettingProviders(List<ILanguageSettingsProvider> providers) {
|
||||
try {
|
||||
CConfigurationSpecSettings specSettings = getSpecSettings();
|
||||
|
@ -828,6 +829,7 @@ public class CConfigurationDescription extends CDataProxyContainer implements IC
|
|||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ILanguageSettingsProvider> getLanguageSettingProviders() {
|
||||
try {
|
||||
return getSpecSettings().getLanguageSettingProviders();
|
||||
|
|
|
@ -603,12 +603,14 @@ public class CConfigurationDescriptionCache extends CDefaultConfigurationData
|
|||
return status != null ? status : CConfigurationStatus.CFG_STATUS_OK;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setLanguageSettingProviders(List<ILanguageSettingsProvider> providers) {
|
||||
if(!fInitializing)
|
||||
throw ExceptionFactory.createIsReadOnlyException();
|
||||
fSpecSettings.setLanguageSettingProviders(providers);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ILanguageSettingsProvider> getLanguageSettingProviders() {
|
||||
return fSpecSettings.getLanguageSettingProviders();
|
||||
}
|
||||
|
|
|
@ -639,11 +639,13 @@ public class MultiConfigDescription extends MultiItemsHolder implements
|
|||
fCfgs[i].removeStorage(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setLanguageSettingProviders(List<ILanguageSettingsProvider> providers) {
|
||||
if (DEBUG)
|
||||
System.out.println("Bad multi access: MultiConfigDescription.setLanguageSettingProviders()"); //$NON-NLS-1$
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ILanguageSettingsProvider> getLanguageSettingProviders() {
|
||||
if (DEBUG)
|
||||
System.out.println("Bad multi access: MultiConfigDescription.getLanguageSettingProviders()"); //$NON-NLS-1$
|
||||
|
|
Loading…
Add table
Reference in a new issue