attempting to fix issues #28

source files updated with new copyright year
Pi4J · Jan 8, 2013 · b5a120c · b5a120c
1 parent 1d628f7
commit b5a120c
Show file tree

Hide file tree

Showing 30 changed files with 64 additions and 33 deletions.
diff --git a/pi4j-core/src/test/java/com/pi4j/util/StringUtilTests.java b/pi4j-core/src/test/java/com/pi4j/util/StringUtilTests.java
@@ -1,5 +1,33 @@
 package com.pi4j.util;
 
+/*
+ * #%L
+ * **********************************************************************
+ * ORGANIZATION  :  Pi4J
+ * PROJECT       :  Pi4J :: Java Library (Core)
+ * FILENAME      :  StringUtilTests.java  
+ * 
+ * This file is part of the Pi4J project. More information about 
+ * this project can be found here:  http://www.pi4j.com/
+ * **********************************************************************
+ * %%
+ * Copyright (C) 2012 - 2013 Pi4J
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+
 import static org.junit.Assert.*;
 
 import org.junit.BeforeClass;

diff --git a/pi4j-example/src/main/java/LcdExample.java b/pi4j-example/src/main/java/LcdExample.java
@@ -4,7 +4,7 @@
  * **********************************************************************
  * ORGANIZATION  :  Pi4J
  * PROJECT       :  Pi4J :: Java Examples
- * FILENAME      :  WiringPiGpioExample.java  
+ * FILENAME      :  LcdExample.java  
  * 
  * This file is part of the Pi4J project. More information about 
  * this project can be found here:  http://www.pi4j.com/

diff --git a/pi4j-example/src/main/java/WiringPiLcdExample.java b/pi4j-example/src/main/java/WiringPiLcdExample.java
@@ -4,7 +4,7 @@
  * **********************************************************************
  * ORGANIZATION  :  Pi4J
  * PROJECT       :  Pi4J :: Java Examples
- * FILENAME      :  WiringPiGpioExample.java  
+ * FILENAME      :  WiringPiLcdExample.java  
  * 
  * This file is part of the Pi4J project. More information about 
  * this project can be found here:  http://www.pi4j.com/

diff --git a/pi4j-native/src/main/native/com_pi4j_jni_I2C.c b/pi4j-native/src/main/native/com_pi4j_jni_I2C.c
@@ -9,7 +9,7 @@
  * this project can be found here:  http://www.pi4j.com/
  * **********************************************************************
  * %%
- * Copyright (C) 2012 Pi4J
+ * Copyright (C) 2012 - 2013 Pi4J
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/pi4j-native/src/main/native/com_pi4j_jni_I2C.h b/pi4j-native/src/main/native/com_pi4j_jni_I2C.h
@@ -9,7 +9,7 @@
  * this project can be found here:  http://www.pi4j.com/
  * **********************************************************************
  * %%
- * Copyright (C) 2012 Pi4J
+ * Copyright (C) 2012 - 2013 Pi4J
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/pi4j-native/src/main/native/com_pi4j_jni_Serial.c b/pi4j-native/src/main/native/com_pi4j_jni_Serial.c
@@ -9,7 +9,7 @@
  * this project can be found here:  http://www.pi4j.com/
  * **********************************************************************
  * %%
- * Copyright (C) 2012 Pi4J
+ * Copyright (C) 2012 - 2013 Pi4J
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/pi4j-native/src/main/native/com_pi4j_jni_Serial.h b/pi4j-native/src/main/native/com_pi4j_jni_Serial.h
@@ -9,7 +9,7 @@
  * this project can be found here:  http://www.pi4j.com/
  * **********************************************************************
  * %%
- * Copyright (C) 2012 Pi4J
+ * Copyright (C) 2012 - 2013 Pi4J
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/pi4j-native/src/main/native/com_pi4j_wiringpi_Gertboard.c b/pi4j-native/src/main/native/com_pi4j_wiringpi_Gertboard.c
@@ -9,7 +9,7 @@
  * this project can be found here:  http://www.pi4j.com/
  * **********************************************************************
  * %%
- * Copyright (C) 2012 Pi4J
+ * Copyright (C) 2012 - 2013 Pi4J
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/pi4j-native/src/main/native/com_pi4j_wiringpi_Gertboard.h b/pi4j-native/src/main/native/com_pi4j_wiringpi_Gertboard.h
@@ -9,7 +9,7 @@
  * this project can be found here:  http://www.pi4j.com/
  * **********************************************************************
  * %%
- * Copyright (C) 2012 Pi4J
+ * Copyright (C) 2012 - 2013 Pi4J
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/pi4j-native/src/main/native/com_pi4j_wiringpi_Gpio.c b/pi4j-native/src/main/native/com_pi4j_wiringpi_Gpio.c
@@ -9,7 +9,7 @@
  * this project can be found here:  http://www.pi4j.com/
  * **********************************************************************
  * %%
- * Copyright (C) 2012 Pi4J
+ * Copyright (C) 2012 - 2013 Pi4J
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/pi4j-native/src/main/native/com_pi4j_wiringpi_Gpio.h b/pi4j-native/src/main/native/com_pi4j_wiringpi_Gpio.h
@@ -9,7 +9,7 @@
  * this project can be found here:  http://www.pi4j.com/
  * **********************************************************************
  * %%
- * Copyright (C) 2012 Pi4J
+ * Copyright (C) 2012 - 2013 Pi4J
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/pi4j-native/src/main/native/com_pi4j_wiringpi_GpioInterrupt.c b/pi4j-native/src/main/native/com_pi4j_wiringpi_GpioInterrupt.c
@@ -9,7 +9,7 @@
  * this project can be found here:  http://www.pi4j.com/
  * **********************************************************************
  * %%
- * Copyright (C) 2012 Pi4J
+ * Copyright (C) 2012 - 2013 Pi4J
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/pi4j-native/src/main/native/com_pi4j_wiringpi_GpioInterrupt.h b/pi4j-native/src/main/native/com_pi4j_wiringpi_GpioInterrupt.h
@@ -9,7 +9,7 @@
  * this project can be found here:  http://www.pi4j.com/
  * **********************************************************************
  * %%
- * Copyright (C) 2012 Pi4J
+ * Copyright (C) 2012 - 2013 Pi4J
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/pi4j-native/src/main/native/com_pi4j_wiringpi_GpioPin.c b/pi4j-native/src/main/native/com_pi4j_wiringpi_GpioPin.c
@@ -9,7 +9,7 @@
  * this project can be found here:  http://www.pi4j.com/
  * **********************************************************************
  * %%
- * Copyright (C) 2012 Pi4J
+ * Copyright (C) 2012 - 2013 Pi4J
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/pi4j-native/src/main/native/com_pi4j_wiringpi_GpioPin.h b/pi4j-native/src/main/native/com_pi4j_wiringpi_GpioPin.h
@@ -9,7 +9,7 @@
  * this project can be found here:  http://www.pi4j.com/
  * **********************************************************************
  * %%
- * Copyright (C) 2012 Pi4J
+ * Copyright (C) 2012 - 2013 Pi4J
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/pi4j-native/src/main/native/com_pi4j_wiringpi_GpioUtil.c b/pi4j-native/src/main/native/com_pi4j_wiringpi_GpioUtil.c
@@ -9,7 +9,7 @@
  * this project can be found here:  http://www.pi4j.com/
  * **********************************************************************
  * %%
- * Copyright (C) 2012 Pi4J
+ * Copyright (C) 2012 - 2013 Pi4J
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/pi4j-native/src/main/native/com_pi4j_wiringpi_GpioUtil.h b/pi4j-native/src/main/native/com_pi4j_wiringpi_GpioUtil.h
@@ -9,7 +9,7 @@
  * this project can be found here:  http://www.pi4j.com/
  * **********************************************************************
  * %%
- * Copyright (C) 2012 Pi4J
+ * Copyright (C) 2012 - 2013 Pi4J
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/pi4j-native/src/main/native/com_pi4j_wiringpi_Lcd.c b/pi4j-native/src/main/native/com_pi4j_wiringpi_Lcd.c
@@ -9,7 +9,7 @@
  * this project can be found here:  http://www.pi4j.com/
  * **********************************************************************
  * %%
- * Copyright (C) 2012 Pi4J
+ * Copyright (C) 2012 - 2013 Pi4J
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/pi4j-native/src/main/native/com_pi4j_wiringpi_Lcd.h b/pi4j-native/src/main/native/com_pi4j_wiringpi_Lcd.h
@@ -9,7 +9,7 @@
  * this project can be found here:  http://www.pi4j.com/
  * **********************************************************************
  * %%
- * Copyright (C) 2012 Pi4J
+ * Copyright (C) 2012 - 2013 Pi4J
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/pi4j-native/src/main/native/com_pi4j_wiringpi_Nes.c b/pi4j-native/src/main/native/com_pi4j_wiringpi_Nes.c
@@ -9,7 +9,7 @@
  * this project can be found here:  http://www.pi4j.com/
  * **********************************************************************
  * %%
- * Copyright (C) 2012 Pi4J
+ * Copyright (C) 2012 - 2013 Pi4J
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/pi4j-native/src/main/native/com_pi4j_wiringpi_Nes.h b/pi4j-native/src/main/native/com_pi4j_wiringpi_Nes.h
@@ -9,7 +9,7 @@
  * this project can be found here:  http://www.pi4j.com/
  * **********************************************************************
  * %%
- * Copyright (C) 2012 Pi4J
+ * Copyright (C) 2012 - 2013 Pi4J
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/pi4j-native/src/main/native/com_pi4j_wiringpi_Serial.c b/pi4j-native/src/main/native/com_pi4j_wiringpi_Serial.c
@@ -9,7 +9,7 @@
  * this project can be found here:  http://www.pi4j.com/
  * **********************************************************************
  * %%
- * Copyright (C) 2012 Pi4J
+ * Copyright (C) 2012 - 2013 Pi4J
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/pi4j-native/src/main/native/com_pi4j_wiringpi_Serial.h b/pi4j-native/src/main/native/com_pi4j_wiringpi_Serial.h
@@ -9,7 +9,7 @@
  * this project can be found here:  http://www.pi4j.com/
  * **********************************************************************
  * %%
- * Copyright (C) 2012 Pi4J
+ * Copyright (C) 2012 - 2013 Pi4J
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/pi4j-native/src/main/native/com_pi4j_wiringpi_Shift.c b/pi4j-native/src/main/native/com_pi4j_wiringpi_Shift.c
@@ -9,7 +9,7 @@
  * this project can be found here:  http://www.pi4j.com/
  * **********************************************************************
  * %%
- * Copyright (C) 2012 Pi4J
+ * Copyright (C) 2012 - 2013 Pi4J
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/pi4j-native/src/main/native/com_pi4j_wiringpi_Shift.h b/pi4j-native/src/main/native/com_pi4j_wiringpi_Shift.h
@@ -9,7 +9,7 @@
  * this project can be found here:  http://www.pi4j.com/
  * **********************************************************************
  * %%
- * Copyright (C) 2012 Pi4J
+ * Copyright (C) 2012 - 2013 Pi4J
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/pi4j-native/src/main/native/com_pi4j_wiringpi_SoftPwm.c b/pi4j-native/src/main/native/com_pi4j_wiringpi_SoftPwm.c
@@ -9,7 +9,7 @@
  * this project can be found here:  http://www.pi4j.com/
  * **********************************************************************
  * %%
- * Copyright (C) 2012 Pi4J
+ * Copyright (C) 2012 - 2013 Pi4J
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/pi4j-native/src/main/native/com_pi4j_wiringpi_SoftPwm.h b/pi4j-native/src/main/native/com_pi4j_wiringpi_SoftPwm.h
@@ -9,7 +9,7 @@
  * this project can be found here:  http://www.pi4j.com/
  * **********************************************************************
  * %%
- * Copyright (C) 2012 Pi4J
+ * Copyright (C) 2012 - 2013 Pi4J
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/pi4j-native/src/main/native/com_pi4j_wiringpi_Spi.c b/pi4j-native/src/main/native/com_pi4j_wiringpi_Spi.c
@@ -9,7 +9,7 @@
  * this project can be found here:  http://www.pi4j.com/
  * **********************************************************************
  * %%
- * Copyright (C) 2012 Pi4J
+ * Copyright (C) 2012 - 2013 Pi4J
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,9 +52,12 @@ JNIEXPORT jint JNICALL Java_com_pi4j_wiringpi_Spi_wiringPiSPIDataRW
 	char datachararr[2048];
 	int len = (*env)->GetStringLength(env, data);
 	(*env)->GetStringUTFRegion(env, data, 0, len, datachararr);
-	return wiringPiSPIDataRW(channel, (unsigned char *)datachararr, length);
-}
+	jint result = wiringPiSPIDataRW(channel, (unsigned char *)datachararr, length);
+	jstring returnString = (*env)->NewStringUTF(env, datachararr);
+    data = returnString;
 
+	return result;
+}
 
 /*
  * Class:     com_pi4j_wiringpi_Spi

diff --git a/pi4j-native/src/main/native/com_pi4j_wiringpi_Spi.h b/pi4j-native/src/main/native/com_pi4j_wiringpi_Spi.h
@@ -9,7 +9,7 @@
  * this project can be found here:  http://www.pi4j.com/
  * **********************************************************************
  * %%
- * Copyright (C) 2012 Pi4J
+ * Copyright (C) 2012 - 2013 Pi4J
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/pi4j-native/src/main/native/wiringpi-build.sh b/pi4j-native/src/main/native/wiringpi-build.sh
@@ -9,7 +9,7 @@
 # this project can be found here:  http://www.pi4j.com/
 # **********************************************************************
 # %%
-# Copyright (C) 2012 Pi4J
+# Copyright (C) 2012 - 2013 Pi4J
 # %%
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ sudo apt-get install git-core -y
 # ----------------------------------
 # clone wiringPi from github
 # ----------------------------------
-git clone git://git.drogon.net/wiringPi
+git clone git://github.com/WiringPi/WiringPi.git wiringPi
 cd wiringPi
 git pull origin
 
@@ -48,4 +48,4 @@ sudo make uninstall
 # build latest wiringPi
 # ----------------------------------
 cd ..
-./build
+./build