From: Mathieu Baudier Date: Sat, 14 Feb 2015 17:15:12 +0000 (+0000) Subject: Suppress warnings related to Java version X-Git-Tag: argeo-commons-2.1.30~350 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=807ccba419e96a18f7af67a66f986ae4c91c03d9;p=lgpl%2Fargeo-commons.git Suppress warnings related to Java version git-svn-id: https://svn.argeo.org/commons/trunk@7877 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/org.argeo.osgi.boot/build.properties b/org.argeo.osgi.boot/build.properties index 31b02d2fa..406d7996c 100644 --- a/org.argeo.osgi.boot/build.properties +++ b/org.argeo.osgi.boot/build.properties @@ -1 +1,3 @@ +source.. = src/,\ + ext/test/ additional.bundles = org.junit diff --git a/org.argeo.osgi.boot/ext/test/org/argeo/osgi/boot/OsgiBootNoRuntimeTest.java b/org.argeo.osgi.boot/ext/test/org/argeo/osgi/boot/OsgiBootNoRuntimeTest.java index 638b13a6d..2a4d2195a 100644 --- a/org.argeo.osgi.boot/ext/test/org/argeo/osgi/boot/OsgiBootNoRuntimeTest.java +++ b/org.argeo.osgi.boot/ext/test/org/argeo/osgi/boot/OsgiBootNoRuntimeTest.java @@ -23,6 +23,7 @@ import junit.framework.TestCase; import org.argeo.osgi.boot.OsgiBoot; /** Tests which do not require a runtime. */ +@SuppressWarnings("rawtypes") public class OsgiBootNoRuntimeTest extends TestCase { public final static String BUNDLES = "src/test/bundles/some;in=*;ex=excluded," + "src/test/bundles/others;in=**/org.argeo.*"; diff --git a/org.argeo.osgi.boot/ext/test/org/argeo/osgi/boot/OsgiBootRuntimeTest.java b/org.argeo.osgi.boot/ext/test/org/argeo/osgi/boot/OsgiBootRuntimeTest.java index 32b72bceb..7596c56a3 100644 --- a/org.argeo.osgi.boot/ext/test/org/argeo/osgi/boot/OsgiBootRuntimeTest.java +++ b/org.argeo.osgi.boot/ext/test/org/argeo/osgi/boot/OsgiBootRuntimeTest.java @@ -26,6 +26,7 @@ import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; /** Starts an Equinox runtime and provision it with OSGi boot. */ +@SuppressWarnings({ "unchecked", "rawtypes", "deprecation", "restriction" }) public class OsgiBootRuntimeTest extends TestCase { protected OsgiBoot osgiBoot = null; private boolean osgiRuntimeAlreadyRunning = false; diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/DistributionBundle.java b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/DistributionBundle.java index e6c04281f..340472558 100644 --- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/DistributionBundle.java +++ b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/DistributionBundle.java @@ -36,6 +36,7 @@ import org.osgi.framework.Constants; * expected that it is. The root of the repository is computed based on the file * name of the URL and of the content of the index. */ +@SuppressWarnings({ "rawtypes", "unchecked" }) public class DistributionBundle { private final static String INDEX_FILE_NAME = "modularDistribution.csv"; diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/Launcher.java b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/Launcher.java index 6af1a7184..ccba757d0 100644 --- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/Launcher.java +++ b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/Launcher.java @@ -25,6 +25,7 @@ import org.eclipse.core.runtime.adaptor.EclipseStarter; import org.osgi.framework.BundleContext; /** Command line interface. */ +@SuppressWarnings({ "rawtypes", "unchecked", "restriction" }) public class Launcher { public static void main(String[] args) { diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBoot.java b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBoot.java index 300ebb82d..a072e69ce 100644 --- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBoot.java +++ b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBoot.java @@ -49,6 +49,7 @@ import org.osgi.service.packageadmin.PackageAdmin; * The approach is to generate list of URLs based on various methods, configured * via system properties. */ +@SuppressWarnings({ "rawtypes", "unchecked", "deprecation" }) public class OsgiBoot { public final static String SYMBOLIC_NAME_OSGI_BOOT = "org.argeo.osgi.boot"; public final static String SYMBOLIC_NAME_EQUINOX = "org.eclipse.osgi"; diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBootUtils.java b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBootUtils.java index 20891c7f9..8c63344e5 100644 --- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBootUtils.java +++ b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBootUtils.java @@ -25,6 +25,7 @@ import java.util.StringTokenizer; import org.osgi.framework.Bundle; /** Utilities, mostly related to logging. */ +@SuppressWarnings({ "rawtypes", "unchecked" }) public class OsgiBootUtils { /** ISO8601 (as per log4j) and difference to UTC */ private static DateFormat dateFormat = new SimpleDateFormat( @@ -100,7 +101,7 @@ public class OsgiBootUtils { StringTokenizer tSt = new StringTokenizer(currentVersion, "."); while (tSt.hasMoreTokens()) tToks.add(tSt.nextToken()); - + int comp = 0; comp: for (int i = 0; i < cToks.size(); i++) { if (tToks.size() <= i) { @@ -108,10 +109,10 @@ public class OsgiBootUtils { comp = 1; break comp; } - + String c = (String) cToks.get(i); String t = (String) tToks.get(i); - + try { int cInt = Integer.parseInt(c); int tInt = Integer.parseInt(t); @@ -130,12 +131,12 @@ public class OsgiBootUtils { } } } - + if (comp == 0 && tToks.size() > cToks.size()) { // equals until then, current shorter comp = -1; } - + return comp; } diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/internal/springutil/CollectionUtils.java b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/internal/springutil/CollectionUtils.java index ad0154293..18cbe16ef 100644 --- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/internal/springutil/CollectionUtils.java +++ b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/internal/springutil/CollectionUtils.java @@ -32,6 +32,7 @@ import java.util.Properties; * @author Rob Harrop * @since 1.1.3 */ +@SuppressWarnings({ "rawtypes", "unchecked" }) public abstract class CollectionUtils { /** diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/internal/springutil/ObjectUtils.java b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/internal/springutil/ObjectUtils.java index 223b2a1c1..691aaf58c 100644 --- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/internal/springutil/ObjectUtils.java +++ b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/internal/springutil/ObjectUtils.java @@ -32,6 +32,7 @@ import java.util.Arrays; * @since 19.03.2004 * @see org.apache.commons.lang.ObjectUtils */ +@SuppressWarnings({ "rawtypes", "unchecked" }) public abstract class ObjectUtils { private static final int INITIAL_HASH = 7; diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/internal/springutil/StringUtils.java b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/internal/springutil/StringUtils.java index 262659044..83d91755b 100644 --- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/internal/springutil/StringUtils.java +++ b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/internal/springutil/StringUtils.java @@ -51,6 +51,7 @@ import java.util.TreeSet; * @since 16 April 2001 * @see org.apache.commons.lang.StringUtils */ +@SuppressWarnings({ "rawtypes", "unchecked" }) public abstract class StringUtils { private static final String FOLDER_SEPARATOR = "/"; diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/internal/springutil/SystemPropertyUtils.java b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/internal/springutil/SystemPropertyUtils.java index f81adc25b..ff81a2219 100644 --- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/internal/springutil/SystemPropertyUtils.java +++ b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/internal/springutil/SystemPropertyUtils.java @@ -45,6 +45,7 @@ public abstract class SystemPropertyUtils { * @see #PLACEHOLDER_PREFIX * @see #PLACEHOLDER_SUFFIX */ + @SuppressWarnings("unused") public static String resolvePlaceholders(String text) { StringBuffer buf = new StringBuffer(text);