Revision: 18677
http://sourceforge.net/p/gate/code/18677
Author: markagreenwood
Date: 2015-05-11 10:15:41 +0000 (Mon, 11 May 2015)
Log Message:
-----------
upgraded to ASM 5.0.3 which should allow Johann to play with the syntactic
suagr in Java 8
Modified Paths:
--------------
gate/trunk/ivy.xml
gate/trunk/src/main/gate/Gate.java
Modified: gate/trunk/ivy.xml
===================================================================
--- gate/trunk/ivy.xml 2015-05-11 01:20:08 UTC (rev 18676)
+++ gate/trunk/ivy.xml 2015-05-11 10:15:41 UTC (rev 18677)
@@ -22,7 +22,7 @@
<dependencies>
<!-- things that we repackage under an alternative package name -->
- <dependency org="uk.ac.gate" name="gate-asm" rev="3.1"
conf="required->master" />
+ <dependency org="uk.ac.gate" name="gate-asm" rev="5.0.3"
conf="required->master" />
<dependency org="uk.ac.gate" name="gate-compiler-jdt"
rev="4.3.2-P20140317-1600" conf="required->master" />
<!-- needed to ensure the same version across configurations -->
Modified: gate/trunk/src/main/gate/Gate.java
===================================================================
--- gate/trunk/src/main/gate/Gate.java 2015-05-11 01:20:08 UTC (rev 18676)
+++ gate/trunk/src/main/gate/Gate.java 2015-05-11 10:15:41 UTC (rev 18677)
@@ -35,7 +35,6 @@
import gate.util.asm.ClassVisitor;
import gate.util.asm.Opcodes;
import gate.util.asm.Type;
-import gate.util.asm.commons.EmptyVisitor;
import java.io.File;
import java.io.FileInputStream;
@@ -71,6 +70,7 @@
import org.jdom.Element;
import org.jdom.JDOMException;
import org.jdom.input.SAXBuilder;
+import gate.util.asm.commons.EmptyVisitor;
/**
* The class is responsible for initialising the GATE libraries, and providing
@@ -1637,7 +1637,7 @@
// we've found a CreoleResource annotation on this class
if(desc.equals(CREOLE_RESOURCE_DESC)) {
foundCreoleResource = true;
- return new EmptyVisitor() {
+ return new AnnotationVisitor(Opcodes.ASM5) {
@Override
public void visit(String name, Object value) {
if(name.equals("name") && resInfo.resourceName == null) {
@@ -1652,7 +1652,7 @@
public AnnotationVisitor visitAnnotation(String name,
String desc) {
// don't want to recurse into AutoInstance annotations
- return new EmptyVisitor();
+ return this;
}
};
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
