From 83f541a5db8747b1d2a7c019655071b2f4c7aa9e Mon Sep 17 00:00:00 2001
From: Noel Eck <noel.eck@intel.com>
Date: Mon, 19 Mar 2018 10:27:46 -0700
Subject: [PATCH] Tsl2561_Example: Removed duplicate Tsl2561_Example

It appears that an additional tsl2561 Java example existed.
Removed the *newer* Tsl2561_Example.java in favor of the original
example.  Updated all corresponding collateral which references the
Tsl2561_Example.java file (CMake and library descriptor file).

Signed-off-by: Noel Eck <noel.eck@intel.com>
---
 examples/java/CMakeLists.txt       |  1 -
 examples/java/Tsl2561_Example.java | 61 ------------------------------
 src/tsl2561/tsl2561.json           |  2 +-
 3 files changed, 1 insertion(+), 63 deletions(-)
 delete mode 100644 examples/java/Tsl2561_Example.java

diff --git a/examples/java/CMakeLists.txt b/examples/java/CMakeLists.txt
index 53031b18..ed246b5e 100644
--- a/examples/java/CMakeLists.txt
+++ b/examples/java/CMakeLists.txt
@@ -217,7 +217,6 @@ add_example(Th02_Example th02)
 add_example(TM1637_Example tm1637)
 add_example(TP401_Example gas)
 add_example(TSL2561_Example tsl2561)
-add_example(Tsl2561_Example tsl2561)
 add_example(TTP223_Example ttp223)
 add_example(ULN200XA_Example uln200xa)
 add_example(VDiv_Example vdiv)
diff --git a/examples/java/Tsl2561_Example.java b/examples/java/Tsl2561_Example.java
deleted file mode 100644
index 4033c4ec..00000000
--- a/examples/java/Tsl2561_Example.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Author: Abhishek Malik <abhishek.malik@intel.com>
- * Copyright (c) 2016 Intel Corporation.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-import upm_tsl2561.TSL2561;
-
-public class Tsl2561_Example {
-
-	static {
-		try {
-			System.loadLibrary("javaupm_tsl2561");
-			System.loadLibrary("mraajava");
-		} catch (UnsatisfiedLinkError e) {
-			System.err.println(
-					"Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" +
-							e);
-			System.exit(1);
-		}
-	}
-
-	public static void main(String[] args) {
-		// TODO Auto-generated method stub
-		//! [Interesting]
-		TSL2561 sensor = null;
-		int loopCount = 100;
-		// Instantiate the sensor object
-		sensor = new TSL2561();
-
-		for (int i=0; i<loopCount; i++){
-			// retrieving and displaying the Lux value
-			System.out.println("Lux: "+sensor.getLux());
-			try {
-				Thread.sleep(1000);
-			} catch (InterruptedException e) {
-				// TODO Auto-generated catch block
-				System.out.println("The following exception occurred: "+e.getMessage());
-			}
-		}
-		//! [Interesting]
-	}
-
-}
diff --git a/src/tsl2561/tsl2561.json b/src/tsl2561/tsl2561.json
index e8b19b67..cb5d4cf8 100644
--- a/src/tsl2561/tsl2561.json
+++ b/src/tsl2561/tsl2561.json
@@ -13,7 +13,7 @@
             "Kits": ["eak"],
             "Image": "tsl2561.jpg",
             "Examples": {
-                "Java": ["TSL2561_Example.java", "Tsl2561.java"],
+                "Java": ["TSL2561_Example.java"],
                 "Python": ["tsl2561.py"],
                 "Node.js": ["tsl2561.js"],
                 "C++": ["tsl2561.cxx"],