Skip to content

Commit 2c355c0

Browse files
committed
for sync
1 parent fdb5a96 commit 2c355c0

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

it.baeyens.arduino.core/src/it/baeyens/arduino/tools/ShouldHaveBeenInCDT.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ public static void setCProjectDescription(IProject project, IToolChain toolChain
5656
IBuilder bld = cfg.getEditableBuilder();
5757
if (bld != null) {
5858
if (bld.isInternalBuilder()) {
59-
IConfiguration prefCfg = ManagedBuildManager.getPreferenceConfiguration(false);
60-
IBuilder prefBuilder = prefCfg.getBuilder();
61-
cfg.changeBuilder(prefBuilder, ManagedBuildManager.calculateChildId(cfg.getId(), null), prefBuilder.getName());
62-
bld = cfg.getEditableBuilder();
63-
bld.setBuildPath(null);
59+
IConfiguration prefCfg = ManagedBuildManager.getPreferenceConfiguration(false);
60+
IBuilder prefBuilder = prefCfg.getBuilder();
61+
cfg.changeBuilder(prefBuilder, ManagedBuildManager.calculateChildId(cfg.getId(), null), prefBuilder.getName());
62+
bld = cfg.getEditableBuilder();
63+
bld.setBuildPath(null);
6464
}
6565
bld.setManagedBuildOn(isManagedBuild);
6666
} else {
@@ -72,10 +72,10 @@ public static void setCProjectDescription(IProject project, IToolChain toolChain
7272

7373
// ConfigurationDataProvider.setDefaultLanguageSettingsProviders(project, cfg, cfgDes);
7474

75-
//BK - 2013.10.18
75+
// BK - 2013.10.18
7676
// creates/add the configuration to the project description
77-
des.createConfiguration(ManagedBuildManager.CFG_DATA_PROVIDER_ID, cfg.getConfigurationData());
78-
77+
// des.createConfiguration(ManagedBuildManager.CFG_DATA_PROVIDER_ID, cfg.getConfigurationData());
78+
7979
monitor.worked(50);
8080
mngr.setProjectDescription(project, des);
8181

it.baeyens.arduino.monitor/src/it/baeyens/arduino/monitor/views/ScopeListener.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
import java.util.regex.Matcher;
1010
import java.util.regex.Pattern;
1111

12-
import org.eclipse.nebula.widgets.oscilloscope.multichannel.Oscilloscope;
13-
import org.eclipse.nebula.widgets.oscilloscope.multichannel.OscilloscopeDispatcher;
14-
import org.eclipse.nebula.widgets.oscilloscope.multichannel.OscilloscopeStackAdapter;
12+
import multichannel.Oscilloscope;
13+
import multichannel.OscilloscopeDispatcher;
14+
import multichannel.OscilloscopeStackAdapter;
1515

1616
public class ScopeListener implements MessageConsumer {
1717

it.baeyens.arduino.monitor/src/it/baeyens/arduino/monitor/views/ScopeView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package it.baeyens.arduino.monitor.views;
22

33
import it.baeyens.arduino.arduino.Serial;
4+
import multichannel.Oscilloscope;
45

5-
import org.eclipse.nebula.widgets.oscilloscope.multichannel.Oscilloscope;
66
import org.eclipse.swt.SWT;
77
import org.eclipse.swt.layout.GridData;
88
import org.eclipse.swt.layout.GridLayout;

0 commit comments

Comments
 (0)