Author: sshyrkov
Date: Mon Nov 19 12:02:51 2007
New Revision: 19213
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19213&repname=
=3Djahia
Log:
Solve varargs warning due to upgrade to Java 5
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/registries/En=
ginesRegistry.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/logg=
er/LoggerResources.java
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/registr=
ies/EnginesRegistry.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/registries/EnginesRegistry.java&rev=3D=
19213&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/registries/En=
ginesRegistry.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/registries/En=
ginesRegistry.java Mon Nov 19 12:02:51 2007
@@ -152,11 +152,11 @@
logger.debug("Attempting to instantiate engine class [" + classNam=
e + "]");
try {
final Class self =3D Class.forName(className);
- final java.lang.reflect.Method aMethod =3D self.getMethod("get=
Instance", null);
+ final java.lang.reflect.Method aMethod =3D self.getMethod("get=
Instance", (Class) null);
=
if (aMethod !=3D null) {
try {
- engine =3D (JahiaEngine) aMethod.invoke(self, null);
+ engine =3D (JahiaEngine) aMethod.invoke(self, (Object)=
null);
=
} catch (java.lang.reflect.InvocationTargetException ite) {
logger.error("Error while invoking singleton construct=
or for class [" +
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/service=
s/logger/LoggerResources.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/services/logger/LoggerResources.java&r=
ev=3D19213&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/logg=
er/LoggerResources.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/logg=
er/LoggerResources.java Mon Nov 19 12:02:51 2007
@@ -86,7 +86,7 @@
if (arguments !=3D null) {
try {
value =3D MessageFormat.format(
- value, arguments);
+ value, (Object)
arguments);
} catch (IllegalArgumentException e) {
value =3D key;
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
