Skip to content

Commit a61fbad

Browse files
jantjejantje
committed
Conflicts: it.baeyens.arduino.core/src/it/baeyens/arduino/tools/ShouldHaveBeenInCDT.java
2 parents 2c355c0 + 4cbef47 commit a61fbad

File tree

47 files changed

+693
-100
lines changed

Some content is hidden

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

47 files changed

+693
-100
lines changed

‎it.baeyens.arduino.common/.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
/bin
2-
1+
/bin
2+
33
/.settings
4+
/target

‎it.baeyens.arduino.common/META-INF/MANIFEST.MF

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: Common
44
Bundle-SymbolicName: it.baeyens.arduino.common
5-
Bundle-Version: 2.1.0.1
5+
Bundle-Version: 2.1.1.qualifier
66
Bundle-Activator: it.baeyens.arduino.common.Activator
77
Require-Bundle: org.eclipse.ui,
8-
org.eclipse.core.runtime
9-
Bundle-RequiredExecutionEnvironment: JavaSE-1.6,
10-
JavaSE-1.7
8+
org.eclipse.core.runtime,
9+
org.eclipse.jface.text
10+
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
1111
Bundle-ActivationPolicy: lazy
1212
Export-Package: it.baeyens.arduino.arduino,
1313
it.baeyens.arduino.common
@@ -16,7 +16,5 @@ Import-Package: org.eclipse.cdt.core,
1616
org.eclipse.cdt.core.model,
1717
org.eclipse.cdt.core.settings.model,
1818
org.eclipse.core.resources,
19-
org.eclipse.jface.text,
20-
org.eclipse.ui,
2119
org.eclipse.ui.navigator
2220
Bundle-Vendor: Jan Baeyens

‎it.baeyens.arduino.common/pom.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4+
<modelVersion>4.0.0</modelVersion>
5+
<parent>
6+
<groupId>it.baeyens.arduino</groupId>
7+
<artifactId>it.baeyens.arduino.parent</artifactId>
8+
<version>1.0.0-SNAPSHOT</version>
9+
<relativePath>../it.baeyens.arduino.parent</relativePath>
10+
</parent>
11+
<groupId>it.baeyens.arduino</groupId>
12+
<artifactId>it.baeyens.arduino.common</artifactId>
13+
<version>2.1.1-SNAPSHOT</version>
14+
<packaging>eclipse-plugin</packaging>
15+
</project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class ArduinoConst {
3939
public static final String KEY_LAST_USED_ARDUINO_MENU_OPTIONS = "Arduino Custom Option Selections";
4040

4141
// Serial monitor keys
42-
public static final String KEY_SERIAlRATE = "Serial monitor Last selected rate";
42+
public static final String KEY_SERIAlRATE = "Serial monitor last selected rate";
4343
public static final String KEY_SERIAlPORT = "Serial monitor last selected Port";
4444
public static final String KEY_RXTX_LAST_USED_LINE_INDES = "Serial Monitor Last Used Line Ending index";
4545
public static final String KEY_RXTX_LAST_USED_AUTOSCROLL = "Serial Monitor Last Used auto scroll setting";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ static public String getBuildEnvironmentVariable(ICConfigurationDescription conf
673673
IEnvironmentVariableManager envManager = CCorePlugin.getDefault().getBuildEnvironmentManager();
674674
try {
675675
return envManager.getVariable(EnvName, configurationDescription, expanded).getValue();
676-
} catch (Exception e) {// ignore al errors and return the default value
676+
} catch (Exception e) {// ignore all errors and return the default value
677677
}
678678
return defaultvalue;
679679
}

‎it.baeyens.arduino.core.nl1/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/target

‎it.baeyens.arduino.core.nl1/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: it.baeyens.arduino.core.nl1 Fragment
44
Bundle-SymbolicName: it.baeyens.arduino.core.nl1
5-
Bundle-Version: 1.0.0
5+
Bundle-Version: 1.0.0.qualifier
66
Fragment-Host: it.baeyens.arduino.core;bundle-version="[2.1.0,2.2.0)"

‎it.baeyens.arduino.core.nl1/pom.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4+
<modelVersion>4.0.0</modelVersion>
5+
<parent>
6+
<groupId>it.baeyens.arduino</groupId>
7+
<artifactId>it.baeyens.arduino.parent</artifactId>
8+
<version>1.0.0-SNAPSHOT</version>
9+
<relativePath>../it.baeyens.arduino.parent</relativePath>
10+
</parent>
11+
<groupId>it.baeyens.arduino</groupId>
12+
<artifactId>it.baeyens.arduino.core.nl1</artifactId>
13+
<version>1.0.0-SNAPSHOT</version>
14+
<packaging>eclipse-plugin</packaging>
15+
</project>

‎it.baeyens.arduino.core/.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
/bin
2-
1+
/bin
2+
33
/.settings
4+
/target

‎it.baeyens.arduino.core/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: Arduino eclipse plugin
44
Bundle-SymbolicName: it.baeyens.arduino.core;singleton:=true
5-
Bundle-Version: 2.1.0.4
5+
Bundle-Version: 2.1.4.qualifier
66
Bundle-RequiredExecutionEnvironment: JavaSE-1.6,
77
JavaSE-1.7
88
Require-Bundle: org.eclipse.core.runtime,

0 commit comments

Comments
 (0)