Skip to content

Use wrapper methods to remove duplicated code #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
amorellgarcia wants to merge 6 commits into from
Closed

Use wrapper methods to remove duplicated code #116

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3c08017
-Replace String.equals("") with String.isEmpty().
amorellgarcia Dec 24, 2013
fd0542b
-Move "true" and "false" strings to ArduinoConst.TRUE|FALSE
amorellgarcia Dec 24, 2013
b3fb608
-Create "true" and "false string constants in ArduinoConst
amorellgarcia Dec 24, 2013
f5b64b9
-New empty string constant ("") in ArduinoConst.
amorellgarcia Dec 24, 2013
ec300a4
-Add logError, logWarn and logInfo to class Common.
amorellgarcia Dec 24, 2013
2147c52
Remove unused imports.
amorellgarcia Dec 24, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
-Create "true" and "false string constants in ArduinoConst 
-Create a wrapper method (getBuildEnvironmentVariableBoolean) that
converts values to boolean from the getBuildEnvironmentVariable method.
  • Loading branch information
@amorellgarcia
amorellgarcia committed Dec 24, 2013
commit b3fb6086f0477dc07c0ad8bfffcbd6c4dfcf64a3
19 changes: 19 additions & 0 deletions it.baeyens.arduino.common/src/it/baeyens/arduino/common/Common.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,25 @@ static public String getBuildEnvironmentVariable(IProject project, String config
ICProjectDescription prjDesc = CoreModel.getDefault().getProjectDescription(project);
return getBuildEnvironmentVariable(prjDesc.getConfigurationByName(configName), EnvName, defaultvalue);
}

/**
*
* Wrapping method for {@link #getBuildEnvironmentVariable(ICConfigurationDescription, String, String)}.
* Only converts returned value to Boolean.
*
* @param project
* the project that contains the environment variable
* @param EnvName
* the key that describes the variable
* @param defaultvalue
* The return value if the variable is not found.
* @return
*/
static public boolean getBuildEnvironmentVariableBoolean(IProject project, String configName, String EnvName, boolean defaultvalue) {
String value = getBuildEnvironmentVariable(project, configName,
EnvName, Boolean.toString(defaultvalue));
return (value != null ? value.equalsIgnoreCase(ArduinoConst.TRUE) : false);
}

/**
*
Expand Down
16 changes: 9 additions & 7 deletions it.baeyens.arduino.core/src/it/baeyens/arduino/communication/ArduinoSerial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,15 +160,17 @@ public static String makeArduinoUploadready(IProject project, String configName,
if (Common.RXTXDisabled())
return ComPort;
// ArduinoProperties arduinoProperties = new ArduinoProperties(project);
String use_1200bps_touch = Common.getBuildEnvironmentVariable(project, configName, ArduinoConst.ENV_KEY_upload_use_1200bps_touch, ArduinoConst.FALSE);
boolean bDisableFlushing = Common.getBuildEnvironmentVariable(project, configName, ArduinoConst.ENV_KEY_upload_disable_flushing, ArduinoConst.FALSE)
.equalsIgnoreCase(ArduinoConst.TRUE);
boolean bwait_for_upload_port = Common.getBuildEnvironmentVariable(project, configName, ArduinoConst.ENV_KEY_wait_for_upload_port, ArduinoConst.FALSE)
.equalsIgnoreCase(ArduinoConst.TRUE);
boolean use_1200bps_touch = Common.getBuildEnvironmentVariableBoolean(project, configName, ArduinoConst.ENV_KEY_upload_use_1200bps_touch, false);
boolean bDisableFlushing = Common.getBuildEnvironmentVariableBoolean(project, configName, ArduinoConst.ENV_KEY_upload_disable_flushing, false);
boolean bwait_for_upload_port = Common.getBuildEnvironmentVariableBoolean(project, configName, ArduinoConst.ENV_KEY_wait_for_upload_port, false);
String boardName = Common.getBuildEnvironmentVariable(project, configName, ArduinoConst.ENV_KEY_BOARD_NAME, "");

if (boardName.equalsIgnoreCase("Arduino leonardo") || boardName.equalsIgnoreCase("Arduino Micro")
|| boardName.equalsIgnoreCase("Arduino Esplora") || boardName.startsWith("Arduino Due") || use_1200bps_touch.equalsIgnoreCase(ArduinoConst.TRUE)) {
if (boardName.equalsIgnoreCase("Arduino leonardo")
|| boardName.equalsIgnoreCase("Arduino Micro")
|| boardName.equalsIgnoreCase("Arduino Esplora")
|| boardName.startsWith("Arduino Due")
|| use_1200bps_touch)
{
Vector<String> OriginalPorts = Serial.list();
// OriginalPorts.remove(ComPort);
if (!reset_Arduino_by_baud_rate(ComPort, 1200, 100) || boardName.startsWith("Arduino Due"))
Expand Down
5 changes: 2 additions & 3 deletions it.baeyens.arduino.core/src/it/baeyens/arduino/toolchain/ArchiveNameProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@ public IPath[] getOutputNames(ITool tool, IPath[] primaryInputNames) {
@Override
public IPath[] getOutputNames(IProject project, IConfiguration cConf, ITool tool, IPath[] primaryInputNames) {
IPath[] outputNames = new IPath[primaryInputNames.length];
boolean bUseArchiver = Common.getBuildEnvironmentVariable(project,
cConf.getName(), ArduinoConst.ENV_KEY_use_archiver, ArduinoConst.TRUE
).equalsIgnoreCase(ArduinoConst.TRUE);
boolean bUseArchiver = Common.getBuildEnvironmentVariableBoolean(project,
cConf.getName(), ArduinoConst.ENV_KEY_use_archiver, true);
for (int curPath = 0; curPath < primaryInputNames.length; curPath++) {
Copy link
Member

@jantje jantje Dec 24, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line makes me think the codeformatting is not set as described in the readme https://github.com/jantje/arduino-eclipse-plugin

Copy link
Contributor Author

@amorellgarcia amorellgarcia Dec 24, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I was not using that code formatter. I will check code format and generate another pull.

Copy link
Member

@jantje jantje Dec 24, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

txs

if (primaryInputNames[curPath].toString().startsWith("arduino") && (bUseArchiver)) {
outputNames[curPath] = ArduinoHelpers.GetOutputName(primaryInputNames[curPath]).addFileExtension("o");
Expand Down
6 changes: 3 additions & 3 deletions it.baeyens.arduino.core/src/it/baeyens/arduino/toolchain/LinkNameProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ public IPath[] getOutputNames(ITool tool, IPath[] primaryInputNames) {

@Override
public IPath[] getOutputNames(IProject project, IConfiguration cConf, ITool tool, IPath[] primaryInputNames) {
boolean bUseArchiver = Common.getBuildEnvironmentVariable(project, cConf.getName(),
ArduinoConst.ENV_KEY_use_archiver, ArduinoConst.TRUE)
.equalsIgnoreCase(ArduinoConst.TRUE);
boolean bUseArchiver = Common.getBuildEnvironmentVariableBoolean(
project, cConf.getName(),
ArduinoConst.ENV_KEY_use_archiver, true);
IPath[] outputNames = new IPath[primaryInputNames.length];
for (int curPath = 0; curPath < outputNames.length; curPath++) {
if (primaryInputNames[curPath].toString().startsWith("arduino") && (bUseArchiver)) {
Expand Down