Author: sebb
Date: Tue Aug 18 00:02:46 2009
New Revision: 805234
URL: http://svn.apache.org/viewvc?rev=805234&view=rev
Log:
Fix up some raw types
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/MapProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/keystore/DefaultKeyStore.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/DataSet.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/MapProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/MapProperty.java?rev=805234&r1=805233&r2=805234&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/MapProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/MapProperty.java
Tue Aug 18 00:02:46 2009
@@ -26,9 +26,9 @@
private static final long serialVersionUID = 221L; // Remember to change
this when the class changes ...
- private Map value;
+ private Map<String, JMeterProperty> value;
- private transient Map savedValue = null;
+ private transient Map<String, JMeterProperty> savedValue = null;
public MapProperty(String name, Map value) {
super(name);
@@ -41,6 +41,7 @@
super();
}
+ /** {...@inheritdoc} */
@Override
public boolean equals(Object o) {
if (o instanceof MapProperty) {
@@ -51,19 +52,21 @@
return false;
}
+ /** {...@inheritdoc} */
public void setObjectValue(Object v) {
- if (v instanceof Map) {
- setMap((Map) v);
+ if (v instanceof Map<?, ?>) {
+ setMap((Map<?, ?>) v);
}
}
+ /** {...@inheritdoc} */
@Override
public void addProperty(JMeterProperty prop) {
addProperty(prop.getName(), prop);
}
public JMeterProperty get(String key) {
- return (JMeterProperty) value.get(key);
+ return value.get(key);
}
/**
@@ -73,27 +76,24 @@
* @see AbstractProperty#getPropertyType()
*/
@Override
- protected Class getPropertyType() {
+ protected Class<?> getPropertyType() {
if (value.size() > 0) {
return valueIterator().next().getClass();
}
return NullProperty.class;
}
- /**
- * @see JMeterProperty#getStringValue()
- */
+ /** {...@inheritdoc} */
public String getStringValue() {
return value.toString();
}
- /**
- * @see JMeterProperty#getObjectValue()
- */
+ /** {...@inheritdoc} */
public Object getObjectValue() {
return value;
}
+ /** {...@inheritdoc} */
@Override
public Object clone() {
MapProperty prop = (MapProperty) super.clone();
@@ -101,13 +101,13 @@
return prop;
}
- private Map cloneMap() {
+ private Map<String, JMeterProperty> cloneMap() {
try {
- Map newCol = value.getClass().newInstance();
+ Map<String, JMeterProperty> newCol =
value.getClass().newInstance();
PropertyIterator iter = valueIterator();
while (iter.hasNext()) {
JMeterProperty item = iter.next();
- newCol.put(item.getName(), item.clone());
+ newCol.put(item.getName(), (JMeterProperty) item.clone());
}
return newCol;
} catch (Exception e) {
@@ -130,9 +130,7 @@
value = normalizeMap(newMap);
}
- /**
- * @see JMeterProperty#recoverRunningVersion(TestElement)
- */
+ /** {...@inheritdoc} */
public void recoverRunningVersion(TestElement owner) {
if (savedValue != null) {
value = savedValue;
@@ -140,26 +138,19 @@
recoverRunningVersionOfSubElements(owner);
}
+ /** {...@inheritdoc} */
@Override
public void clear() {
value.clear();
}
- /*
- * (non-Javadoc)
- *
- * @see MultiProperty#iterator()
- */
+ /** {...@inheritdoc} */
@Override
public PropertyIterator iterator() {
return valueIterator();
}
- /*
- * (non-Javadoc)
- *
- * @see JMeterProperty#setRunningVersion(boolean)
- */
+ /** {...@inheritdoc} */
@Override
public void setRunningVersion(boolean running) {
super.setRunningVersion(running);
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java?rev=805234&r1=805233&r2=805234&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java
Tue Aug 18 00:02:46 2009
@@ -150,9 +150,9 @@
private void saveSamplerConfigs(Sampler sam) {
List<ConfigTestElement> configs = new LinkedList<ConfigTestElement>();
- List modifiers = new LinkedList();
+ List<?> modifiers = new LinkedList<Object>();
List<TestElement> controllers = new LinkedList<TestElement>();
- List responseModifiers = new LinkedList();
+ List<?> responseModifiers = new LinkedList<Object>();
List<SampleListener> listeners = new LinkedList<SampleListener>();
List<Timer> timers = new LinkedList<Timer>();
List<Assertion> assertions = new LinkedList<Assertion>();
@@ -197,9 +197,9 @@
private void saveTransactionControllerConfigs(TransactionController tc) {
List<ConfigTestElement> configs = new LinkedList<ConfigTestElement>();
- List modifiers = new LinkedList();
+ List<?> modifiers = new LinkedList<Object>();
List<TestElement> controllers = new LinkedList<TestElement>();
- List responseModifiers = new LinkedList();
+ List<?> responseModifiers = new LinkedList<Object>();
List<SampleListener> listeners = new LinkedList<SampleListener>();
List<Timer> timers = new LinkedList<Timer>();
List<Assertion> assertions = new LinkedList<Assertion>();
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/keystore/DefaultKeyStore.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/keystore/DefaultKeyStore.java?rev=805234&r1=805233&r2=805234&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/keystore/DefaultKeyStore.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/keystore/DefaultKeyStore.java
Tue Aug 18 00:02:46 2009
@@ -42,6 +42,7 @@
this.store = KeyStore.getInstance(type);
}
+ /** {...@inheritdoc} */
@Override
public void load(InputStream is, String pword) throws Exception {
store.load(is, pword.toCharArray());
@@ -50,9 +51,9 @@
if (null != is){ // No point checking an empty keystore
- Enumeration aliases = store.aliases();
+ Enumeration<String> aliases = store.aliases();
while (aliases.hasMoreElements()) {
- this.alias = (String) aliases.nextElement();
+ this.alias = aliases.nextElement();
if (store.isKeyEntry(alias)) {
_key = (PrivateKey) store.getKey(alias,
pword.toCharArray());
Certificate[] chain = store.getCertificateChain(alias);
@@ -78,16 +79,19 @@
this.certChain = _certChain;
}
+ /** {...@inheritdoc} */
@Override
public final X509Certificate[] getCertificateChain() {
return this.certChain;
}
+ /** {...@inheritdoc} */
@Override
public final PrivateKey getPrivateKey() {
return this.key;
}
+ /** {...@inheritdoc} */
@Override
public final String getAlias() {
return this.alias;
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java?rev=805234&r1=805233&r2=805234&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java
(original)
+++
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java
Tue Aug 18 00:02:46 2009
@@ -81,9 +81,9 @@
}
public void addAll(StatCalculator calc) {
- Iterator iter = calc.values.iterator();
+ Iterator<Number> iter = calc.values.iterator();
while (iter.hasNext()) {
- addValue((Number) iter.next());
+ addValue(iter.next());
}
}
@@ -136,13 +136,14 @@
*
*/
public synchronized HashMap getDistribution() {
- HashMap items = new HashMap();
- Iterator itr = this.values.iterator();
+ HashMap<Long, Number[]> items = new HashMap<Long, Number[]>();
+ Iterator<Number> itr = this.values.iterator();
Number[] dis;
while (itr.hasNext()) {
- Long nx = (Long) itr.next(); // TODO this assumes the entries are
all Long
+ Number num = itr.next();
+ Long nx = new Long(itr.next().longValue()); // TODO this assumes
the entries are all Long
if (items.containsKey(nx)) {
- dis = (Number[]) items.get(nx);
+ dis = items.get(nx);
dis[1] = new Integer(dis[1].intValue() + 1);
items.put(nx, dis);
} else {
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java?rev=805234&r1=805233&r2=805234&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
Tue Aug 18 00:02:46 2009
@@ -97,6 +97,7 @@
}
// ensure that the initial cookies are copied to the per-thread instances
+ /** {...@inheritdoc} */
@Override
public Object clone(){
CookieManager clone = (CookieManager) super.clone();
@@ -227,11 +228,13 @@
return sb.toString();
}
+ /** {...@inheritdoc} */
@Override
public void recoverRunningVersion() {
// do nothing, the cookie manager has to accept changes.
}
+ /** {...@inheritdoc} */
@Override
public void setRunningVersion(boolean running) {
// do nothing, the cookie manager has to accept changes.
@@ -263,6 +266,7 @@
}
}
+ /** {...@inheritdoc} */
@Override
public void clear(){
super.clear();
@@ -274,7 +278,7 @@
*/
private void clearCookies() {
log.debug("Clear all cookies from store");
- setProperty(new CollectionProperty(COOKIES, new ArrayList()));
+ setProperty(new CollectionProperty(COOKIES, new ArrayList<Object>()));
}
/**
Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/DataSet.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/DataSet.java?rev=805234&r1=805233&r2=805234&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/DataSet.java
(original)
+++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/DataSet.java Tue
Aug 18 00:02:46 2009
@@ -99,10 +99,11 @@
*/
public SamplingStatCalculator getStatistics(String url);
/**
- * Convienence method for getting all the SamplingStatCalculators for
+ * Convenience method for getting all the SamplingStatCalculators for
* a given URL.
* @param urls
*/
+ @SuppressWarnings("unchecked") // Method is broken anyway
public List<SamplingStatCalculator> getStats(List urls);
/**
* Classes implementing the method should load the data from
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
