Revision: 17657
http://sourceforge.net/p/gate/code/17657
Author: markagreenwood
Date: 2014-03-14 09:08:56 +0000 (Fri, 14 Mar 2014)
Log Message:
-----------
I think this is the final set of generics changes
Modified Paths:
--------------
gate/trunk/ivy.xml
gate/trunk/src/main/gate/util/spring/FeatureMapFactoryBean.java
gate/trunk/src/main/gate/util/spring/GateResourceFactoryBean.java
gate/trunk/src/main/gate/util/spring/SavedApplicationFactoryBean.java
gate/trunk/src/main/gate/util/spring/xml/AddPRBeanDefinitionParser.java
gate/trunk/src/main/gate/util/spring/xml/DuplicateBeanDefinitionParser.java
gate/trunk/src/main/gate/util/spring/xml/ExtraGatePluginBeanDefinitionParser.java
gate/trunk/src/main/gate/util/spring/xml/FeatureMapBeanDefinitionParser.java
gate/trunk/src/main/gate/util/spring/xml/InitBeanDefinitionParser.java
gate/trunk/src/main/gate/util/spring/xml/ResourceBeanDefinitionParser.java
gate/trunk/src/main/gate/util/spring/xml/SavedApplicationBeanDefinitionParser.java
gate/trunk/src/main/gate/util/spring/xml/SetParameterBeanDefinitionParser.java
gate/trunk/src/main/gate/util/spring/xml/UrlBeanDefinitionParser.java
Modified: gate/trunk/ivy.xml
===================================================================
--- gate/trunk/ivy.xml 2014-03-14 08:55:23 UTC (rev 17656)
+++ gate/trunk/ivy.xml 2014-03-14 09:08:56 UTC (rev 17657)
@@ -104,7 +104,7 @@
<dependency org="gnu.getopt" name="java-getopt" rev="1.0.13" />
<!-- required for Spring Framework support in GATE -->
- <dependency org="org.springframework" name="spring-aop" rev="2.0.8" />
+ <dependency org="org.springframework" name="spring-aop" rev="2.5.6.SEC01"
/>
<!-- required for outputting documents as JSON -->
<dependency org="com.fasterxml.jackson.core" name="jackson-databind"
rev="2.3.2" />
Modified: gate/trunk/src/main/gate/util/spring/FeatureMapFactoryBean.java
===================================================================
--- gate/trunk/src/main/gate/util/spring/FeatureMapFactoryBean.java
2014-03-14 08:55:23 UTC (rev 17656)
+++ gate/trunk/src/main/gate/util/spring/FeatureMapFactoryBean.java
2014-03-14 09:08:56 UTC (rev 17657)
@@ -75,7 +75,7 @@
}
@Override
- public Class getObjectType() {
+ public Class<?> getObjectType() {
return gate.FeatureMap.class;
}
Modified: gate/trunk/src/main/gate/util/spring/GateResourceFactoryBean.java
===================================================================
--- gate/trunk/src/main/gate/util/spring/GateResourceFactoryBean.java
2014-03-14 08:55:23 UTC (rev 17656)
+++ gate/trunk/src/main/gate/util/spring/GateResourceFactoryBean.java
2014-03-14 09:08:56 UTC (rev 17657)
@@ -106,7 +106,7 @@
}
@Override
- public Class getObjectType() {
+ public Class<?> getObjectType() {
if(object != null) {
return object.getClass();
}
Modified: gate/trunk/src/main/gate/util/spring/SavedApplicationFactoryBean.java
===================================================================
--- gate/trunk/src/main/gate/util/spring/SavedApplicationFactoryBean.java
2014-03-14 08:55:23 UTC (rev 17656)
+++ gate/trunk/src/main/gate/util/spring/SavedApplicationFactoryBean.java
2014-03-14 09:08:56 UTC (rev 17657)
@@ -105,7 +105,7 @@
}
@Override
- public Class getObjectType() {
+ public Class<?> getObjectType() {
return null;
}
Modified:
gate/trunk/src/main/gate/util/spring/xml/AddPRBeanDefinitionParser.java
===================================================================
--- gate/trunk/src/main/gate/util/spring/xml/AddPRBeanDefinitionParser.java
2014-03-14 08:55:23 UTC (rev 17656)
+++ gate/trunk/src/main/gate/util/spring/xml/AddPRBeanDefinitionParser.java
2014-03-14 09:08:56 UTC (rev 17657)
@@ -51,7 +51,7 @@
}
@Override
- protected Class getBeanClass(Element element) {
+ protected Class<?> getBeanClass(Element element) {
return AddPRResourceCustomiser.class;
}
Modified:
gate/trunk/src/main/gate/util/spring/xml/DuplicateBeanDefinitionParser.java
===================================================================
--- gate/trunk/src/main/gate/util/spring/xml/DuplicateBeanDefinitionParser.java
2014-03-14 08:55:23 UTC (rev 17656)
+++ gate/trunk/src/main/gate/util/spring/xml/DuplicateBeanDefinitionParser.java
2014-03-14 09:08:56 UTC (rev 17657)
@@ -73,7 +73,7 @@
}
@Override
- protected Class getBeanClass(Element element) {
+ protected Class<?> getBeanClass(Element element) {
return DuplicateResourceFactoryBean.class;
}
Modified:
gate/trunk/src/main/gate/util/spring/xml/ExtraGatePluginBeanDefinitionParser.java
===================================================================
---
gate/trunk/src/main/gate/util/spring/xml/ExtraGatePluginBeanDefinitionParser.java
2014-03-14 08:55:23 UTC (rev 17656)
+++
gate/trunk/src/main/gate/util/spring/xml/ExtraGatePluginBeanDefinitionParser.java
2014-03-14 09:08:56 UTC (rev 17657)
@@ -33,7 +33,7 @@
}
@Override
- protected Class getBeanClass(Element element) {
+ protected Class<?> getBeanClass(Element element) {
return ExtraGatePlugin.class;
}
Modified:
gate/trunk/src/main/gate/util/spring/xml/FeatureMapBeanDefinitionParser.java
===================================================================
---
gate/trunk/src/main/gate/util/spring/xml/FeatureMapBeanDefinitionParser.java
2014-03-14 08:55:23 UTC (rev 17656)
+++
gate/trunk/src/main/gate/util/spring/xml/FeatureMapBeanDefinitionParser.java
2014-03-14 09:08:56 UTC (rev 17657)
@@ -36,7 +36,7 @@
@Override
protected void doParse(Element element, ParserContext parserContext,
BeanDefinitionBuilder builder) {
- Map sourceMap = parserContext.getDelegate().parseMapElement(element,
+ Map<?,?> sourceMap = parserContext.getDelegate().parseMapElement(element,
builder.getRawBeanDefinition());
builder.addPropertyValue("sourceMap", sourceMap);
if(element.hasAttribute("scope")) {
@@ -45,7 +45,7 @@
}
@Override
- protected Class getBeanClass(Element element) {
+ protected Class<?> getBeanClass(Element element) {
return FeatureMapFactoryBean.class;
}
Modified: gate/trunk/src/main/gate/util/spring/xml/InitBeanDefinitionParser.java
===================================================================
--- gate/trunk/src/main/gate/util/spring/xml/InitBeanDefinitionParser.java
2014-03-14 08:55:23 UTC (rev 17656)
+++ gate/trunk/src/main/gate/util/spring/xml/InitBeanDefinitionParser.java
2014-03-14 09:08:56 UTC (rev 17657)
@@ -41,7 +41,7 @@
Element preloadElt = DomUtils.getChildElementByTagName(element,
"preload-plugins");
if(preloadElt != null) {
- List preloadPluginsList = ctx.getDelegate().parseListElement(preloadElt,
+ List<?> preloadPluginsList =
ctx.getDelegate().parseListElement(preloadElt,
builder.getBeanDefinition());
builder.addPropertyValue("preloadPlugins", preloadPluginsList);
}
@@ -49,7 +49,7 @@
}
@Override
- protected Class getBeanClass(Element element) {
+ protected Class<?> getBeanClass(Element element) {
return Init.class;
}
Modified:
gate/trunk/src/main/gate/util/spring/xml/ResourceBeanDefinitionParser.java
===================================================================
--- gate/trunk/src/main/gate/util/spring/xml/ResourceBeanDefinitionParser.java
2014-03-14 08:55:23 UTC (rev 17656)
+++ gate/trunk/src/main/gate/util/spring/xml/ResourceBeanDefinitionParser.java
2014-03-14 09:08:56 UTC (rev 17657)
@@ -78,7 +78,7 @@
}
@Override
- protected Class getBeanClass(Element element) {
+ protected Class<?> getBeanClass(Element element) {
return GateResourceFactoryBean.class;
}
Modified:
gate/trunk/src/main/gate/util/spring/xml/SavedApplicationBeanDefinitionParser.java
===================================================================
---
gate/trunk/src/main/gate/util/spring/xml/SavedApplicationBeanDefinitionParser.java
2014-03-14 08:55:23 UTC (rev 17656)
+++
gate/trunk/src/main/gate/util/spring/xml/SavedApplicationBeanDefinitionParser.java
2014-03-14 09:08:56 UTC (rev 17657)
@@ -42,7 +42,7 @@
}
@Override
- protected Class getBeanClass(Element element) {
+ protected Class<?> getBeanClass(Element element) {
return SavedApplicationFactoryBean.class;
}
Modified:
gate/trunk/src/main/gate/util/spring/xml/SetParameterBeanDefinitionParser.java
===================================================================
---
gate/trunk/src/main/gate/util/spring/xml/SetParameterBeanDefinitionParser.java
2014-03-14 08:55:23 UTC (rev 17656)
+++
gate/trunk/src/main/gate/util/spring/xml/SetParameterBeanDefinitionParser.java
2014-03-14 09:08:56 UTC (rev 17657)
@@ -47,7 +47,7 @@
}
@Override
- protected Class getBeanClass(Element element) {
+ protected Class<?> getBeanClass(Element element) {
return SetParameterResourceCustomiser.class;
}
Modified: gate/trunk/src/main/gate/util/spring/xml/UrlBeanDefinitionParser.java
===================================================================
--- gate/trunk/src/main/gate/util/spring/xml/UrlBeanDefinitionParser.java
2014-03-14 08:55:23 UTC (rev 17656)
+++ gate/trunk/src/main/gate/util/spring/xml/UrlBeanDefinitionParser.java
2014-03-14 09:08:56 UTC (rev 17657)
@@ -26,7 +26,7 @@
@Override
protected void doParse(Element element, BeanDefinitionBuilder builder) {
builder.setFactoryMethod("resourceToUrl");
- builder.addConstructorArg(DomUtils.getTextValue(element));
+ builder.addConstructorArgValue(DomUtils.getTextValue(element));
}
@Override
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
