Skip to content

Commit df5e29d

Browse files
author
jantje
committed
remove warnings and dead code
1 parent 32ca625 commit df5e29d

File tree

81 files changed

+106
-5966
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+106
-5966
lines changed

‎io.sloeber.autoBuild.ui/src/io/sloeber/autoBuild/integrations/CCProjectWizard.java

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ protected IProject continueCreation(IProject prj) {
4444
CProjectNature.addCNature(prj, subMonitor.split(1));
4545
CCProjectNature.addCCNature(prj, subMonitor.split(1));
4646
} catch (CoreException e) {
47+
e.printStackTrace();
4748
}
4849
return prj;
4950
}

‎io.sloeber.autoBuild.ui/src/io/sloeber/autoBuild/integrations/CDTCommonProjectWizard.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.eclipse.cdt.core.model.LanguageManager;
2727
import org.eclipse.cdt.core.settings.model.ICProjectDescription;
2828
import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager;
29-
import org.eclipse.cdt.internal.ui.newui.Messages;
3029
import org.eclipse.cdt.internal.ui.wizards.ICDTCommonProjectWizard;
3130
import org.eclipse.cdt.ui.CUIPlugin;
3231
import org.eclipse.cdt.ui.wizards.CWizardHandler;
@@ -56,6 +55,8 @@
5655
import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
5756
import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
5857

58+
import io.sloeber.autoBuild.ui.internal.Messages;
59+
5960
public abstract class CDTCommonProjectWizard extends BasicNewResourceWizard
6061
implements IExecutableExtension, IWizardWithMemory, ICDTCommonProjectWizard {
6162
private static final String PREFIX = "CProjectWizard"; //$NON-NLS-1$

‎io.sloeber.autoBuild.ui/src/io/sloeber/autoBuild/integrations/CDTMainWizardPage.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,8 @@ protected boolean validatePage() {
216216
if (f.getAttribute(EFS.ATTRIBUTE_READ_ONLY)) {
217217
setErrorMessage(Messages.CMainWizardPage_DirReadOnlyError);
218218
return false;
219-
} else
220-
setMessage(Messages.CMainWizardPage_7, IMessageProvider.WARNING);
219+
}
220+
setMessage(Messages.CMainWizardPage_7, IMessageProvider.WARNING);
221221
} else {
222222
setErrorMessage(Messages.CMainWizardPage_6);
223223
return false;
@@ -478,6 +478,7 @@ private void switchTo(CWizardHandler h, EntryDescriptor ed) {
478478
if (h != null)
479479
h.initialize(ed);
480480
} catch (CoreException e) {
481+
e.printStackTrace();
481482
h = null;
482483
}
483484
if (h_selected != null)

‎io.sloeber.autoBuild.ui/src/io/sloeber/autoBuild/integrations/NewVarDialog.java

+29-34
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,11 @@
1818
import java.util.Arrays;
1919
import java.util.Comparator;
2020

21+
import org.eclipse.cdt.core.cdtvariables.CdtVariable;
2122
import org.eclipse.cdt.core.cdtvariables.CdtVariableException;
2223
import org.eclipse.cdt.core.cdtvariables.ICdtVariable;
2324
import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
2425
import org.eclipse.cdt.core.settings.model.ICMultiItemsHolder;
25-
//import org.eclipse.cdt.managedbuilder.core.IOption;
26-
//import org.eclipse.cdt.managedbuilder.internal.macros.BuildMacro;
27-
//import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
28-
//import org.eclipse.cdt.managedbuilder.macros.IBuildMacro;
2926
import org.eclipse.cdt.utils.cdtvariables.CdtVariableResolver;
3027
import org.eclipse.cdt.utils.ui.controls.FileListControl;
3128
import org.eclipse.jface.dialogs.Dialog;
@@ -51,8 +48,6 @@
5148
import org.eclipse.swt.widgets.Shell;
5249
import org.eclipse.swt.widgets.Text;
5350

54-
import io.sloeber.autoBuild.Internal.BuildMacro;
55-
import io.sloeber.autoBuild.api.IBuildMacro;
5651
import io.sloeber.autoBuild.ui.internal.Messages;
5752
import io.sloeber.schema.api.IOption;
5853

@@ -182,7 +177,7 @@ public void widgetSelected(SelectionEvent e) {
182177
Messages.NewBuildMacroDialog_label_type_path_dir, Messages.NewBuildMacroDialog_label_type_path_dir_list,
183178
Messages.NewBuildMacroDialog_label_type_path_any,
184179
Messages.NewBuildMacroDialog_label_type_path_any_list });
185-
setSelectedType(IBuildMacro.VALUE_TEXT);
180+
setSelectedType(ICdtVariable.VALUE_TEXT);
186181

