i21023/JavaTXCompilerInJavaTX
2
0
Fork 0
forked from JavaTX/JavaCompilerCore
Code Pull Requests Activity

Probleme beim Pull, Versuch zu Committen bevor pull

Browse Source
This commit is contained in:
Fikus, Evelyn (WWI2012D) 2015-06-22 16:51:13 +02:00
parent 39580fc15e
commit cd8b85cc41
7 changed files with 71 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
bin/log4j.xml
View File

@ -1,35 +1,35 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'> <log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
<appender name="CONSOLE" class="de.dhbwstuttgart.logger.ConsoleAppender"> <appender name="CONSOLE" class="de.dhbwstuttgart.logger.ConsoleAppender">
<param name="Target" value="System.out"/> <param name="Target" value="System.out"/>
<layout class="de.dhbwstuttgart.logger.PatternLayout"> <layout class="de.dhbwstuttgart.logger.PatternLayout">
<param name="ConversionPattern" value="%-15C{1} %-5p [%-9c] %m%n"/> <param name="ConversionPattern" value="%-15C{1} %-5p [%-9c] %m%n"/>
</layout> </layout>
</appender> </appender>
<logger name="codegen"> <logger name="codegen">
<level value="INFO"/> <level value="INFO"/>
<appender-ref ref="CONSOLE"/> <appender-ref ref="CONSOLE"/>
</logger> </logger>
<logger name="parser"> <logger name="parser">
<level value="OFF"/> <level value="OFF"/>
<appender-ref ref="CONSOLE"/> <appender-ref ref="CONSOLE"/>
</logger> </logger>
<logger name="inference"> <logger name="inference">
<level value="WARN"/> <level value="WARN"/>
<appender-ref ref="CONSOLE"/> <appender-ref ref="CONSOLE"/>
</logger> </logger>
<logger name="bytecode"> <logger name="bytecode">
<level value="INFO"/> <level value="INFO"/>
<appender-ref ref="CONSOLE"/> <appender-ref ref="CONSOLE"/>
</logger> </logger>
</log4j:configuration> </log4j:configuration>

48
bin/log4jTesting.xml
View File

@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'> <log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
<appender name="CONSOLE" class="de.dhbwstuttgart.logger.ConsoleAppender"> <appender name="CONSOLE" class="de.dhbwstuttgart.logger.ConsoleAppender">
<param name="Target" value="System.out"/> <param name="Target" value="System.out"/>
<layout class="de.dhbwstuttgart.logger.PatternLayout"> <layout class="de.dhbwstuttgart.logger.PatternLayout">
<param name="ConversionPattern" value="%-15C{1} %-5p [%-9c] %m%n"/> <param name="ConversionPattern" value="%-15C{1} %-5p [%-9c] %m%n"/>
</layout> </layout>
</appender> </appender>
<logger name="trtest"> <logger name="trtest">
<level value="DEBUG"/> <level value="DEBUG"/>
<appender-ref ref="CONSOLE"/> <appender-ref ref="CONSOLE"/>
</logger> </logger>
<logger name="funcTest"> <logger name="funcTest">
<level value="DEBUG"/> <level value="DEBUG"/>
<appender-ref ref="CONSOLE"/> <appender-ref ref="CONSOLE"/>
</logger> </logger>
</log4j:configuration> </log4j:configuration>

6
bin/parser/BoundedParameter.jav
View File

@ -1,3 +1,3 @@
class Matrix{ class Matrix{
<A extends B, C extends B> String op = "String"; <A extends B, C extends B> String op = "String";
} }

4
bin/parser/FieldInitializationTest.jav
View File

@ -1,3 +1,3 @@
class FieldInitializationTest{ class FieldInitializationTest{
String var = "hallo"; String var = "hallo";
} }

6
bin/parser/GenericFieldVarTest.jav
View File

@ -1,3 +1,3 @@
class Test{ class Test{
<A> A var; <A> A var;
} }

6
bin/parser/ImportTest.jav
View File

@ -1,4 +1,4 @@
import java.util.*; import java.util.*;
class ImportTest{ class ImportTest{
} }

1
src/de/dhbwstuttgart/typeinference/assumptions/TypeAssumptions.java
View File

@ -424,5 +424,6 @@ public class TypeAssumptions {
return null; return null;
} }
*/ */
} }