Skip to content

Commit 4b80bf3

Browse files
ilg-ulilg-ul
committed
jlink & openocd: if (DEBUG) in tabs
1 parent 4be145f commit 4b80bf3

File tree

3 files changed

+79
-37
lines changed

3 files changed

+79
-37
lines changed

‎ilg.gnuarmeclipse.debug.gdbjtag.jlink/src/ilg/gnuarmeclipse/debug/gdbjtag/jlink/ui/TabDebugger.java

+33-14
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ public class TabDebugger extends AbstractLaunchConfigurationTab {
7676
private static final String TAB_ID = Activator.PLUGIN_ID
7777
+ ".ui.debuggertab";
7878

79+
private static final boolean DEBUG = false;
80+
7981
private Button doStartGdbServer;
8082
private Text gdbClientExecutable;
8183
private Text gdbClientOtherOptions;
@@ -145,7 +147,9 @@ public Image getImage() {
145147
@Override
146148
public void createControl(Composite parent) {
147149

148-
System.out.println("TabDebugger: createControl() ");
150+
if (DEBUG) {
151+
System.out.println("TabDebugger: createControl() ");
152+
}
149153

150154
// gdbPrevUsbAddress = "";
151155
// gdbPrevIpAddress = "";
@@ -1131,8 +1135,10 @@ private void propagateConnectToRunningChanged() {
11311135
@Override
11321136
public void initializeFrom(ILaunchConfiguration configuration) {
11331137

1134-
System.out.println("TabDebugger: initializeFrom() "
1135-
+ configuration.getName());
1138+
if (DEBUG) {
1139+
System.out.println("TabDebugger: initializeFrom() "
1140+
+ configuration.getName());
1141+
}
11361142

11371143
try {
11381144
Boolean booleanDefault;
@@ -1420,8 +1426,10 @@ else if (ConfigurationAttributes.ENDIANNESS_BIG
14201426
Activator.getDefault().getLog().log(e.getStatus());
14211427
}
14221428

1423-
System.out.println("TabDebugger: initializeFrom() completed "
1424-
+ configuration.getName());
1429+
if (DEBUG) {
1430+
System.out.println("TabDebugger: initializeFrom() completed "
1431+
+ configuration.getName());
1432+
}
14251433
}
14261434

14271435
/*
@@ -1436,20 +1444,27 @@ public String getId() {
14361444

14371445
@Override
14381446
public void activated(ILaunchConfigurationWorkingCopy workingCopy) {
1439-
System.out.println("TabDebugger: activated() " + workingCopy.getName());
1447+
if (DEBUG) {
1448+
System.out.println("TabDebugger: activated() "
1449+
+ workingCopy.getName());
1450+
}
14401451
}
14411452

14421453
@Override
14431454
public void deactivated(ILaunchConfigurationWorkingCopy workingCopy) {
1444-
System.out.println("TabDebugger: deactivated() "
1445-
+ workingCopy.getName());
1455+
if (DEBUG) {
1456+
System.out.println("TabDebugger: deactivated() "
1457+
+ workingCopy.getName());
1458+
}
14461459
}
14471460

14481461
@Override
14491462
public void performApply(ILaunchConfigurationWorkingCopy configuration) {
14501463

1451-
System.out.println("TabDebugger: performApply() "
1452-
+ configuration.getName() + ", dirty=" + isDirty());
1464+
if (DEBUG) {
1465+
System.out.println("TabDebugger: performApply() "
1466+
+ configuration.getName() + ", dirty=" + isDirty());
1467+
}
14531468

14541469
{
14551470
// legacy definition; although the jtag device class is not used,
@@ -1675,15 +1690,19 @@ public void performApply(ILaunchConfigurationWorkingCopy configuration) {
16751690

16761691
SharedStorage.update();
16771692

1678-
System.out.println("TabDebugger: performApply() completed "
1679-
+ configuration.getName() + ", dirty=" + isDirty());
1693+
if (DEBUG) {
1694+
System.out.println("TabDebugger: performApply() completed "
1695+
+ configuration.getName() + ", dirty=" + isDirty());
1696+
}
16801697
}
16811698

16821699
@Override
16831700
public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
16841701

1685-
System.out.println("TabDebugger: setDefaults() "
1686-
+ configuration.getName());
1702+
if (DEBUG) {
1703+
System.out.println("TabDebugger: setDefaults() "
1704+
+ configuration.getName());
1705+
}
16871706

16881707
configuration.setAttribute(IGDBJtagConstants.ATTR_JTAG_DEVICE,
16891708
ConfigurationAttributes.JTAG_DEVICE);

‎ilg.gnuarmeclipse.debug.gdbjtag.jlink/src/ilg/gnuarmeclipse/debug/gdbjtag/jlink/ui/TabStartup.java

+35-17
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import org.eclipse.debug.core.ILaunchConfiguration;
3434
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
3535
import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
36-
import org.eclipse.debug.ui.ILaunchConfigurationDialog;
3736
import org.eclipse.jface.dialogs.IDialogConstants;
3837
import org.eclipse.swt.SWT;
3938
import org.eclipse.swt.custom.ScrolledComposite;
@@ -63,6 +62,8 @@ public class TabStartup extends AbstractLaunchConfigurationTab {
6362
private static final String TAB_NAME = "Startup";
6463
private static final String TAB_ID = Activator.PLUGIN_ID + ".ui.startuptab";
6564

65+
private static final boolean DEBUG = false;
66+
6667
private Text initCommands;
6768
// Text delay;
6869
// Button doReset;
@@ -138,7 +139,9 @@ public Image getImage() {
138139
@Override
139140
public void createControl(Composite parent) {
140141

141-
System.out.println("TabStartup: createControl() ");
142+
if (DEBUG) {
143+
System.out.println("TabStartup: createControl() ");
144+
}
142145

143146
ScrolledComposite sc = new ScrolledComposite(parent, SWT.V_SCROLL
144147
| SWT.H_SCROLL);
@@ -1134,8 +1137,10 @@ public String getId() {
11341137
@Override
11351138
public void initializeFrom(ILaunchConfiguration configuration) {
11361139

1137-
System.out.println("TabStartup: initializeFrom() "
1138-
+ configuration.getName() + ", dirty=" + isDirty());
1140+
if (DEBUG) {
1141+
System.out.println("TabStartup: initializeFrom() "
1142+
+ configuration.getName() + ", dirty=" + isDirty());
1143+
}
11391144

11401145
try {
11411146
String stringDefault;
@@ -1399,28 +1404,37 @@ public void initializeFrom(ILaunchConfiguration configuration) {
13991404
Activator.getDefault().getLog().log(e.getStatus());
14001405
}
14011406

1402-
System.out.println("TabStartup: initializeFrom() completed "
1403-
+ configuration.getName() + ", dirty=" + isDirty());
1407+
if (DEBUG) {
1408+
System.out.println("TabStartup: initializeFrom() completed "
1409+
+ configuration.getName() + ", dirty=" + isDirty());
1410+
}
14041411
}
14051412

14061413
@Override
14071414
public void activated(ILaunchConfigurationWorkingCopy workingCopy) {
1408-
System.out.println("TabStartup: activated() " + workingCopy.getName());
1415+
if (DEBUG) {
1416+
System.out.println("TabStartup: activated() "
1417+
+ workingCopy.getName());
1418+
}
14091419
}
14101420

14111421
@Override
14121422
public void deactivated(ILaunchConfigurationWorkingCopy workingCopy) {
1413-
System.out
1414-
.println("TabStartup: deactivated() " + workingCopy.getName());
1423+
if (DEBUG) {
1424+
System.out.println("TabStartup: deactivated() "
1425+
+ workingCopy.getName());
1426+
}
14151427
}
14161428

14171429
@Override
14181430
public void performApply(ILaunchConfigurationWorkingCopy configuration) {
14191431

1420-
System.out.println("TabStartup: performApply() "
1421-
+ configuration.getName() + ", dirty=" + isDirty());
1432+
if (DEBUG) {
1433+
System.out.println("TabStartup: performApply() "
1434+
+ configuration.getName() + ", dirty=" + isDirty());
1435+
}
14221436

1423-
ILaunchConfigurationDialog dialog = getLaunchConfigurationDialog();
1437+
// ILaunchConfigurationDialog dialog = getLaunchConfigurationDialog();
14241438

14251439
boolean booleanValue;
14261440
String stringValue;
@@ -1604,20 +1618,24 @@ public void performApply(ILaunchConfigurationWorkingCopy configuration) {
16041618

16051619
SharedStorage.update();
16061620

1607-
System.out.println("TabStartup: performApply() completed "
1608-
+ configuration.getName() + ", dirty=" + isDirty());
1621+
if (DEBUG) {
1622+
System.out.println("TabStartup: performApply() completed "
1623+
+ configuration.getName() + ", dirty=" + isDirty());
1624+
}
16091625
}
16101626

16111627
@Override
16121628
public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
16131629

1614-
System.out.println("TabStartup: setDefaults() "
1615-
+ configuration.getName());
1630+
if (DEBUG) {
1631+
System.out.println("TabStartup: setDefaults() "
1632+
+ configuration.getName());
1633+
}
16161634

16171635
if (true)
16181636
return;
1619-
16201637
;
1638+
16211639
// Initialisation Commands
16221640
configuration.setAttribute(ConfigurationAttributes.DO_FIRST_RESET,
16231641
ConfigurationAttributes.DO_FIRST_RESET_DEFAULT);

‎ilg.gnuarmeclipse.debug.gdbjtag.openocd/src/ilg/gnuarmeclipse/debug/gdbjtag/openocd/ui/TabDebugger.java

+11-6
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ public class TabDebugger extends AbstractLaunchConfigurationTab {
7373
private static final String TAB_ID = Activator.PLUGIN_ID
7474
+ ".ui.debuggertab";
7575

76+
private static final boolean DEBUG = false;
77+
7678
private Button doStartGdbServer;
7779
private Text gdbClientExecutable;
7880
private Text gdbClientOtherOptions;
@@ -687,7 +689,7 @@ private void doConnectToRunningChanged() {
687689

688690
if (doStartGdbServer.getSelection()) {
689691

690-
boolean enabled = doConnectToRunning.getSelection();
692+
// boolean enabled = doConnectToRunning.getSelection();
691693

692694
}
693695
}
@@ -834,14 +836,18 @@ public String getId() {
834836

835837
@Override
836838
public void activated(ILaunchConfigurationWorkingCopy workingCopy) {
837-
// System.out.println("TabDebugger: activated() " +
838-
// workingCopy.getName());
839+
if (DEBUG) {
840+
System.out.println("TabDebugger: activated() "
841+
+ workingCopy.getName());
842+
}
839843
}
840844

841845
@Override
842846
public void deactivated(ILaunchConfigurationWorkingCopy workingCopy) {
843-
// System.out.println("TabDebugger: deactivated() "
844-
// + workingCopy.getName());
847+
if (DEBUG) {
848+
System.out.println("TabDebugger: deactivated() "
849+
+ workingCopy.getName());
850+
}
845851
}
846852

847853
@Override
@@ -1011,7 +1017,6 @@ public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
10111017

10121018
if (true)
10131019
return;
1014-
10151020
;
10161021

10171022
{

0 commit comments

Comments
 (0)