From cd8b85cc41739c2837ba0a1034f745e64bf731e6 Mon Sep 17 00:00:00 2001
From: "Fikus, Evelyn (WWI2012D)" <wi12292@lehre.dhbw-stuttgart.de>
Date: Mon, 22 Jun 2015 16:51:13 +0200
Subject: [PATCH] Probleme beim Pull, Versuch zu Committen bevor pull

---
 bin/log4j.xml                                 | 70 +++++++++----------
 bin/log4jTesting.xml                          | 48 ++++++-------
 bin/parser/BoundedParameter.jav               |  6 +-
 bin/parser/FieldInitializationTest.jav        |  4 +-
 bin/parser/GenericFieldVarTest.jav            |  6 +-
 bin/parser/ImportTest.jav                     |  6 +-
 .../assumptions/TypeAssumptions.java          |  1 +
 7 files changed, 71 insertions(+), 70 deletions(-)

diff --git a/bin/log4j.xml b/bin/log4j.xml
index f36fb342..64e7c5db 100755
--- a/bin/log4j.xml
+++ b/bin/log4j.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
-
- <appender name="CONSOLE" class="de.dhbwstuttgart.logger.ConsoleAppender">
-    <param name="Target" value="System.out"/>
-
-    <layout class="de.dhbwstuttgart.logger.PatternLayout">
-      <param name="ConversionPattern" value="%-15C{1} %-5p [%-9c] %m%n"/>
-    </layout>	    
- </appender>
-
- <logger name="codegen">
-       <level value="INFO"/>
-       <appender-ref ref="CONSOLE"/>
- </logger>
-
- <logger name="parser">
-       <level value="OFF"/>
-       <appender-ref ref="CONSOLE"/>
- </logger>
- 
-  <logger name="inference">
-       <level value="WARN"/>
-       <appender-ref ref="CONSOLE"/>
- </logger>
- 
-
- <logger name="bytecode">
-       <level value="INFO"/>
-       <appender-ref ref="CONSOLE"/>
- </logger>
-
-</log4j:configuration>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
+
+ <appender name="CONSOLE" class="de.dhbwstuttgart.logger.ConsoleAppender">
+    <param name="Target" value="System.out"/>
+
+    <layout class="de.dhbwstuttgart.logger.PatternLayout">
+      <param name="ConversionPattern" value="%-15C{1} %-5p [%-9c] %m%n"/>
+    </layout>	    
+ </appender>
+
+ <logger name="codegen">
+       <level value="INFO"/>
+       <appender-ref ref="CONSOLE"/>
+ </logger>
+
+ <logger name="parser">
+       <level value="OFF"/>
+       <appender-ref ref="CONSOLE"/>
+ </logger>
+ 
+  <logger name="inference">
+       <level value="WARN"/>
+       <appender-ref ref="CONSOLE"/>
+ </logger>
+ 
+
+ <logger name="bytecode">
+       <level value="INFO"/>
+       <appender-ref ref="CONSOLE"/>
+ </logger>
+
+</log4j:configuration>
diff --git a/bin/log4jTesting.xml b/bin/log4jTesting.xml
index ef849218..dc30c245 100755
--- a/bin/log4jTesting.xml
+++ b/bin/log4jTesting.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
-
- <appender name="CONSOLE" class="de.dhbwstuttgart.logger.ConsoleAppender">
-    <param name="Target" value="System.out"/>
-
-    <layout class="de.dhbwstuttgart.logger.PatternLayout">
-      <param name="ConversionPattern" value="%-15C{1} %-5p [%-9c] %m%n"/>
-    </layout>	    
- </appender>
-
- <logger name="trtest">
-       <level value="DEBUG"/>
-       <appender-ref ref="CONSOLE"/>
- </logger>
- 
-  <logger name="funcTest">
-       <level value="DEBUG"/>
-       <appender-ref ref="CONSOLE"/>
- </logger>
-
-</log4j:configuration>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
+
+ <appender name="CONSOLE" class="de.dhbwstuttgart.logger.ConsoleAppender">
+    <param name="Target" value="System.out"/>
+
+    <layout class="de.dhbwstuttgart.logger.PatternLayout">
+      <param name="ConversionPattern" value="%-15C{1} %-5p [%-9c] %m%n"/>
+    </layout>	    
+ </appender>
+
+ <logger name="trtest">
+       <level value="DEBUG"/>
+       <appender-ref ref="CONSOLE"/>
+ </logger>
+ 
+  <logger name="funcTest">
+       <level value="DEBUG"/>
+       <appender-ref ref="CONSOLE"/>
+ </logger>
+
+</log4j:configuration>
diff --git a/bin/parser/BoundedParameter.jav b/bin/parser/BoundedParameter.jav
index 0cb21f77..6d7518a9 100644
--- a/bin/parser/BoundedParameter.jav
+++ b/bin/parser/BoundedParameter.jav
@@ -1,3 +1,3 @@
-class Matrix{
-	<A extends B, C extends B> String op = "String";
-}
+class Matrix{
+	<A extends B, C extends B> String op = "String";
+}
diff --git a/bin/parser/FieldInitializationTest.jav b/bin/parser/FieldInitializationTest.jav
index 35b56df8..302667b9 100644
--- a/bin/parser/FieldInitializationTest.jav
+++ b/bin/parser/FieldInitializationTest.jav
@@ -1,3 +1,3 @@
-class FieldInitializationTest{
-	String var = "hallo";
+class FieldInitializationTest{
+	String var = "hallo";
 }
\ No newline at end of file
diff --git a/bin/parser/GenericFieldVarTest.jav b/bin/parser/GenericFieldVarTest.jav
index 214c3f94..a47b41eb 100644
--- a/bin/parser/GenericFieldVarTest.jav
+++ b/bin/parser/GenericFieldVarTest.jav
@@ -1,3 +1,3 @@
-class Test{
-<A> A var;
-}
+class Test{
+<A> A var;
+}
diff --git a/bin/parser/ImportTest.jav b/bin/parser/ImportTest.jav
index bec195d8..2de55cee 100644
--- a/bin/parser/ImportTest.jav
+++ b/bin/parser/ImportTest.jav
@@ -1,4 +1,4 @@
-import java.util.*;
-
-class ImportTest{
+import java.util.*;
+
+class ImportTest{
 }
\ No newline at end of file
diff --git a/src/de/dhbwstuttgart/typeinference/assumptions/TypeAssumptions.java b/src/de/dhbwstuttgart/typeinference/assumptions/TypeAssumptions.java
index 2fea0a02..5b342445 100755
--- a/src/de/dhbwstuttgart/typeinference/assumptions/TypeAssumptions.java
+++ b/src/de/dhbwstuttgart/typeinference/assumptions/TypeAssumptions.java
@@ -424,5 +424,6 @@ public class TypeAssumptions {
 		return null;
 	}
 	*/
+	
 }