Skip to content

Commit 26735a0

Browse files
jantjejantje
committed
Merge pull request #407 from DevFactory/release/multiple-code-improvements-fix-2
multiple code improvements: squid:S00115, squid:S1213, squid:S1118, squid:S1066
2 parents 69efee0 + 9d75d0a commit 26735a0

File tree

17 files changed

+104
-106
lines changed

17 files changed

+104
-106
lines changed

‎it.baeyens.arduino.common/src/it/baeyens/arduino/common/Activator.java

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,18 @@ public boolean belongsTo(Object family) {
3636
*/
3737
public class Activator extends AbstractUIPlugin {
3838

39-
private static Activator instance;
40-
41-
public static Activator getDefault() {
42-
return instance;
43-
}
44-
4539
// The plug-in ID
4640
public static final String PLUGIN_ID = "it.baeyens.arduino.common"; //$NON-NLS-1$
4741

4842
// The shared instance
49-
private static final String flagStart = "F" + "s" + "S" + "t" + "a" + "t" + "u" + "s"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
50-
private static final String flagMonitor = "F" + "m" + "S" + "t" + "a" + "t" + "u" + "s"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
51-
private static final String uploadflag = "F" + "u" + "S" + "t" + "a" + "t" + "u" + "s"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
52-
private static final String buildflag = "F" + "u" + "S" + "t" + "a" + "t" + "u" + "b"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
53-
private static final String Localflag = "l" + flagStart; //$NON-NLS-1$
54-
private static final String helploc = "http://www.baeyens.it/eclipse/remind.php"; //$NON-NLS-1$
43+
private static final String FLAGS_TART = "F" + "s" + "S" + "t" + "a" + "t" + "u" + "s"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
44+
private static final String FLAG_MONITOR = "F" + "m" + "S" + "t" + "a" + "t" + "u" + "s"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
45+
private static final String UPLOAD_FLAG = "F" + "u" + "S" + "t" + "a" + "t" + "u" + "s"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
46+
private static final String BUILD_FLAG = "F" + "u" + "S" + "t" + "a" + "t" + "u" + "b"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
47+
private static final String LOCAL_FLAG = "l" + FLAGS_TART; //$NON-NLS-1$
48+
private static final String HELP_LOC = "http://www.baeyens.it/eclipse/remind.php"; //$NON-NLS-1$
49+
50+
private static Activator instance;
5551

5652
/**
5753
* The constructor
@@ -60,6 +56,10 @@ public Activator() {
6056
// no activator code needed
6157
}
6258

59+
public static Activator getDefault() {
60+
return instance;
61+
}
62+
6363
/*
6464
* (non-Javadoc)
6565
*
@@ -87,21 +87,19 @@ static void remind() {
8787
protected IStatus run(IProgressMonitor monitor) {
8888

8989
IEclipsePreferences myScope = InstanceScope.INSTANCE.getNode(Const.NODE_ARDUINO);
90-
int curFsiStatus = myScope.getInt(flagStart, 0) + myScope.getInt(flagMonitor, 0)
91-
+ myScope.getInt(uploadflag, 0) + myScope.getInt(buildflag, 0);
92-
int lastFsiStatus = myScope.getInt(Localflag, 0);
93-
if ((curFsiStatus - lastFsiStatus) > 50) {
94-
if (isInternetReachable()) {
95-
myScope.putInt(Localflag, curFsiStatus);
90+
int curFsiStatus = myScope.getInt(FLAGS_TART, 0) + myScope.getInt(FLAG_MONITOR, 0)
91+
+ myScope.getInt(UPLOAD_FLAG, 0) + myScope.getInt(BUILD_FLAG, 0);
92+
int lastFsiStatus = myScope.getInt(LOCAL_FLAG, 0);
93+
if ((curFsiStatus - lastFsiStatus) > 50 && isInternetReachable()) {
94+
myScope.putInt(LOCAL_FLAG, curFsiStatus);
9695
try {
9796
myScope.flush();
9897
} catch (BackingStoreException e) {
9998
// this should not happen
10099
}
101-
PleaseHelp.DoHelp(helploc);
100+
PleaseHelp.DoHelp(HELP_LOC);
102101
return Status.OK_STATUS; // once per run will be
103102
// sufficient
104-
}
105103
}
106104
remind();
107105
return Status.OK_STATUS;
@@ -131,7 +129,7 @@ static boolean isInternetReachable() {
131129

132130
try {
133131
// make a URL to a known source
134-
URL url = new URL(helploc);
132+
URL url = new URL(HELP_LOC);
135133
// open a connection to that source
136134
urlConnect = (HttpURLConnection) url.openConnection();
137135
// trying to retrieve data from the source. If there is no

‎it.baeyens.arduino.common/src/it/baeyens/arduino/common/Common.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,13 +197,13 @@ public static void log(IStatus status) {
197197
*/
198198
public static String UploadPortPrefix() {
199199
if (Platform.getOS().equals(Platform.OS_WIN32))
200-
return UploadPortPrefix_WIN;
200+
return UPLOAD_PORT_PREFIX_WIN;
201201
if (Platform.getOS().equals(Platform.OS_LINUX))
202-
return UploadPortPrefix_LINUX;
202+
return UPLOAD_PORT_PREFIX_LINUX;
203203
if (Platform.getOS().equals(Platform.OS_MACOSX))
204-
return UploadPortPrefix_MAC;
204+
return UPLOAD_PORT_PREFIX_MAC;
205205
Common.log(new Status(IStatus.WARNING, Const.CORE_PLUGIN_ID, "Unsupported operating system", null)); //$NON-NLS-1$
206-
return UploadPortPrefix_WIN;
206+
return UPLOAD_PORT_PREFIX_WIN;
207207
}
208208

209209
/**

‎it.baeyens.arduino.common/src/it/baeyens/arduino/common/Const.java

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,23 @@ public class Const {
2727
public static final String RETURN = "\r";// so I do not have //$NON-NLS-1$
2828
// to add all the time
2929
// General stuff
30-
public static final String PluginStart = "it.baeyens."; //$NON-NLS-1$
31-
public static final String CORE_PLUGIN_ID = PluginStart + "arduino.core"; //$NON-NLS-1$
30+
public static final String PLUGIN_START = "it.baeyens."; //$NON-NLS-1$
31+
public static final String CORE_PLUGIN_ID = PLUGIN_START + "arduino.core"; //$NON-NLS-1$
3232

3333
// prefix to be added to the arduino environment
34-
protected static final String UploadPortPrefix_WIN = "-P\\\\.\\"; //$NON-NLS-1$
35-
protected static final String UploadPortPrefix_LINUX = "-P"; //$NON-NLS-1$
36-
protected static final String UploadPortPrefix_MAC = "-P"; //$NON-NLS-1$
34+
protected static final String UPLOAD_PORT_PREFIX_WIN = "-P\\\\.\\"; //$NON-NLS-1$
35+
protected static final String UPLOAD_PORT_PREFIX_LINUX = "-P"; //$NON-NLS-1$
36+
protected static final String UPLOAD_PORT_PREFIX_MAC = "-P"; //$NON-NLS-1$
3737

3838
// natures
39-
public static final String Cnatureid = "org.eclipse.cdt.core.cnature"; //$NON-NLS-1$
40-
public static final String CCnatureid = "org.eclipse.cdt.core.ccnature"; //$NON-NLS-1$
41-
public static final String Buildnatureid = "org.eclipse.cdt.managedbuilder.core.managedBuildNature";//$NON-NLS-1$
42-
public static final String Scannernatureid = "org.eclipse.cdt.managedbuilder.core.ScannerConfigNature";//$NON-NLS-1$
43-
public static final String ArduinoNatureID = PluginStart + "arduinonature";//$NON-NLS-1$
39+
public static final String CNATURE_ID = "org.eclipse.cdt.core.cnature"; //$NON-NLS-1$
40+
public static final String CCNATURE_ID = "org.eclipse.cdt.core.ccnature"; //$NON-NLS-1$
41+
public static final String BUILD_NATURE_ID = "org.eclipse.cdt.managedbuilder.core.managedBuildNature";//$NON-NLS-1$
42+
public static final String SCANNER_NATURE_ID = "org.eclipse.cdt.managedbuilder.core.ScannerConfigNature";//$NON-NLS-1$
43+
public static final String ARDUINO_NATURE_ID = PLUGIN_START + "arduinonature";//$NON-NLS-1$
4444

4545
// preference nodes
46-
public static final String NODE_ARDUINO = PluginStart + "arduino";//$NON-NLS-1$
46+
public static final String NODE_ARDUINO = PLUGIN_START + "arduino";//$NON-NLS-1$
4747

4848
// preference keys
4949
public static final String KEY_PRIVATE_LIBRARY_PATHS = "Private Library Path";//$NON-NLS-1$
@@ -63,8 +63,8 @@ public class Const {
6363
public static final String KEY_UPDATE_JASONS = "Update jsons files";//$NON-NLS-1$
6464

6565
// Serial monitor keys
66-
public static final String KEY_SERIAlRATE = "Serial monitor last selected rate";//$NON-NLS-1$
67-
public static final String KEY_SERIAlPORT = "Serial monitor last selected Port";//$NON-NLS-1$
66+
public static final String KEY_SERIAL_RATE = "Serial monitor last selected rate";//$NON-NLS-1$
67+
public static final String KEY_SERIAL_PORT = "Serial monitor last selected Port";//$NON-NLS-1$
6868
public static final String KEY_RXTX_LAST_USED_LINE_INDES = "Serial Monitor Last Used Line Ending index";//$NON-NLS-1$
6969
public static final String KEY_RXTX_LAST_USED_AUTOSCROLL = "Serial Monitor Last Used auto scroll setting";//$NON-NLS-1$
7070
// Folder Information
@@ -80,9 +80,9 @@ public class Const {
8080
public static final String PACKAGES_FOLDER_NAME = "packages";//$NON-NLS-1$
8181

8282
// tags to interpret the arduino input files
83-
public static final String BoardNameKeyTAG = "name";//$NON-NLS-1$
84-
public static final String UploadToolTeensy = "teensy_reboot";//$NON-NLS-1$
85-
public static final String Upload_ssh = "ssh upload";//$NON-NLS-1$
83+
public static final String BOARD_NAME_KEY_TAG = "name";//$NON-NLS-1$
84+
public static final String UPLOAD_TOOL_TEENSY = "teensy_reboot";//$NON-NLS-1$
85+
public static final String UPLOAD_SSH = "ssh upload";//$NON-NLS-1$
8686
public static final String MENU = "menu";//$NON-NLS-1$
8787

8888
public static final String KEY_BUILD_BEFORE_UPLOAD_OPTION = "Build before upload option";//$NON-NLS-1$
@@ -95,36 +95,36 @@ public class Const {
9595
public static final String ARDUINO_IDE_VERSION = "ArduinoIDEVersion";//$NON-NLS-1$
9696
public static final String ENV_KEY_NAME = ENV_KEY_BOARD_START + "NAME";//$NON-NLS-1$
9797
public static final String ENV_KEY_VERSION = ENV_KEY_BOARD_START + "VERSION";//$NON-NLS-1$
98-
public static final String ENV_KEY_recipe_c_o_pattern = ENV_KEY_BOARD_START + "RECIPE.C.O.PATTERN";//$NON-NLS-1$
99-
public static final String ENV_KEY_recipe_cpp_o_pattern = ENV_KEY_BOARD_START + "RECIPE.CPP.O.PATTERN";//$NON-NLS-1$
100-
public static final String ENV_KEY_recipe_S_o_pattern = ENV_KEY_BOARD_START + "RECIPE.S.O.PATTERN";//$NON-NLS-1$
101-
public static final String ENV_KEY_recipe_objcopy_hex_pattern = ENV_KEY_BOARD_START + "RECIPE.OBJCOPY.HEX.PATTERN";//$NON-NLS-1$
102-
public static final String ENV_KEY_recipe_objcopy_eep_pattern = ENV_KEY_BOARD_START + "RECIPE.OBJCOPY.EEP.PATTERN";//$NON-NLS-1$
103-
public static final String ENV_KEY_recipe_size_pattern = ENV_KEY_BOARD_START + "RECIPE.SIZE.PATTERN";//$NON-NLS-1$
104-
public static final String ENV_KEY_recipe_AR_pattern = ENV_KEY_BOARD_START + "RECIPE.AR.PATTERN";//$NON-NLS-1$
105-
public static final String ENV_KEY_recipe_c_combine_pattern = ENV_KEY_BOARD_START + "RECIPE.C.COMBINE.PATTERN"; //$NON-NLS-1$
106-
107-
public static final String ENV_KEY_build_variant = ENV_KEY_BOARD_START + "BUILD.VARIANT";//$NON-NLS-1$
108-
public static final String ENV_KEY_compiler_path = ENV_KEY_BOARD_START + "COMPILER.PATH";//$NON-NLS-1$
109-
public static final String ENV_KEY_build_system_path = ENV_KEY_BOARD_START + "BUILD.SYSTEM.PATH";//$NON-NLS-1$
110-
public static final String ENV_KEY_build_generic_path = ENV_KEY_BOARD_START + "BUILD.GENERIC.PATH";//$NON-NLS-1$
98+
public static final String ENV_KEY_RECIPE_C_O_PATTERN = ENV_KEY_BOARD_START + "RECIPE.C.O.PATTERN";//$NON-NLS-1$
99+
public static final String ENV_KEY_RECIPE_CPP_O_PATTERN = ENV_KEY_BOARD_START + "RECIPE.CPP.O.PATTERN";//$NON-NLS-1$
100+
public static final String ENV_KEY_RECIPE_S_O_PATTERN = ENV_KEY_BOARD_START + "RECIPE.S.O.PATTERN";//$NON-NLS-1$
101+
public static final String ENV_KEY_RECIPE_OBJCOPY_HEX_PATTERN = ENV_KEY_BOARD_START + "RECIPE.OBJCOPY.HEX.PATTERN";//$NON-NLS-1$
102+
public static final String ENV_KEY_RECIPE_OBJCOPY_EEP_PATTERN = ENV_KEY_BOARD_START + "RECIPE.OBJCOPY.EEP.PATTERN";//$NON-NLS-1$
103+
public static final String ENV_KEY_RECIPE_SIZE_PATTERN = ENV_KEY_BOARD_START + "RECIPE.SIZE.PATTERN";//$NON-NLS-1$
104+
public static final String ENV_KEY_RECIPE_AR_PATTERN = ENV_KEY_BOARD_START + "RECIPE.AR.PATTERN";//$NON-NLS-1$
105+
public static final String ENV_KEY_RECIPE_C_COMBINE_PATTERN = ENV_KEY_BOARD_START + "RECIPE.C.COMBINE.PATTERN"; //$NON-NLS-1$
106+
107+
public static final String ENV_KEY_BUILD_VARIANT = ENV_KEY_BOARD_START + "BUILD.VARIANT";//$NON-NLS-1$
108+
public static final String ENV_KEY_COMPILER_PATH = ENV_KEY_BOARD_START + "COMPILER.PATH";//$NON-NLS-1$
109+
public static final String ENV_KEY_BUILD_SYSTEM_PATH = ENV_KEY_BOARD_START + "BUILD.SYSTEM.PATH";//$NON-NLS-1$
110+
public static final String ENV_KEY_BUILD_GENERIC_PATH = ENV_KEY_BOARD_START + "BUILD.GENERIC.PATH";//$NON-NLS-1$
111111
public static final String ENV_KEY_SOFTWARE = ENV_KEY_BOARD_START + "SOFTWARE";//$NON-NLS-1$
112112
public static final String ENV_KEY_ARCHITECTURE = ENV_KEY_BOARD_START + "ARCHITECTURE";//$NON-NLS-1$
113113
public static final String ENV_KEY_BUILD_ARCH = ENV_KEY_BOARD_START + "BUILD.ARCH";//$NON-NLS-1$
114114
public static final String ENV_KEY_HARDWARE_PATH = ENV_KEY_BOARD_START + "RUNTIME.HARDWARE.PATH";//$NON-NLS-1$
115115
public static final String ENV_KEY_PLATFORM_PATH = ENV_KEY_BOARD_START + "RUNTIME.PLATFORM.PATH";//$NON-NLS-1$
116116

117-
public static final String ENV_KEY_build_path = ENV_KEY_BOARD_START + "BUILD.PATH";//$NON-NLS-1$
118-
public static final String ENV_KEY_build_project_name = ENV_KEY_BOARD_START + "BUILD.PROJECT_NAME";//$NON-NLS-1$
119-
public static final String ENV_KEY_build_variant_path = ENV_KEY_BOARD_START + "BUILD.VARIANT.PATH";//$NON-NLS-1$
120-
public static final String ENV_KEY_upload_use_1200bps_touch = ENV_KEY_BOARD_START + "UPLOAD.USE_1200BPS_TOUCH";//$NON-NLS-1$
121-
public static final String ENV_KEY_upload_disable_flushing = ENV_KEY_BOARD_START + "UPLOAD.DISABLE_FLUSHING";//$NON-NLS-1$
122-
public static final String ENV_KEY_wait_for_upload_port = ENV_KEY_BOARD_START + "UPLOAD.WAIT_FOR_UPLOAD_PORT";//$NON-NLS-1$
123-
public static final String ENV_KEY_upload_tool = ENV_KEY_BOARD_START + "UPLOAD.TOOL";//$NON-NLS-1$
117+
public static final String ENV_KEY_BUILD_PATH = ENV_KEY_BOARD_START + "BUILD.PATH";//$NON-NLS-1$
118+
public static final String ENV_KEY_BUILD_PROJECT_NAME = ENV_KEY_BOARD_START + "BUILD.PROJECT_NAME";//$NON-NLS-1$
119+
public static final String ENV_KEY_BUILD_VARIANT_PATH = ENV_KEY_BOARD_START + "BUILD.VARIANT.PATH";//$NON-NLS-1$
120+
public static final String ENV_KEY_UPLOAD_USE_1200BPS_TOUCH = ENV_KEY_BOARD_START + "UPLOAD.USE_1200BPS_TOUCH";//$NON-NLS-1$
121+
public static final String ENV_KEY_UPLOAD_DISABLE_FLUSHING = ENV_KEY_BOARD_START + "UPLOAD.DISABLE_FLUSHING";//$NON-NLS-1$
122+
public static final String ENV_KEY_WAIT_FOR_UPLOAD_PORT = ENV_KEY_BOARD_START + "UPLOAD.WAIT_FOR_UPLOAD_PORT";//$NON-NLS-1$
123+
public static final String ENV_KEY_UPLOAD_TOOL = ENV_KEY_BOARD_START + "UPLOAD.TOOL";//$NON-NLS-1$
124124
public static final String ENV_KEY_UPLOAD_PROTOCOL = ENV_KEY_BOARD_START + "UPLOAD.PROTOCOL";//$NON-NLS-1$
125-
public static final String ENV_KEY_build_core = ENV_KEY_BOARD_START + "BUILD.CORE";//$NON-NLS-1$
126-
public static final String ENV_KEY_build_core_path = ENV_KEY_BOARD_START + "BUILD.CORE.PATH";//$NON-NLS-1$
127-
public static final String ENV_KEY_use_archiver = ENV_KEY_BOARD_START + "BUILD.USE_ARCHIVER";//$NON-NLS-1$
125+
public static final String ENV_KEY_BUILD_CORE = ENV_KEY_BOARD_START + "BUILD.CORE";//$NON-NLS-1$
126+
public static final String ENV_KEY_BUILD_CORE_PATH = ENV_KEY_BOARD_START + "BUILD.CORE.PATH";//$NON-NLS-1$
127+
public static final String ENV_KEY_USE_ARCHIVER = ENV_KEY_BOARD_START + "BUILD.USE_ARCHIVER";//$NON-NLS-1$
128128
public static final String ENV_KEY_SERIAL_PORT = ENV_KEY_BOARD_START + "SERIAL.PORT";//$NON-NLS-1$
129129
public static final String ENV_KEY_SERIAL_PORT_FILE = ENV_KEY_BOARD_START + "SERIAL.PORT.FILE";//$NON-NLS-1$
130130

‎it.baeyens.arduino.core/src/it/baeyens/arduino/communication/ArduinoSerial.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,14 +166,14 @@ public static String makeArduinoUploadready(MessageConsoleStream console, IProje
166166
String ComPort) {
167167
// ArduinoProperties arduinoProperties = new ArduinoProperties(project);
168168
boolean use_1200bps_touch = Common
169-
.getBuildEnvironmentVariable(project, configName, Const.ENV_KEY_upload_use_1200bps_touch, Const.FALSE)
169+
.getBuildEnvironmentVariable(project, configName, Const.ENV_KEY_UPLOAD_USE_1200BPS_TOUCH, Const.FALSE)
170170
.equalsIgnoreCase(Const.TRUE);
171171
// boolean bDisableFlushing = Common
172172
// .getBuildEnvironmentVariable(project, configName,
173173
// Const.ENV_KEY_upload_disable_flushing, Const.FALSE)
174174
// .equalsIgnoreCase(Const.TRUE);
175175
boolean bwait_for_upload_port = Common
176-
.getBuildEnvironmentVariable(project, configName, Const.ENV_KEY_wait_for_upload_port, Const.FALSE)
176+
.getBuildEnvironmentVariable(project, configName, Const.ENV_KEY_WAIT_FOR_UPLOAD_PORT, Const.FALSE)
177177
.equalsIgnoreCase(Const.TRUE);
178178
String boardName = Common.getBuildEnvironmentVariable(project, configName, Const.ENV_KEY_JANTJE_BOARD_NAME,
179179
Const.EMPTY_STRING);

‎it.baeyens.arduino.core/src/it/baeyens/arduino/listeners/ConfigurationChangeListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void handleEvent(CProjectDescriptionEvent event) {
3333

3434
// only handle arduino nature projects
3535
try {
36-
if (!event.getProject().hasNature(Const.ArduinoNatureID)) {
36+
if (!event.getProject().hasNature(Const.ARDUINO_NATURE_ID)) {
3737
return;
3838
}
3939
} catch (Exception e) {

‎it.baeyens.arduino.core/src/it/baeyens/arduino/listeners/IndexerListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class IndexerListener implements IIndexChangeListener, IIndexerStateListe
3030
public void indexChanged(IIndexChangeEvent event) {
3131
IProject project = event.getAffectedProject().getProject();
3232
try {
33-
if (project.hasNature(Const.ArduinoNatureID)) {
33+
if (project.hasNature(Const.ARDUINO_NATURE_ID)) {
3434
this.ChangedProjects.add(project);
3535
}
3636
} catch (CoreException e) {

‎it.baeyens.arduino.core/src/it/baeyens/arduino/natures/ArduinoNature.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import it.baeyens.arduino.common.Const;
1111

1212
public class ArduinoNature implements IProjectNature {
13-
public static final String NATURE_ID = Const.ArduinoNatureID;
13+
public static final String NATURE_ID = Const.ARDUINO_NATURE_ID;
1414
private static final String BUILDER_ID = "it.baeyens.arduino.core.inoToCpp"; //$NON-NLS-1$
1515

1616
private IProject myProject = null;

‎it.baeyens.arduino.core/src/it/baeyens/arduino/toolchain/ArchiveNameProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public IPath[] getOutputNames(ITool tool, IPath[] primaryInputNames) {
2323
@Override
2424
public IPath[] getOutputNames(IProject project, IConfiguration cConf, ITool tool, IPath[] primaryInputNames) {
2525
IPath[] outputNames = new IPath[primaryInputNames.length];
26-
boolean bUseArchiver = Common.getBuildEnvironmentVariable(project, cConf.getName(), Const.ENV_KEY_use_archiver, Const.TRUE)
26+
boolean bUseArchiver = Common.getBuildEnvironmentVariable(project, cConf.getName(), Const.ENV_KEY_USE_ARCHIVER, Const.TRUE)
2727
.equalsIgnoreCase(Const.TRUE);
2828
for (int curPath = 0; curPath < primaryInputNames.length; curPath++) {
2929
if (primaryInputNames[curPath].toString().startsWith(Const.ARDUINO_CODE_FOLDER_NAME) && (bUseArchiver)) {

‎it.baeyens.arduino.core/src/it/baeyens/arduino/toolchain/ArduinoLanguageProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ protected String getCompilerCommand(String languageId) {
160160
// End of Bug fix for CDT 8.1 fixed in 8.2
161161
if (languageId.equals("org.eclipse.cdt.core.gcc")) { //$NON-NLS-1$
162162
try {
163-
compilerCommand = envManager.getVariable(Const.ENV_KEY_recipe_c_o_pattern, confDesc, true).getValue()
163+
compilerCommand = envManager.getVariable(Const.ENV_KEY_RECIPE_C_O_PATTERN, confDesc, true).getValue()
164164
.replace(" -o ", " "); //$NON-NLS-1$ //$NON-NLS-2$
165165
} catch (Exception e) {
166166
compilerCommand = Const.EMPTY_STRING;
@@ -178,7 +178,7 @@ protected String getCompilerCommand(String languageId) {
178178
compilerCommand = compilerCommand + " -D" + Const.DEFINE_IN_ECLIPSE + "=1"; //$NON-NLS-1$ //$NON-NLS-2$
179179
} else if (languageId.equals("org.eclipse.cdt.core.g++")) { //$NON-NLS-1$
180180
try {
181-
compilerCommand = envManager.getVariable(Const.ENV_KEY_recipe_cpp_o_pattern, confDesc, true).getValue()
181+
compilerCommand = envManager.getVariable(Const.ENV_KEY_RECIPE_CPP_O_PATTERN, confDesc, true).getValue()
182182
.replace(" -o ", " "); //$NON-NLS-1$//$NON-NLS-2$
183183
} catch (Exception e) {
184184
compilerCommand = Const.EMPTY_STRING;

‎it.baeyens.arduino.core/src/it/baeyens/arduino/toolchain/LinkNameProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public IPath[] getOutputNames(ITool tool, IPath[] primaryInputNames) {
2222

2323
@Override
2424
public IPath[] getOutputNames(IProject project, IConfiguration cConf, ITool tool, IPath[] primaryInputNames) {
25-
boolean bUseArchiver = Common.getBuildEnvironmentVariable(project, cConf.getName(), Const.ENV_KEY_use_archiver, Const.TRUE)
25+
boolean bUseArchiver = Common.getBuildEnvironmentVariable(project, cConf.getName(), Const.ENV_KEY_USE_ARCHIVER, Const.TRUE)
2626
.equalsIgnoreCase(Const.TRUE);
2727
IPath[] outputNames = new IPath[primaryInputNames.length];
2828
for (int curPath = 0; curPath < outputNames.length; curPath++) {

0 commit comments

Comments
 (0)