You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2012/07/12 20:10:33 UTC
svn commit: r1360839 - in /tomcat/trunk/java/org/apache/catalina/ant/jmx:
Arg.java JMXAccessorCreateTask.java JMXAccessorInvokeTask.java
JMXAccessorTask.java
Author: markt
Date: Thu Jul 12 18:10:32 2012
New Revision: 1360839
URL: http://svn.apache.org/viewvc?rev=1360839&view=rev
Log:
Code clean-up for o.a.catalina.ant.jmx
- Add final prompted by UCDetector
- Java 7 use of <>
Modified:
tomcat/trunk/java/org/apache/catalina/ant/jmx/Arg.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/Arg.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/Arg.java?rev=1360839&r1=1360838&r2=1360839&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/Arg.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/Arg.java Thu Jul 12 18:10:32 2012
@@ -23,30 +23,17 @@ package org.apache.catalina.ant.jmx;
* @since 5.5.10
*/
public class Arg {
- /**
- * @deprecated Use getter/setter
- */
- @Deprecated
- String type;
- /**
- * @deprecated Use getter/setter
- */
- @Deprecated
- String value;
+
+ private String type;
+ private String value;
public void setType( String type) {
this.type=type;
}
+
public void setValue( String value ) {
this.value=value;
}
- /**
- * @deprecated Use {@link #setValue(String)}
- */
- @Deprecated
- public void addText( String text ) {
- this.value=text;
- }
public String getValue() {
return value;
Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java?rev=1360839&r1=1360838&r2=1360839&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java Thu Jul 12 18:10:32 2012
@@ -63,7 +63,7 @@ public class JMXAccessorCreateTask exten
private String className;
private String classLoader;
- private List<Arg> args=new ArrayList<Arg>();
+ private List<Arg> args=new ArrayList<>();
// ------------------------------------------------------------- Properties
Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java?rev=1360839&r1=1360838&r2=1360839&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java Thu Jul 12 18:10:32 2012
@@ -97,7 +97,7 @@ public class JMXAccessorInvokeTask exten
// ----------------------------------------------------- Instance Variables
private String operation ;
- private List<Arg> args=new ArrayList<Arg>();
+ private List<Arg> args=new ArrayList<>();
// ------------------------------------------------------------- Properties
Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java?rev=1360839&r1=1360838&r2=1360839&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java Thu Jul 12 18:10:32 2012
@@ -123,7 +123,7 @@ public class JMXAccessorTask extends Bas
private String ifCondition;
- private Properties properties = new Properties();
+ private final Properties properties = new Properties();
// ------------------------------------------------------------- Properties
@@ -362,7 +362,7 @@ public class JMXAccessorTask extends Bas
String[] credentials = new String[2];
credentials[0] = username;
credentials[1] = password;
- environment = new HashMap<String, String[]>();
+ environment = new HashMap<>();
environment.put(JMXConnector.CREDENTIALS, credentials);
}
return JMXConnectorFactory.connect(new JMXServiceURL(urlForJMX),
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org