Author: dkulp
Date: Fri Jan 6 14:52:07 2012
New Revision: 1228212
URL: http://svn.apache.org/viewvc?rev=1228212&view=rev
Log:
Fix another 200 rawtype warnings
Modified:
cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxSchemaHelper.java
cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxToolingDataBinding.java
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/SelectableTable.java
cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/settings/SettingsPresenter.java
cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/settings/SubscriptionDialog.java
cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/settings/SubscriptionDialogImpl.java
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/URISupport.java
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/Scope.java
cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/NamespaceContextImpl.java
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/AntGenerator.java
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ClientGenerator.java
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/SEIGenerator.java
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/WSDLToJavaProcessor.java
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
Modified:
cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java?rev=1228212&r1=1228211&r2=1228212&view=diff
==============================================================================
---
cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
(original)
+++
cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
Fri Jan 6 14:52:07 2012
@@ -111,7 +111,7 @@ public class JCABusFactory {
LOG.info("Initializing EJB endpoints from properties file...");
try {
- Enumeration keys = ejbServants.keys();
+ Enumeration<?> keys = ejbServants.keys();
while (keys.hasMoreElements()) {
String theJNDIName = (String)keys.nextElement();
String value = (String)ejbServants.get(theJNDIName);
@@ -208,7 +208,7 @@ public class JCABusFactory {
}
- protected List getRegisteredServants() {
+ protected List<Server> getRegisteredServants() {
return servantsCache;
}
Modified:
cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxSchemaHelper.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxSchemaHelper.java?rev=1228212&r1=1228211&r2=1228212&view=diff
==============================================================================
---
cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxSchemaHelper.java
(original)
+++
cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxSchemaHelper.java
Fri Jan 6 14:52:07 2012
@@ -155,7 +155,7 @@ public class JibxSchemaHelper {
private void getSchemaList(Definition def) {
Types typesElement = def.getTypes();
if (typesElement != null) {
- Iterator ite = typesElement.getExtensibilityElements().iterator();
+ Iterator<?> ite =
typesElement.getExtensibilityElements().iterator();
while (ite.hasNext()) {
Object obj = ite.next();
if (obj instanceof Schema) {
@@ -188,7 +188,7 @@ public class JibxSchemaHelper {
}
}
- Map<String, List> imports = CastUtils.cast(schema.getImports());
+ Map<String, List<?>> imports = CastUtils.cast(schema.getImports());
if (imports != null && imports.size() > 0) {
Collection<String> importKeys = imports.keySet();
for (String importNamespace : importKeys) {
Modified:
cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxToolingDataBinding.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxToolingDataBinding.java?rev=1228212&r1=1228211&r2=1228212&view=diff
==============================================================================
---
cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxToolingDataBinding.java
(original)
+++
cxf/trunk/rt/databinding/jibx/src/main/java/org/apache/cxf/jibx/tools/JibxToolingDataBinding.java
Fri Jan 6 14:52:07 2012
@@ -168,7 +168,7 @@ public class JibxToolingDataBinding impl
BindingUtils.getDefinitions(codegen.getRootBinding(), types,
elements, null);
- Iterator it = codegen.getBindingOrganizer().iterateBindings();
+ Iterator<?> it = codegen.getBindingOrganizer().iterateBindings();
while (it.hasNext()) {
BindingHolder o = (BindingHolder)it.next();
getDefinitions(o, types, elements);
@@ -246,7 +246,7 @@ public class JibxToolingDataBinding impl
private static String itemType(MappingElement mappingElement, QName qName)
{
String localPart = qName.getLocalPart();
- for (Iterator childIterator = mappingElement.childIterator();
childIterator.hasNext();) {
+ for (Iterator<?> childIterator = mappingElement.childIterator();
childIterator.hasNext();) {
Object child = childIterator.next();
if (child instanceof ValueElement) {
ValueElement valueElement = (ValueElement)child;
@@ -324,8 +324,8 @@ public class JibxToolingDataBinding impl
private String usingNamespace;
private String nonamespacePackage;
private String bindingName = "binding";
- private List fileset;
- private List includePaths = new ArrayList();
+ private List<?> fileset;
+ private List<?> includePaths = new ArrayList<Object>();
private File modelFile;
private BindingElement rootBinding;
private File compilePath;
@@ -368,15 +368,11 @@ public class JibxToolingDataBinding impl
this.bindingName = bindingName;
}
- public List getFileset() {
- return fileset;
- }
-
- public void setFileset(List fileset) {
+ public void setFileset(List<?> fileset) {
this.fileset = fileset;
}
- public void setIncludePaths(List includePaths) {
+ public void setIncludePaths(List<?> includePaths) {
this.includePaths = includePaths;
}
Modified:
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java?rev=1228212&r1=1228211&r2=1228212&view=diff
==============================================================================
---
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
(original)
+++
cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
Fri Jan 6 14:52:07 2012
@@ -113,7 +113,7 @@ public class JAXRSUtilsTest extends Asse
}
private void doTestFormParamsWithEncoding(String enc, boolean setEnc)
throws Exception {
- Class[] argType = {String.class, List.class};
+ Class<?>[] argType = {String.class, List.class};
Method m = Customer.class.getMethod("testFormParam", argType);
MessageImpl messageImpl = new MessageImpl();
String body = "p1=" + URLEncoder.encode("\u00E4\u00F6\u00FC", enc) +
"&p2=2&p2=3";
@@ -131,7 +131,7 @@ public class JAXRSUtilsTest extends Asse
assertEquals("2 form params should've been identified", 2,
params.size());
assertEquals("First Form Parameter not matched correctly",
"\u00E4\u00F6\u00FC", params.get(0));
- List<String> list = CastUtils.cast((List)params.get(1));
+ List<String> list = CastUtils.cast((List<?>)params.get(1));
assertEquals(2, list.size());
assertEquals("2", list.get(0));
assertEquals("3", list.get(1));
@@ -659,7 +659,7 @@ public class JAXRSUtilsTest extends Asse
@Test
public void testQueryParameters() throws Exception {
- Class[] argType = {String.class, Integer.TYPE, String.class,
String.class};
+ Class<?>[] argType = {String.class, Integer.TYPE, String.class,
String.class};
Method m = Customer.class.getMethod("testQuery", argType);
MessageImpl messageImpl = new MessageImpl();
@@ -677,7 +677,7 @@ public class JAXRSUtilsTest extends Asse
@SuppressWarnings("unchecked")
@Test
public void testQueryParamAsListWithDefaultValue() throws Exception {
- Class[] argType = {List.class, List.class, List.class,
Integer[].class,
+ Class<?>[] argType = {List.class, List.class, List.class,
Integer[].class,
List.class, List.class};
Method m = Customer.class.getMethod("testQueryAsList", argType);
Message messageImpl = createMessage();
@@ -722,7 +722,7 @@ public class JAXRSUtilsTest extends Asse
@Test
public void testCookieParameters() throws Exception {
- Class[] argType = {String.class, String.class};
+ Class<?>[] argType = {String.class, String.class};
Method m = Customer.class.getMethod("testCookieParam", argType);
MessageImpl messageImpl = new MessageImpl();
MultivaluedMap<String, String> headers = new MetadataMap<String,
String>();
@@ -740,7 +740,7 @@ public class JAXRSUtilsTest extends Asse
@Test
public void testMultipleCookieParameters() throws Exception {
- Class[] argType = {String.class, String.class, Cookie.class};
+ Class<?>[] argType = {String.class, String.class, Cookie.class};
Method m = Customer.class.getMethod("testMultipleCookieParam",
argType);
MessageImpl messageImpl = new MessageImpl();
MultivaluedMap<String, String> headers = new MetadataMap<String,
String>();
@@ -758,7 +758,7 @@ public class JAXRSUtilsTest extends Asse
@Test
public void testFromStringParameters() throws Exception {
- Class[] argType = {UUID.class, CustomerGender.class,
CustomerGender.class};
+ Class<?>[] argType = {UUID.class, CustomerGender.class,
CustomerGender.class};
Method m = Customer.class.getMethod("testFromStringParam", argType);
UUID u = UUID.randomUUID();
Message messageImpl = createMessage();
@@ -775,7 +775,7 @@ public class JAXRSUtilsTest extends Asse
@Test
public void testFromValueEnum() throws Exception {
- Class[] argType = {Timezone.class};
+ Class<?>[] argType = {Timezone.class};
Method m = Customer.class.getMethod("testFromValueParam", argType);
Message messageImpl = createMessage();
messageImpl.put(Message.QUERY_STRING, "p1=Europe%2FLondon");
@@ -792,7 +792,7 @@ public class JAXRSUtilsTest extends Asse
Message messageImpl = createMessage();
ProviderFactory.getInstance(messageImpl).registerUserProvider(
new CustomerParameterHandler());
- Class[] argType = {Customer.class, Customer[].class, Customer2.class};
+ Class<?>[] argType = {Customer.class, Customer[].class,
Customer2.class};
Method m = Customer.class.getMethod("testCustomerParam", argType);
messageImpl.put(Message.QUERY_STRING,
"p1=Fred&p2=Barry&p3=Jack&p4=John");
@@ -822,7 +822,7 @@ public class JAXRSUtilsTest extends Asse
Message messageImpl = createMessage();
ProviderFactory.getInstance(messageImpl).registerUserProvider(
new LocaleParameterHandler());
- Class[] argType = {Locale.class};
+ Class<?>[] argType = {Locale.class};
Method m = Customer.class.getMethod("testLocaleParam", argType);
messageImpl.put(Message.QUERY_STRING, "p1=en_us");
@@ -840,7 +840,7 @@ public class JAXRSUtilsTest extends Asse
Message messageImpl = createMessage();
ProviderFactory.getInstance(messageImpl).registerUserProvider(
new CustomerParameterHandler());
- Class[] argType = {Customer.class, Customer[].class, Customer2.class};
+ Class<?>[] argType = {Customer.class, Customer[].class,
Customer2.class};
Method m = Customer.class.getMethod("testCustomerParam", argType);
messageImpl.put(Message.QUERY_STRING, "p3=jack");
@@ -856,7 +856,7 @@ public class JAXRSUtilsTest extends Asse
@Test
public void testArrayParamNoProvider() throws Exception {
Message messageImpl = createMessage();
- Class[] argType = {String[].class};
+ Class<?>[] argType = {String[].class};
Method m = Customer.class.getMethod("testCustomerParam2", argType);
messageImpl.put(Message.QUERY_STRING, "p1=Fred&p1=Barry");
@@ -871,7 +871,7 @@ public class JAXRSUtilsTest extends Asse
@Test
public void testWrongType() throws Exception {
- Class[] argType = {HashMap.class};
+ Class<?>[] argType = {HashMap.class};
Method m = Customer.class.getMethod("testWrongType", argType);
Message messageImpl = createMessage();
messageImpl.put(Message.QUERY_STRING, "p1=1");
@@ -891,7 +891,7 @@ public class JAXRSUtilsTest extends Asse
@Test
public void testExceptionDuringConstruction() throws Exception {
- Class[] argType = {CustomerGender.class};
+ Class<?>[] argType = {CustomerGender.class};
Method m = Customer.class.getMethod("testWrongType2", argType);
MessageImpl messageImpl = new MessageImpl();
messageImpl.put(Message.QUERY_STRING, "p1=3");
@@ -909,7 +909,7 @@ public class JAXRSUtilsTest extends Asse
@Test
public void testQueryParametersBean() throws Exception {
- Class[] argType = {Customer.CustomerBean.class};
+ Class<?>[] argType = {Customer.CustomerBean.class};
Method m = Customer.class.getMethod("testQueryBean", argType);
MessageImpl messageImpl = new MessageImpl();
messageImpl.put(Message.QUERY_STRING, "a=aValue&b=123");
@@ -928,7 +928,7 @@ public class JAXRSUtilsTest extends Asse
@Test
public void testXmlAdapterBean() throws Exception {
- Class[] argType = {Customer.CustomerBean.class};
+ Class<?>[] argType = {Customer.CustomerBean.class};
Method m = Customer.class.getMethod("testXmlAdapter", argType);
Message messageImpl = createMessage();
messageImpl.put(Message.QUERY_STRING, "a=aValue");
@@ -943,7 +943,7 @@ public class JAXRSUtilsTest extends Asse
@Test
public void testXmlAdapterBean2() throws Exception {
- Class[] argType = {Customer.CustomerBean.class};
+ Class<?>[] argType = {Customer.CustomerBean.class};
Method m = Customer.class.getMethod("testXmlAdapter2", argType);
Message messageImpl = createMessage();
messageImpl.put(Message.QUERY_STRING, "a=aValue");
@@ -958,7 +958,7 @@ public class JAXRSUtilsTest extends Asse
@Test
public void testXmlAdapterBean3() throws Exception {
- Class[] argType = {Customer.CustomerBeanInterface.class};
+ Class<?>[] argType = {Customer.CustomerBeanInterface.class};
Method m = Customer.class.getMethod("testXmlAdapter3", argType);
Message messageImpl = createMessage();
messageImpl.put(Message.QUERY_STRING, "a=aValue");
@@ -974,7 +974,7 @@ public class JAXRSUtilsTest extends Asse
@Test
public void testPathParametersBean() throws Exception {
- Class[] argType = {Customer.CustomerBean.class};
+ Class<?>[] argType = {Customer.CustomerBean.class};
Method m = Customer.class.getMethod("testPathBean", argType);
MultivaluedMap<String, String> pathTemplates = new MetadataMap<String,
String>();
@@ -1029,7 +1029,7 @@ public class JAXRSUtilsTest extends Asse
@Test
public void testMatrixParametersBean() throws Exception {
- Class[] argType = {Customer.CustomerBean.class};
+ Class<?>[] argType = {Customer.CustomerBean.class};
Method m = Customer.class.getMethod("testMatrixBean", argType);
MessageImpl messageImpl = new MessageImpl();
messageImpl.put(Message.REQUEST_URI, "/bar;a=aValue/baz;b=123");
@@ -1048,7 +1048,7 @@ public class JAXRSUtilsTest extends Asse
@Test
public void testFormParametersBean() throws Exception {
- Class[] argType = {Customer.CustomerBean.class};
+ Class<?>[] argType = {Customer.CustomerBean.class};
Method m = Customer.class.getMethod("testFormBean", argType);
MessageImpl messageImpl = new MessageImpl();
messageImpl.put(Message.REQUEST_URI, "/bar");
@@ -1075,7 +1075,7 @@ public class JAXRSUtilsTest extends Asse
@Test
public void testFormParametersBeanWithMap() throws Exception {
- Class[] argType = {Customer.CustomerBean.class};
+ Class<?>[] argType = {Customer.CustomerBean.class};
Method m = Customer.class.getMethod("testFormBean", argType);
Message messageImpl = createMessage();
messageImpl.put(Message.REQUEST_URI, "/bar");
@@ -1187,8 +1187,8 @@ public class JAXRSUtilsTest extends Asse
@Test
public void testMultipleQueryParameters() throws Exception {
- Class[] argType = {String.class, String.class, Long.class,
- Boolean.TYPE, String.class};
+ Class<?>[] argType = {String.class, String.class, Long.class,
+ Boolean.TYPE, String.class};
Method m = Customer.class.getMethod("testMultipleQuery", argType);
MessageImpl messageImpl = new MessageImpl();
@@ -1211,7 +1211,8 @@ public class JAXRSUtilsTest extends Asse
@SuppressWarnings("unchecked")
@Test
public void testMatrixParameters() throws Exception {
- Class[] argType = {String.class, String.class, String.class,
String.class, List.class, String.class};
+ Class<?>[] argType = {String.class, String.class, String.class,
String.class,
+ List.class, String.class};
Method m = Customer.class.getMethod("testMatrixParam", argType);
MessageImpl messageImpl = new MessageImpl();
@@ -1239,7 +1240,7 @@ public class JAXRSUtilsTest extends Asse
@Test
public void testMatrixAndPathSegmentParameters() throws Exception {
- Class[] argType = {PathSegment.class, String.class};
+ Class<?>[] argType = {PathSegment.class, String.class};
Method m = Customer.class.getMethod("testPathSegment", argType);
MessageImpl messageImpl = new MessageImpl();
messageImpl.put(Message.REQUEST_URI, "/bar%20foo;p4=0%201");
@@ -1269,7 +1270,7 @@ public class JAXRSUtilsTest extends Asse
@SuppressWarnings("unchecked")
private void doTestFormParameters(boolean useMediaType) throws Exception {
- Class[] argType = {String.class, List.class};
+ Class<?>[] argType = {String.class, List.class};
Method m = Customer.class.getMethod("testFormParam", argType);
MessageImpl messageImpl = new MessageImpl();
String body = "p1=1&p2=2&p2=3";
@@ -1295,7 +1296,7 @@ public class JAXRSUtilsTest extends Asse
@SuppressWarnings("unchecked")
@Test
public void testFormParametersAndMap() throws Exception {
- Class[] argType = {MultivaluedMap.class, String.class, List.class};
+ Class<?>[] argType = {MultivaluedMap.class, String.class, List.class};
Method m = Customer.class.getMethod("testMultivaluedMapAndFormParam",
argType);
final Message messageImpl = createMessage();
String body = "p1=1&p2=2&p2=3";
Modified:
cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/SelectableTable.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/SelectableTable.java?rev=1228212&r1=1228211&r2=1228212&view=diff
==============================================================================
---
cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/SelectableTable.java
(original)
+++
cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/SelectableTable.java
Fri Jan 6 14:52:07 2012
@@ -245,7 +245,7 @@ public class SelectableTable<T> extends
private void setColumnsWidth() {
assert columnDefinitions != null;
for (int j = 0; j < columnDefinitions.size(); j++) {
- ColumnDefinition columnDefinition = columnDefinitions.get(j);
+ ColumnDefinition<?> columnDefinition = columnDefinitions.get(j);
table.getColumnFormatter().setWidth(j,
columnDefinition.getWidth());
}
}
Modified:
cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/settings/SettingsPresenter.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/settings/SettingsPresenter.java?rev=1228212&r1=1228211&r2=1228212&view=diff
==============================================================================
---
cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/settings/SettingsPresenter.java
(original)
+++
cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/settings/SettingsPresenter.java
Fri Jan 6 14:52:07 2012
@@ -100,7 +100,7 @@ public class SettingsPresenter extends B
public void onSaveButtonClicked(@Nullable final String id,
@Nonnull final HasValue<String> name,
@Nonnull final HasValue<String> url) {
- Map<HasValue, String> errors = validate(name, url);
+ Map<HasValue<String>, String> errors = validate(name, url);
if (errors.isEmpty()) {
String nameValue = name.getValue();
@@ -140,9 +140,9 @@ public class SettingsPresenter extends B
subscriptionDialog.show();
}
- private Map<HasValue, String> validate(@Nonnull final HasValue<String>
name,
+ private Map<HasValue<String>, String> validate(@Nonnull final
HasValue<String> name,
@Nonnull final HasValue<String>
url) {
- Map<HasValue, String> errors = new HashMap<HasValue, String>();
+ Map<HasValue<String>, String> errors = new HashMap<HasValue<String>,
String>();
String nameValue = name.getValue();
if (nameValue == null || nameValue.length() == 0) {
Modified:
cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/settings/SubscriptionDialog.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/settings/SubscriptionDialog.java?rev=1228212&r1=1228211&r2=1228212&view=diff
==============================================================================
---
cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/settings/SubscriptionDialog.java
(original)
+++
cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/settings/SubscriptionDialog.java
Fri Jan 6 14:52:07 2012
@@ -40,7 +40,7 @@ public interface SubscriptionDialog {
void hide();
- void setValidationErrors(Map<HasValue, String> errors);
+ void setValidationErrors(Map<HasValue<String>, String> errors);
void setTitle(String title);
Modified:
cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/settings/SubscriptionDialogImpl.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/settings/SubscriptionDialogImpl.java?rev=1228212&r1=1228211&r2=1228212&view=diff
==============================================================================
---
cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/settings/SubscriptionDialogImpl.java
(original)
+++
cxf/trunk/rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/settings/SubscriptionDialogImpl.java
Fri Jan 6 14:52:07 2012
@@ -76,7 +76,7 @@ public class SubscriptionDialogImpl exte
setWidget(form);
}
- public void setValidationErrors(@Nullable Map<HasValue, String> errors) {
+ public void setValidationErrors(@Nullable Map<HasValue<String>, String>
errors) {
form.nameErrorLabel.setVisible(false);
form.urlErrorLabel.setVisible(false);
Modified:
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/URISupport.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/URISupport.java?rev=1228212&r1=1228211&r2=1228212&view=diff
==============================================================================
---
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/URISupport.java
(original)
+++
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/URISupport.java
Fri Jan 6 14:52:07 2012
@@ -46,7 +46,7 @@ public final class URISupport {
private String scheme;
private String path;
private URI components[];
- private Map parameters;
+ private Map<String, String> parameters;
private String fragment;
public URI[] getComponents() {
@@ -57,7 +57,7 @@ public final class URISupport {
return fragment;
}
- public Map getParameters() {
+ public Map<String, String> getParameters() {
return parameters;
}
@@ -109,10 +109,9 @@ public final class URISupport {
}
}
- @SuppressWarnings("unchecked")
- public static Map parseQuery(String uri) throws URISyntaxException {
+ public static Map<String, String> parseQuery(String uri) throws
URISyntaxException {
try {
- Map rc = new HashMap();
+ Map<String, String> rc = new HashMap<String, String>();
if (uri != null) {
String[] parameters = uri.split("&");
for (String parameter : parameters) {
@@ -134,13 +133,13 @@ public final class URISupport {
}
}
- public static Map parseParameters(URI uri) throws URISyntaxException {
+ public static Map<String, String> parseParameters(URI uri) throws
URISyntaxException {
String query = uri.getQuery();
if (query == null) {
String schemeSpecificPart = uri.getSchemeSpecificPart();
int idx = schemeSpecificPart.lastIndexOf('?');
if (idx < 0) {
- return Collections.EMPTY_MAP;
+ return Collections.emptyMap();
} else {
query = schemeSpecificPart.substring(idx + 1);
}
@@ -209,7 +208,7 @@ public final class URISupport {
if (params.length() > 0) {
rc.path = stripPrefix(params, "/");
}
- rc.parameters = Collections.EMPTY_MAP;
+ rc.parameters = Collections.emptyMap();
}
}
@@ -224,20 +223,19 @@ public final class URISupport {
return new URI(stripPrefix(uri.getSchemeSpecificPart().trim(), "//"));
}
- public static String createQueryString(Map options) throws
URISyntaxException {
+ public static String createQueryString(Map<String, String> options) throws
URISyntaxException {
try {
if (options.size() > 0) {
StringBuilder rc = new StringBuilder();
boolean first = true;
- for (Object o : options.keySet()) {
+ for (String key : options.keySet()) {
if (first) {
first = false;
} else {
rc.append("&");
}
- String key = (String) o;
- String value = (String) options.get(key);
+ String value = options.get(key);
rc.append(URLEncoder.encode(key, "UTF-8"));
rc.append("=");
rc.append(URLEncoder.encode(value, "UTF-8"));
@@ -256,7 +254,8 @@ public final class URISupport {
/**
* Creates a URI from the original URI and the remaining parameters
*/
- public static URI createRemainingURI(URI originalURI, Map params) throws
URISyntaxException {
+ public static URI createRemainingURI(URI originalURI, Map<String, String>
params)
+ throws URISyntaxException {
String s = createQueryString(params);
if (s.length() == 0) {
s = null;
Modified:
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/Scope.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/Scope.java?rev=1228212&r1=1228211&r2=1228212&view=diff
==============================================================================
---
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/Scope.java
(original)
+++
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/Scope.java
Fri Jan 6 14:52:07 2012
@@ -27,7 +27,7 @@ import antlr.collections.AST;
import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
-public final class Scope implements Comparable {
+public final class Scope implements Comparable<Object> {
private static final String SEPARATOR = ".";
private List<String> scope;
Modified:
cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java?rev=1228212&r1=1228211&r2=1228212&view=diff
==============================================================================
---
cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
(original)
+++
cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
Fri Jan 6 14:52:07 2012
@@ -47,6 +47,7 @@ import org.apache.cxf.common.logging.Log
import org.apache.cxf.common.util.PropertiesLoaderUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.common.xmlschema.SchemaCollection;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.service.model.InterfaceInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.tools.common.AbstractCXFToolContainer;
@@ -301,12 +302,10 @@ public class WSDLToJavaContainer extends
public QName getServiceQName(Definition def) {
List<Definition> defs = new ArrayList<Definition>();
defs.add(def);
- Iterator ite1 = def.getImports().values().iterator();
+ Iterator<?> ite1 = def.getImports().values().iterator();
while (ite1.hasNext()) {
- List defList = (List)ite1.next();
- Iterator ite2 = defList.iterator();
- while (ite2.hasNext()) {
- javax.wsdl.Import importDef = (javax.wsdl.Import)ite2.next();
+ List<javax.wsdl.Import> defList =
CastUtils.cast((List<?>)ite1.next());
+ for (javax.wsdl.Import importDef : defList) {
defs.add(importDef.getDefinition());
}
}
@@ -483,7 +482,7 @@ public class WSDLToJavaContainer extends
protected void setLibraryReferences(ToolContext env) {
Properties props =
loadProperties(getResourceAsStream("wsdltojavalib.properties"));
if (props != null) {
- for (Iterator keys = props.keySet().iterator(); keys.hasNext();) {
+ for (Iterator<?> keys = props.keySet().iterator();
keys.hasNext();) {
String key = (String)keys.next();
env.put(key, props.get(key));
}
@@ -616,7 +615,7 @@ public class WSDLToJavaContainer extends
throw new RuntimeException(ex);
}
- for (Iterator it = initialExtensions.values().iterator();
it.hasNext();) {
+ for (Iterator<?> it = initialExtensions.values().iterator();
it.hasNext();) {
String validatorClass = (String)it.next();
try {
if (LOG.isLoggable(Level.FINE)) {
Modified:
cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java?rev=1228212&r1=1228211&r2=1228212&view=diff
==============================================================================
---
cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
(original)
+++
cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
Fri Jan 6 14:52:07 2012
@@ -973,7 +973,7 @@ public class JAXBDataBinding implements
try {
Field f =
jdc.getClass().getDeclaredField("enumConstantsByName");
f.setAccessible(true);
- Map map = (Map)f.get(jdc);
+ Map<?, ?> map = (Map<?, ?>)f.get(jdc);
Set<String> values = CastUtils.cast(map.keySet());
String first = defaultValues.chooseEnumValue(path,
values);
writer.write(tp.fullName());
Modified:
cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/NamespaceContextImpl.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/NamespaceContextImpl.java?rev=1228212&r1=1228211&r2=1228212&view=diff
==============================================================================
---
cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/NamespaceContextImpl.java
(original)
+++
cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/NamespaceContextImpl.java
Fri Jan 6 14:52:07 2012
@@ -58,7 +58,7 @@ public class NamespaceContextImpl implem
return element.lookupPrefix(namespaceURI);
}
- public Iterator getPrefixes(String namespaceURI) {
+ public Iterator<?> getPrefixes(String namespaceURI) {
return null;
}
Modified:
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/AntGenerator.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/AntGenerator.java?rev=1228212&r1=1228211&r2=1228212&view=diff
==============================================================================
---
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/AntGenerator.java
(original)
+++
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/AntGenerator.java
Fri Jan 6 14:52:07 2012
@@ -20,7 +20,6 @@
package org.apache.cxf.tools.wsdlto.frontend.jaxws.generators;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import javax.xml.namespace.QName;
@@ -61,7 +60,7 @@ public class AntGenerator extends Abstra
return;
}
- Map<QName, JavaModel> map =
CastUtils.cast((Map)penv.get(WSDLToJavaProcessor.MODEL_MAP));
+ Map<QName, JavaModel> map = CastUtils.cast((Map<?,
?>)penv.get(WSDLToJavaProcessor.MODEL_MAP));
for (JavaModel javaModel : map.values()) {
if (javaModel.getServiceClasses().size() == 0) {
@@ -79,12 +78,8 @@ public class AntGenerator extends Abstra
Map<String, JavaInterface> interfaces = javaModel.getInterfaces();
int index = 1;
- Iterator it = javaModel.getServiceClasses().values().iterator();
- while (it.hasNext()) {
- JavaServiceClass js = (JavaServiceClass)it.next();
- Iterator i = js.getPorts().iterator();
- while (i.hasNext()) {
- JavaPort jp = (JavaPort)i.next();
+ for (JavaServiceClass js : javaModel.getServiceClasses().values())
{
+ for (JavaPort jp : js.getPorts()) {
String interfaceName = jp.getInterfaceClass();
JavaInterface intf = interfaces.get(interfaceName);
if (intf == null) {
Modified:
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ClientGenerator.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ClientGenerator.java?rev=1228212&r1=1228211&r2=1228212&view=diff
==============================================================================
---
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ClientGenerator.java
(original)
+++
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ClientGenerator.java
Fri Jan 6 14:52:07 2012
@@ -19,7 +19,6 @@
package org.apache.cxf.tools.wsdlto.frontend.jaxws.generators;
-import java.util.Iterator;
import java.util.Map;
import javax.xml.namespace.QName;
@@ -67,7 +66,7 @@ public class ClientGenerator extends Abs
if (passthrough()) {
return;
}
- Map<QName, JavaModel> map =
CastUtils.cast((Map)penv.get(WSDLToJavaProcessor.MODEL_MAP));
+ Map<QName, JavaModel> map = CastUtils.cast((Map<?,
?>)penv.get(WSDLToJavaProcessor.MODEL_MAP));
for (JavaModel javaModel : map.values()) {
if (javaModel.getServiceClasses().size() == 0) {
@@ -81,12 +80,8 @@ public class ClientGenerator extends Abs
}
Map<String, JavaInterface> interfaces = javaModel.getInterfaces();
- Iterator it = javaModel.getServiceClasses().values().iterator();
- while (it.hasNext()) {
- JavaServiceClass js = (JavaServiceClass)it.next();
- Iterator i = js.getPorts().iterator();
- while (i.hasNext()) {
- JavaPort jp = (JavaPort)i.next();
+ for (JavaServiceClass js: javaModel.getServiceClasses().values()) {
+ for (JavaPort jp : js.getPorts()) {
String interfaceName = jp.getInterfaceClass();
JavaInterface intf = interfaces.get(interfaceName);
if (intf == null) {
Modified:
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java?rev=1228212&r1=1228211&r2=1228212&view=diff
==============================================================================
---
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java
(original)
+++
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java
Fri Jan 6 14:52:07 2012
@@ -20,7 +20,6 @@ package org.apache.cxf.tools.wsdlto.fron
import java.text.SimpleDateFormat;
import java.util.Date;
-import java.util.Iterator;
import java.util.Map;
import javax.xml.namespace.QName;
@@ -68,14 +67,12 @@ public class FaultGenerator extends Abst
if (passthrough()) {
return;
}
- Map<QName, JavaModel> map =
CastUtils.cast((Map)penv.get(WSDLToJavaProcessor.MODEL_MAP));
+ Map<QName, JavaModel> map = CastUtils.cast((Map<?,
?>)penv.get(WSDLToJavaProcessor.MODEL_MAP));
for (JavaModel javaModel : map.values()) {
Map<String, JavaExceptionClass> exceptionClasses = javaModel
.getExceptionClasses();
- for (Iterator iter = exceptionClasses.keySet().iterator(); iter
- .hasNext();) {
- String expClassName = (String)iter.next();
+ for (String expClassName : exceptionClasses.keySet()) {
JavaExceptionClass expClz =
exceptionClasses.get(expClassName);
Modified:
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java?rev=1228212&r1=1228211&r2=1228212&view=diff
==============================================================================
---
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java
(original)
+++
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java
Fri Jan 6 14:52:07 2012
@@ -19,7 +19,6 @@
package org.apache.cxf.tools.wsdlto.frontend.jaxws.generators;
-import java.util.Iterator;
import java.util.Map;
import javax.xml.namespace.QName;
@@ -70,7 +69,7 @@ public class ImplGenerator extends Abstr
if (passthrough()) {
return;
}
- Map<QName, JavaModel> map =
CastUtils.cast((Map)penv.get(WSDLToJavaProcessor.MODEL_MAP));
+ Map<QName, JavaModel> map = CastUtils.cast((Map<?,
?>)penv.get(WSDLToJavaProcessor.MODEL_MAP));
for (JavaModel javaModel : map.values()) {
@@ -89,8 +88,7 @@ public class ImplGenerator extends Abstr
}
}
} else {
- for (Iterator iter = interfaces.keySet().iterator();
iter.hasNext();) {
- String interfaceName = (String)iter.next();
+ for (String interfaceName: interfaces.keySet()) {
JavaInterface intf = interfaces.get(interfaceName);
outputImpl(intf, service, "", penv);
}
Modified:
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/SEIGenerator.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/SEIGenerator.java?rev=1228212&r1=1228211&r2=1228212&view=diff
==============================================================================
---
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/SEIGenerator.java
(original)
+++
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/SEIGenerator.java
Fri Jan 6 14:52:07 2012
@@ -73,7 +73,7 @@ public class SEIGenerator extends Abstra
return;
}
- Map<QName, JavaModel> map =
CastUtils.cast((Map)penv.get(WSDLToJavaProcessor.MODEL_MAP));
+ Map<QName, JavaModel> map = CastUtils.cast((Map<?,
?>)penv.get(WSDLToJavaProcessor.MODEL_MAP));
for (JavaModel javaModel : map.values()) {
Map<String, JavaInterface> interfaces = javaModel.getInterfaces();
Modified:
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java?rev=1228212&r1=1228211&r2=1228212&view=diff
==============================================================================
---
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java
(original)
+++
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java
Fri Jan 6 14:52:07 2012
@@ -19,7 +19,6 @@
package org.apache.cxf.tools.wsdlto.frontend.jaxws.generators;
-import java.util.Iterator;
import java.util.Map;
import javax.xml.namespace.QName;
@@ -68,7 +67,7 @@ public class ServerGenerator extends Abs
return;
}
- Map<QName, JavaModel> map =
CastUtils.cast((Map)penv.get(WSDLToJavaProcessor.MODEL_MAP));
+ Map<QName, JavaModel> map = CastUtils.cast((Map<?,
?>)penv.get(WSDLToJavaProcessor.MODEL_MAP));
for (JavaModel javaModel : map.values()) {
String address = "CHANGE_ME";
@@ -83,12 +82,8 @@ public class ServerGenerator extends Abs
}
return;
}
- Iterator it = javaModel.getServiceClasses().values().iterator();
- while (it.hasNext()) {
- JavaServiceClass js = (JavaServiceClass)it.next();
- Iterator i = js.getPorts().iterator();
- while (i.hasNext()) {
- JavaPort jp = (JavaPort)i.next();
+ for (JavaServiceClass js : javaModel.getServiceClasses().values())
{
+ for (JavaPort jp : js.getPorts()) {
String interfaceName = jp.getInterfaceClass();
JavaInterface intf = interfaces.get(interfaceName);
if (intf == null) {
Modified:
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java?rev=1228212&r1=1228211&r2=1228212&view=diff
==============================================================================
---
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java
(original)
+++
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java
Fri Jan 6 14:52:07 2012
@@ -68,7 +68,7 @@ public class ServiceGenerator extends Ab
return;
}
- Map<QName, JavaModel> map =
CastUtils.cast((Map)penv.get(WSDLToJavaProcessor.MODEL_MAP));
+ Map<QName, JavaModel> map = CastUtils.cast((Map<?,
?>)penv.get(WSDLToJavaProcessor.MODEL_MAP));
for (JavaModel javaModel : map.values()) {
ClassCollector collector = penv.get(ClassCollector.class);
Modified:
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/WSDLToJavaProcessor.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/WSDLToJavaProcessor.java?rev=1228212&r1=1228211&r2=1228212&view=diff
==============================================================================
---
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/WSDLToJavaProcessor.java
(original)
+++
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/WSDLToJavaProcessor.java
Fri Jan 6 14:52:07 2012
@@ -68,7 +68,7 @@ public class WSDLToJavaProcessor extends
private JavaModel wsdlDefinitionToJavaModel(ServiceInfo serviceInfo)
throws ToolException {
JavaModel javaModel = null;
- Map<QName, JavaModel> map =
CastUtils.cast((Map)context.get(MODEL_MAP));
+ Map<QName, JavaModel> map = CastUtils.cast((Map<?,
?>)context.get(MODEL_MAP));
if (map == null) {
map = new LinkedHashMap<QName, JavaModel>();
context.put(MODEL_MAP, map);
Modified:
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java?rev=1228212&r1=1228211&r2=1228212&view=diff
==============================================================================
---
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
(original)
+++
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
Fri Jan 6 14:52:07 2012
@@ -22,7 +22,6 @@ package org.apache.cxf.tools.wsdlto.fron
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -38,6 +37,7 @@ import org.w3c.dom.Element;
import org.apache.commons.lang.StringUtils;
import org.apache.cxf.common.i18n.Message;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.BindingMessageInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
@@ -352,7 +352,7 @@ public class ServiceProcessor extends Ab
if (isSoapBinding()) {
// TODO: add customize here
//doCustomizeOperation(jf, jm, bop);
- Map prop = getSoapOperationProp(bop);
+ Map<String, Object> prop = getSoapOperationProp(bop);
String soapAction = prop.get(soapOPAction) == null ? "" :
(String)prop.get(soapOPAction);
String soapStyle = prop.get(soapOPStyle) == null ? "" :
(String)prop.get(soapOPStyle);
jm.setSoapAction(soapAction);
@@ -566,13 +566,10 @@ public class ServiceProcessor extends Ab
public void processMultipart(JavaMethod jm, BindingOperationInfo operation,
MIMEMultipartRelated ext, JavaType.Style
style) throws ToolException {
- List mimeParts = ext.getMIMEParts();
- Iterator itParts = mimeParts.iterator();
- while (itParts.hasNext()) {
- MIMEPart mPart = (MIMEPart)itParts.next();
- Iterator extns = mPart.getExtensibilityElements().iterator();
- while (extns.hasNext()) {
- ExtensibilityElement extElement =
(ExtensibilityElement)extns.next();
+ List<MIMEPart> mimeParts = CastUtils.cast(ext.getMIMEParts());
+ for (MIMEPart mPart : mimeParts) {
+ List<ExtensibilityElement> extns =
CastUtils.cast(mPart.getExtensibilityElements());
+ for (ExtensibilityElement extElement : extns) {
if (extElement instanceof MIMEContent) {
MIMEContent mimeContent = (MIMEContent)extElement;
String mimeJavaType = getJavaTypeForMimeType(mPart);
@@ -623,7 +620,7 @@ public class ServiceProcessor extends Ab
}
}
- private Map getSoapOperationProp(BindingOperationInfo bop) {
+ private Map<String, Object> getSoapOperationProp(BindingOperationInfo bop)
{
Map<String, Object> soapOPProp = new HashMap<String, Object>();
if (bop.getExtensor(ExtensibilityElement.class) != null) {
for (ExtensibilityElement ext :
bop.getExtensors(ExtensibilityElement.class)) {