187182
fTypeSelector.addListener(SWT.Selection, new Listener() {
188183
@Override
@@ -291,19 +286,19 @@ private void handleBrowseButtonPressed() {
291286
private int getBrowseType(int type) {
292287
int browseType = IOption.BROWSE_NONE;
293288
switch (type) {
294-
case IBuildMacro.VALUE_PATH_FILE:
295-
case IBuildMacro.VALUE_PATH_FILE_LIST:
289+
case ICdtVariable.VALUE_PATH_FILE:
290+
case ICdtVariable.VALUE_PATH_FILE_LIST:
296291
browseType = IOption.BROWSE_FILE;
297292
break;
298-
case IBuildMacro.VALUE_PATH_DIR:
299-
case IBuildMacro.VALUE_PATH_DIR_LIST:
293+
case ICdtVariable.VALUE_PATH_DIR:
294+
case ICdtVariable.VALUE_PATH_DIR_LIST:
300295
browseType = IOption.BROWSE_DIR;
301296
break;
302-
case IBuildMacro.VALUE_PATH_ANY:
303-
case IBuildMacro.VALUE_PATH_ANY_LIST:
297+
case ICdtVariable.VALUE_PATH_ANY:
298+
case ICdtVariable.VALUE_PATH_ANY_LIST:
304299
break;
305-
case IBuildMacro.VALUE_TEXT:
306-
case IBuildMacro.VALUE_TEXT_LIST:
300+
case ICdtVariable.VALUE_TEXT:
301+
case ICdtVariable.VALUE_TEXT_LIST:
307302
default:
308303
}
309304
return browseType;
@@ -330,7 +325,7 @@ private void loadVarSettings(String name) {
330325
if (v != null)
331326
loadVar(v);
332327
else
333-
loadVar(name, IBuildMacro.VALUE_TEXT, EMPTY_STRING);
328+
loadVar(name, ICdtVariable.VALUE_TEXT, EMPTY_STRING);
334329
}
335330

336331
private void loadVar(String name, int type, String value[]) {
@@ -397,22 +392,22 @@ private boolean macroNamesEqual(String name1, String name2) {
397392
private int getSelectedType() {
398393
switch (fTypeSelector.getSelectionIndex()) {
399394
case 1:
400-
return IBuildMacro.VALUE_TEXT_LIST;
395+
return ICdtVariable.VALUE_TEXT_LIST;
401396
case 2:
402-
return IBuildMacro.VALUE_PATH_FILE;
397+
return ICdtVariable.VALUE_PATH_FILE;
403398
case 3:
404-
return IBuildMacro.VALUE_PATH_FILE_LIST;
399+
return ICdtVariable.VALUE_PATH_FILE_LIST;
405400
case 4:
406-
return IBuildMacro.VALUE_PATH_DIR;
401+
return ICdtVariable.VALUE_PATH_DIR;
407402
case 5:
408-
return IBuildMacro.VALUE_PATH_DIR_LIST;
403+
return ICdtVariable.VALUE_PATH_DIR_LIST;
409404
case 6:
410-
return IBuildMacro.VALUE_PATH_ANY;
405+
return ICdtVariable.VALUE_PATH_ANY;
411406
case 7:
412-
return IBuildMacro.VALUE_PATH_ANY_LIST;
407+
return ICdtVariable.VALUE_PATH_ANY_LIST;
413408
case 0:
414409
default:
415-
return IBuildMacro.VALUE_TEXT;
410+
return ICdtVariable.VALUE_TEXT;
416411
}
417412
}
418413

@@ -421,28 +416,28 @@ private int getSelectedType() {
421416
*/
422417
private void setSelectedType(int type) {
423418
switch (type) {
424-
case IBuildMacro.VALUE_TEXT_LIST:
419+
case ICdtVariable.VALUE_TEXT_LIST:
425420
fTypeSelector.select(1);
426421
break;
427-
case IBuildMacro.VALUE_PATH_FILE:
422+
case ICdtVariable.VALUE_PATH_FILE:
428423
fTypeSelector.select(2);
429424
break;
430-
case IBuildMacro.VALUE_PATH_FILE_LIST:
425+
case ICdtVariable.VALUE_PATH_FILE_LIST:
431426
fTypeSelector.select(3);
432427
break;
433-
case IBuildMacro.VALUE_PATH_DIR:
428+
case ICdtVariable.VALUE_PATH_DIR:
434429
fTypeSelector.select(4);
435430
break;
436-
case IBuildMacro.VALUE_PATH_DIR_LIST:
431+
case ICdtVariable.VALUE_PATH_DIR_LIST:
437432
fTypeSelector.select(5);
438433
break;
439-
case IBuildMacro.VALUE_PATH_ANY:
434+
case ICdtVariable.VALUE_PATH_ANY:
440435
fTypeSelector.select(6);
441436
break;
442-
case IBuildMacro.VALUE_PATH_ANY_LIST:
437+
case ICdtVariable.VALUE_PATH_ANY_LIST:
443438
fTypeSelector.select(7);
444439
break;
445-
case IBuildMacro.VALUE_TEXT:
440+
case ICdtVariable.VALUE_TEXT:
446441
default:
447442
fTypeSelector.select(0);
448443
break;
@@ -458,9 +453,9 @@ protected void okPressed() {
458453
if (name != null || !EMPTY_STRING.equals(name)) {
459454
int type = getSelectedType();
460455
if (CdtVariableResolver.isStringListVariable(type))
461-
fResultingMacro = new BuildMacro(name, type, getSelectedStringListValue());
456+
fResultingMacro = new CdtVariable(name, type, getSelectedStringListValue());
462457
else
463-
fResultingMacro = new BuildMacro(name, type, getSelectedStringValue());
458+
fResultingMacro = new CdtVariable(name, type, getSelectedStringValue());
464459
}
465460

466461
super.okPressed();

‎io.sloeber.autoBuild.ui/src/io/sloeber/autoBuild/ui/tabs/AbstractAutoBuildPropertyTab.java

-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
package io.sloeber.autoBuild.ui.tabs;
22

33
import io.sloeber.autoBuild.api.IAutoBuildConfigurationDescription;
4-
import io.sloeber.autoBuild.integration.AutoBuildConfigurationDescription;
5-
import java.util.HashMap;
6-
import java.util.Map;
7-
84
import org.eclipse.cdt.core.settings.model.ICResourceDescription;
95
import org.eclipse.cdt.ui.newui.AbstractCPropertyTab;
106
import org.eclipse.swt.widgets.Shell;

‎io.sloeber.autoBuild.ui/src/io/sloeber/autoBuild/ui/tabs/BuildBehaviourTab.java

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.eclipse.swt.layout.GridLayout;
3333
import org.eclipse.swt.widgets.Button;
3434
import org.eclipse.swt.widgets.Composite;
35-
import org.eclipse.swt.widgets.Control;
3635
import org.eclipse.swt.widgets.Group;
3736
import org.eclipse.swt.widgets.Label;
3837
import org.eclipse.swt.widgets.Spinner;

‎io.sloeber.autoBuild.ui/src/io/sloeber/autoBuild/ui/tabs/BuildOptionComboFieldEditor.java

-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
import java.util.LinkedList;
2020
import java.util.List;
21-
import java.util.Vector;
22-
2321
import org.eclipse.cdt.utils.ui.controls.ControlFactory;
2422
import org.eclipse.jface.preference.FieldEditor;
2523
import org.eclipse.osgi.util.TextProcessor;

‎io.sloeber.autoBuild.ui/src/io/sloeber/autoBuild/ui/tabs/BuildStepsTab.java

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.eclipse.swt.widgets.Composite;
2727
import org.eclipse.swt.widgets.Group;
2828

29-
import io.sloeber.autoBuild.api.IAutoBuildConfigurationDescription;
3029
import io.sloeber.autoBuild.ui.internal.Messages;
3130

3231
/**

0 commit comments

Comments
 (0)