Author: markt
Date: Sun Jan 9 14:48:08 2011
New Revision: 1056946
URL: http://svn.apache.org/viewvc?rev=1056946&view=rev
Log:
Fix a handful of warnings
Modified:
tomcat/trunk/java/javax/mail/Authenticator.java
tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java
tomcat/trunk/java/org/apache/naming/factory/Constants.java
tomcat/trunk/java/org/apache/naming/factory/EjbFactory.java
tomcat/trunk/java/org/apache/naming/factory/MailSessionFactory.java
tomcat/trunk/java/org/apache/naming/factory/OpenEjbFactory.java
tomcat/trunk/java/org/apache/naming/factory/ResourceEnvFactory.java
tomcat/trunk/java/org/apache/naming/factory/ResourceFactory.java
tomcat/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java
tomcat/trunk/java/org/apache/naming/factory/SendMailFactory.java
tomcat/trunk/java/org/apache/naming/factory/TransactionFactory.java
Modified: tomcat/trunk/java/javax/mail/Authenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/mail/Authenticator.java?rev=1056946&r1=1056945&r2=1056946&view=diff
==============================================================================
--- tomcat/trunk/java/javax/mail/Authenticator.java (original)
+++ tomcat/trunk/java/javax/mail/Authenticator.java Sun Jan 9 14:48:08 2011
@@ -17,5 +17,7 @@
package javax.mail;
public class Authenticator {
- // Dummy implementation
+ protected PasswordAuthentication getPasswordAuthentication() {
+ return null;
+ }
}
Modified: tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java?rev=1056946&r1=1056945&r2=1056946&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java Sun Jan 9
14:48:08 2011
@@ -107,6 +107,7 @@ public class BeanFactory
*
* @param obj The reference object describing the Bean
*/
+ @Override
public Object getObjectInstance(Object obj, Name name, Context nameCtx,
Hashtable<?,?> environment)
throws NamingException {
@@ -169,7 +170,8 @@ public class BeanFactory
valueArray[0] = value;
} else if (propType.equals(Character.class)
|| propType.equals(char.class)) {
- valueArray[0] = new Character(value.charAt(0));
+ valueArray[0] =
+ Character.valueOf(value.charAt(0));
} else if (propType.equals(Byte.class)
|| propType.equals(byte.class)) {
valueArray[0] = new Byte(value);
Modified: tomcat/trunk/java/org/apache/naming/factory/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/Constants.java?rev=1056946&r1=1056945&r2=1056946&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/Constants.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/Constants.java Sun Jan 9
14:48:08 2011
@@ -54,8 +54,6 @@ public final class Constants {
public static final String OPENEJB_EJB_FACTORY =
Package + ".OpenEjbFactory";
- public static final String OBJECT_FACTORIES = "";
-
public static final String FACTORY = "factory";
}
Modified: tomcat/trunk/java/org/apache/naming/factory/EjbFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/EjbFactory.java?rev=1056946&r1=1056945&r2=1056946&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/EjbFactory.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/EjbFactory.java Sun Jan 9
14:48:08 2011
@@ -61,6 +61,7 @@ public class EjbFactory
*
* @param obj The reference object describing the DataSource
*/
+ @Override
public Object getObjectInstance(Object obj, Name name, Context nameCtx,
Hashtable<?,?> environment)
throws Exception {
Modified: tomcat/trunk/java/org/apache/naming/factory/MailSessionFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/MailSessionFactory.java?rev=1056946&r1=1056945&r2=1056946&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/MailSessionFactory.java
(original)
+++ tomcat/trunk/java/org/apache/naming/factory/MailSessionFactory.java Sun Jan
9 14:48:08 2011
@@ -89,6 +89,7 @@ public class MailSessionFactory implemen
*
* @exception Exception if an error occurs during object creation
*/
+ @Override
public Object getObjectInstance(Object refObj, Name name, Context context,
Hashtable<?,?> env) throws Exception {
@@ -103,6 +104,7 @@ public class MailSessionFactory implemen
//
// Bugzilla 31288, 33077: add support for authentication.
return AccessController.doPrivileged(new PrivilegedAction<Session>() {
+ @Override
public Session run() {
// Create the JavaMail properties we will use
@@ -137,6 +139,7 @@ public class MailSessionFactory implemen
if(user != null) {
final PasswordAuthentication pa = new
PasswordAuthentication(user, password);
auth = new Authenticator() {
+ @Override
protected PasswordAuthentication
getPasswordAuthentication() {
return pa;
}
Modified: tomcat/trunk/java/org/apache/naming/factory/OpenEjbFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/OpenEjbFactory.java?rev=1056946&r1=1056945&r2=1056946&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/OpenEjbFactory.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/OpenEjbFactory.java Sun Jan 9
14:48:08 2011
@@ -55,6 +55,7 @@ public class OpenEjbFactory implements O
*
* @param obj The reference object describing the DataSource
*/
+ @Override
public Object getObjectInstance(Object obj, Name name, Context nameCtx,
Hashtable<?,?> environment)
throws Exception {
Modified: tomcat/trunk/java/org/apache/naming/factory/ResourceEnvFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/ResourceEnvFactory.java?rev=1056946&r1=1056945&r2=1056946&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/ResourceEnvFactory.java
(original)
+++ tomcat/trunk/java/org/apache/naming/factory/ResourceEnvFactory.java Sun Jan
9 14:48:08 2011
@@ -60,6 +60,7 @@ public class ResourceEnvFactory
*
* @param obj The reference object describing the DataSource
*/
+ @Override
public Object getObjectInstance(Object obj, Name name, Context nameCtx,
Hashtable<?,?> environment)
throws Exception {
Modified: tomcat/trunk/java/org/apache/naming/factory/ResourceFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/ResourceFactory.java?rev=1056946&r1=1056945&r2=1056946&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/ResourceFactory.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/ResourceFactory.java Sun Jan 9
14:48:08 2011
@@ -60,6 +60,7 @@ public class ResourceFactory
*
* @param obj The reference object describing the DataSource
*/
+ @Override
public Object getObjectInstance(Object obj, Name name, Context nameCtx,
Hashtable<?,?> environment)
throws Exception {
Modified: tomcat/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java?rev=1056946&r1=1056945&r2=1056946&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java
(original)
+++ tomcat/trunk/java/org/apache/naming/factory/ResourceLinkFactory.java Sun
Jan 9 14:48:08 2011
@@ -74,6 +74,7 @@ public class ResourceLinkFactory
*
* @param obj The reference object describing the DataSource
*/
+ @Override
public Object getObjectInstance(Object obj, Name name, Context nameCtx,
Hashtable<?,?> environment)
throws NamingException {
Modified: tomcat/trunk/java/org/apache/naming/factory/SendMailFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/SendMailFactory.java?rev=1056946&r1=1056945&r2=1056946&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/SendMailFactory.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/SendMailFactory.java Sun Jan 9
14:48:08 2011
@@ -26,7 +26,6 @@ import java.util.Properties;
import javax.mail.Session;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimePart;
import javax.mail.internet.MimePartDataSource;
import javax.naming.Context;
import javax.naming.Name;
@@ -80,6 +79,7 @@ public class SendMailFactory implements
protected final String DataSourceClassName =
"javax.mail.internet.MimePartDataSource";
+ @Override
public Object getObjectInstance(Object RefObj, Name Nm, Context Ctx,
Hashtable<?,?> Env) throws Exception {
final Reference Ref = (Reference)RefObj;
@@ -91,6 +91,7 @@ public class SendMailFactory implements
return AccessController.doPrivileged(
new PrivilegedAction<MimePartDataSource>()
{
+ @Override
public MimePartDataSource run() {
// set up the smtp session that will send the message
Properties props = new Properties();
@@ -114,8 +115,7 @@ public class SendMailFactory implements
message.setFrom(new InternetAddress(from));
message.setSubject("");
} catch (Exception e) {}
- MimePartDataSource mds = new MimePartDataSource(
- (MimePart)message);
+ MimePartDataSource mds = new MimePartDataSource(message);
return mds;
}
} );
Modified: tomcat/trunk/java/org/apache/naming/factory/TransactionFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/TransactionFactory.java?rev=1056946&r1=1056945&r2=1056946&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/TransactionFactory.java
(original)
+++ tomcat/trunk/java/org/apache/naming/factory/TransactionFactory.java Sun Jan
9 14:48:08 2011
@@ -60,6 +60,7 @@ public class TransactionFactory
*
* @param obj The reference object describing the DataSource
*/
+ @Override
public Object getObjectInstance(Object obj, Name name, Context nameCtx,
Hashtable<?,?> environment)
throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
