Merge branch 'master' into 'master'

Fix issues #685 #698 #781 #808 #815 #832 #839 Closes #839, #832, #815, #808, #781, #698, and #685 See merge request naomod/mde/projet-2019!116

Merge branch 'master' into 'master'
Fix issues #685 #698 #781 #808 #815 #832 #839 Closes #839, #832, #815, #808, #781, #698, and #685 See merge request naomod/mde/projet-2019!116
353af789 · Gerson SUNYE · 163cbe59 · 9a7b8cf5 · 353af789 · 353af789
Commit 353af789 authored Dec 20, 2019 by Gerson SUNYE
--- a/input/avoid-catching-throwable.xmi
+++ b/input/avoid-catching-throwable.xmi
+<?xml version="1.0" encoding="ASCII"?>
+<java:Model xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:java="http://www.eclipse.org/MoDisco/Java/0.2.incubation/java" name="AvoidCatchingThrowable">
+  <ownedElements name="(default package)">
+    <ownedElements xsi:type="java:ClassDeclaration" originalCompilationUnit="//@compilationUnits.0" name="AvoidCatchingThrowable">
+      <modifier visibility="public"/>
+      <bodyDeclarations xsi:type="java:MethodDeclaration" originalCompilationUnit="//@compilationUnits.0" name="bar">
+        <modifier visibility="public"/>
+        <body originalCompilationUnit="//@compilationUnits.0">
+          <statements xsi:type="java:TryStatement" originalCompilationUnit="//@compilationUnits.0">
+            <body originalCompilationUnit="//@compilationUnits.0">
+              <comments xsi:type="java:LineComment" originalCompilationUnit="//@compilationUnits.0" content="// do something" enclosedByParent="true"/>
+            </body>
+            <catchClauses originalCompilationUnit="//@compilationUnits.0">
+              <exception originalCompilationUnit="//@compilationUnits.0" name="th" usageInVariableAccess="//@ownedElements.0/@ownedElements.0/@bodyDeclarations.0/@body/@statements.0/@catchClauses.0/@body/@statements.0/@expression/@expression">
+                <modifier/>
+                <type type="//@ownedElements.1/@ownedPackages.0/@ownedElements.0"/>
+              </exception>
+              <body originalCompilationUnit="//@compilationUnits.0">
+                <statements xsi:type="java:ExpressionStatement" originalCompilationUnit="//@compilationUnits.0">
+                  <comments xsi:type="java:LineComment" originalCompilationUnit="//@compilationUnits.0" content="// should not catch Throwable" prefixOfParent="true"/>
+                  <expression xsi:type="java:MethodInvocation" originalCompilationUnit="//@compilationUnits.0" method="//@ownedElements.1/@ownedPackages.0/@ownedElements.0/@bodyDeclarations.0">
+                    <expression xsi:type="java:SingleVariableAccess" variable="//@ownedElements.0/@ownedElements.0/@bodyDeclarations.0/@body/@statements.0/@catchClauses.0/@exception"/>
+                  </expression>
+                </statements>
+              </body>
+            </catchClauses>
+          </statements>
+          <statements xsi:type="java:TryStatement" originalCompilationUnit="//@compilationUnits.0">
+            <body originalCompilationUnit="//@compilationUnits.0"/>
+            <catchClauses originalCompilationUnit="//@compilationUnits.0">
+              <exception originalCompilationUnit="//@compilationUnits.0" name="e">
+                <modifier/>
+                <type type="//@ownedElements.1/@ownedPackages.0/@ownedElements.1"/>
+              </exception>
+              <body originalCompilationUnit="//@compilationUnits.0">
+                <comments xsi:type="java:LineComment" originalCompilationUnit="//@compilationUnits.0" content="// OK" enclosedByParent="true"/>
+              </body>
+            </catchClauses>
+          </statements>
+        </body>
+        <returnType type="//@orphanTypes.5"/>
+      </bodyDeclarations>
+    </ownedElements>
+  </ownedElements>
+  <ownedElements name="java" proxy="true">
+    <ownedPackages name="lang" proxy="true">
+      <ownedElements xsi:type="java:ClassDeclaration" name="Throwable" proxy="true" usagesInTypeAccess="//@ownedElements.0/@ownedElements.0/@bodyDeclarations.0/@body/@statements.0/@catchClauses.0/@exception/@type //@ownedElements.1/@ownedPackages.0/@ownedElements.1/@superClass">
+        <bodyDeclarations xsi:type="java:MethodDeclaration" name="printStackTrace" proxy="true" usages="//@ownedElements.0/@ownedElements.0/@bodyDeclarations.0/@body/@statements.0/@catchClauses.0/@body/@statements.0/@expression"/>
+        <superInterfaces type="//@ownedElements.1/@ownedPackages.1/@ownedElements.0"/>
+      </ownedElements>
+      <ownedElements xsi:type="java:ClassDeclaration" name="Exception" proxy="true" usagesInTypeAccess="//@ownedElements.0/@ownedElements.0/@bodyDeclarations.0/@body/@statements.1/@catchClauses.0/@exception/@type">
+        <superClass type="//@ownedElements.1/@ownedPackages.0/@ownedElements.0"/>
+      </ownedElements>
+    </ownedPackages>
+    <ownedPackages name="io" proxy="true">
+      <ownedElements xsi:type="java:InterfaceDeclaration" name="Serializable" proxy="true" usagesInTypeAccess="//@ownedElements.1/@ownedPackages.0/@ownedElements.0/@superInterfaces.0"/>
+    </ownedPackages>
+  </ownedElements>
+  <orphanTypes xsi:type="java:PrimitiveTypeInt" name="int"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeLong" name="long"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeFloat" name="float"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeDouble" name="double"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeBoolean" name="boolean"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeVoid" name="void" usagesInTypeAccess="//@ownedElements.0/@ownedElements.0/@bodyDeclarations.0/@returnType"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeChar" name="char"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeShort" name="short"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeByte" name="byte"/>
+  <compilationUnits name="AvoidCatchingThrowable.java" originalFilePath="C:\Users\Charles\Desktop\travail\M2\ATL\AvoidCatchingThrowable\src\AvoidCatchingThrowable.java" commentList="//@ownedElements.0/@ownedElements.0/@bodyDeclarations.0/@body/@statements.0/@body/@comments.0 //@ownedElements.0/@ownedElements.0/@bodyDeclarations.0/@body/@statements.0/@catchClauses.0/@body/@statements.0/@comments.0 //@ownedElements.0/@ownedElements.0/@bodyDeclarations.0/@body/@statements.1/@catchClauses.0/@body/@comments.0" types="//@ownedElements.0/@ownedElements.0"/>
+</java:Model>
--- a/input/do-not-call-garbage-collection-explicitly.xmi
+++ b/input/do-not-call-garbage-collection-explicitly.xmi
+<?xml version="1.0" encoding="ASCII"?>
+<java:Model xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:java="http://www.eclipse.org/MoDisco/Java/0.2.incubation/java" name="DoNotCallGarbageCollectionExplicitly">
+  <ownedElements name="(default package)">
+    <ownedElements xsi:type="java:ClassDeclaration" originalCompilationUnit="//@compilationUnits.0" name="DoNotCallGarbageCollectionExplicitly">
+      <modifier visibility="public"/>
+      <bodyDeclarations xsi:type="java:MethodDeclaration" originalCompilationUnit="//@compilationUnits.0" name="GCCall">
+        <modifier visibility="public"/>
+        <body originalCompilationUnit="//@compilationUnits.0">
+          <statements xsi:type="java:ExpressionStatement" originalCompilationUnit="//@compilationUnits.0">
+            <comments xsi:type="java:LineComment" originalCompilationUnit="//@compilationUnits.0" content="// Explicit gc call !" prefixOfParent="true"/>
+            <expression xsi:type="java:MethodInvocation" originalCompilationUnit="//@compilationUnits.0" method="//@ownedElements.1/@ownedPackages.0/@ownedElements.0/@bodyDeclarations.0">
+              <expression xsi:type="java:TypeAccess" type="//@ownedElements.1/@ownedPackages.0/@ownedElements.0"/>
+            </expression>
+          </statements>
+        </body>
+        <returnType type="//@orphanTypes.5"/>
+      </bodyDeclarations>
+      <bodyDeclarations xsi:type="java:MethodDeclaration" originalCompilationUnit="//@compilationUnits.0" name="doSomething">
+        <modifier visibility="public"/>
+        <body originalCompilationUnit="//@compilationUnits.0">
+          <statements xsi:type="java:ExpressionStatement" originalCompilationUnit="//@compilationUnits.0">
+            <comments xsi:type="java:LineComment" originalCompilationUnit="//@compilationUnits.0" content="// Explicit gc call !" prefixOfParent="true"/>
+            <expression xsi:type="java:MethodInvocation" originalCompilationUnit="//@compilationUnits.0" method="//@ownedElements.1/@ownedPackages.0/@ownedElements.1/@bodyDeclarations.1">
+              <expression xsi:type="java:MethodInvocation" originalCompilationUnit="//@compilationUnits.0" method="//@ownedElements.1/@ownedPackages.0/@ownedElements.1/@bodyDeclarations.0">
+                <expression xsi:type="java:TypeAccess" type="//@ownedElements.1/@ownedPackages.0/@ownedElements.1"/>
+              </expression>
+            </expression>
+          </statements>
+        </body>
+        <returnType type="//@orphanTypes.5"/>
+      </bodyDeclarations>
+      <bodyDeclarations xsi:type="java:MethodDeclaration" originalCompilationUnit="//@compilationUnits.0" name="gc" usages="//@ownedElements.0/@ownedElements.0/@bodyDeclarations.3/@body/@statements.0/@expression">
+        <modifier visibility="public"/>
+        <body originalCompilationUnit="//@compilationUnits.0"/>
+        <returnType type="//@orphanTypes.5"/>
+      </bodyDeclarations>
+      <bodyDeclarations xsi:type="java:MethodDeclaration" originalCompilationUnit="//@compilationUnits.0" name="callgc">
+        <modifier visibility="public"/>
+        <body originalCompilationUnit="//@compilationUnits.0">
+          <statements xsi:type="java:ExpressionStatement" originalCompilationUnit="//@compilationUnits.0">
+            <expression xsi:type="java:MethodInvocation" originalCompilationUnit="//@compilationUnits.0" method="//@ownedElements.0/@ownedElements.0/@bodyDeclarations.2">
+              <expression xsi:type="java:ThisExpression" originalCompilationUnit="//@compilationUnits.0"/>
+            </expression>
+          </statements>
+        </body>
+        <returnType type="//@orphanTypes.5"/>
+      </bodyDeclarations>
+    </ownedElements>
+  </ownedElements>
+  <ownedElements name="java" proxy="true">
+    <ownedPackages name="lang" proxy="true">
+      <ownedElements xsi:type="java:ClassDeclaration" name="System" proxy="true" usagesInTypeAccess="//@ownedElements.0/@ownedElements.0/@bodyDeclarations.0/@body/@statements.0/@expression/@expression">
+        <bodyDeclarations xsi:type="java:MethodDeclaration" name="gc" proxy="true" usages="//@ownedElements.0/@ownedElements.0/@bodyDeclarations.0/@body/@statements.0/@expression"/>
+      </ownedElements>
+      <ownedElements xsi:type="java:ClassDeclaration" name="Runtime" proxy="true" usagesInTypeAccess="//@ownedElements.0/@ownedElements.0/@bodyDeclarations.1/@body/@statements.0/@expression/@expression/@expression">
+        <bodyDeclarations xsi:type="java:MethodDeclaration" name="getRuntime" proxy="true" usages="//@ownedElements.0/@ownedElements.0/@bodyDeclarations.1/@body/@statements.0/@expression/@expression"/>
+        <bodyDeclarations xsi:type="java:MethodDeclaration" name="gc" proxy="true" usages="//@ownedElements.0/@ownedElements.0/@bodyDeclarations.1/@body/@statements.0/@expression"/>
+      </ownedElements>
+    </ownedPackages>
+  </ownedElements>
+  <orphanTypes xsi:type="java:PrimitiveTypeInt" name="int"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeLong" name="long"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeFloat" name="float"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeDouble" name="double"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeBoolean" name="boolean"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeVoid" name="void" usagesInTypeAccess="//@ownedElements.0/@ownedElements.0/@bodyDeclarations.0/@returnType //@ownedElements.0/@ownedElements.0/@bodyDeclarations.1/@returnType //@ownedElements.0/@ownedElements.0/@bodyDeclarations.2/@returnType //@ownedElements.0/@ownedElements.0/@bodyDeclarations.3/@returnType"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeChar" name="char"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeShort" name="short"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeByte" name="byte"/>
+  <compilationUnits name="DoNotCallGarbageCollectionExplicitly.java" originalFilePath="C:\Users\Charles\Desktop\travail\M2\ATL\DoNotCallGarbageCollectionExplicitly\src\DoNotCallGarbageCollectionExplicitly.java" commentList="//@ownedElements.0/@ownedElements.0/@bodyDeclarations.0/@body/@statements.0/@comments.0 //@ownedElements.0/@ownedElements.0/@bodyDeclarations.1/@body/@statements.0/@comments.0" types="//@ownedElements.0/@ownedElements.0"/>
+</java:Model>
--- a/input/empty-catch-block.xmi
+++ b/input/empty-catch-block.xmi
+<?xml version="1.0" encoding="ASCII"?>
+<java:Model xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:java="http://www.eclipse.org/MoDisco/Java/0.2.incubation/java" name="EmptyCatchBlock">
+  <ownedElements name="(default package)">
+    <ownedElements xsi:type="java:ClassDeclaration" originalCompilationUnit="//@compilationUnits.0" name="EmptyCatchBlock">
+      <modifier visibility="public"/>
+      <bodyDeclarations xsi:type="java:MethodDeclaration" originalCompilationUnit="//@compilationUnits.0" name="doSomething">
+        <modifier visibility="public"/>
+        <body originalCompilationUnit="//@compilationUnits.0">
+          <statements xsi:type="java:TryStatement" originalCompilationUnit="//@compilationUnits.0">
+            <body originalCompilationUnit="//@compilationUnits.0">
+              <statements xsi:type="java:ExpressionStatement" originalCompilationUnit="//@compilationUnits.0">
+                <expression xsi:type="java:MethodInvocation" originalCompilationUnit="//@compilationUnits.0" method="//@ownedElements.1/@ownedPackages.1/@ownedElements.1/@bodyDeclarations.0">
+                  <arguments xsi:type="java:StringLiteral" originalCompilationUnit="//@compilationUnits.0" escapedValue="&quot;do something !&quot;"/>
+                  <expression xsi:type="java:SingleVariableAccess" variable="//@ownedElements.1/@ownedPackages.0/@ownedElements.0/@bodyDeclarations.0/@fragments.0">
+                    <qualifier xsi:type="java:TypeAccess" type="//@ownedElements.1/@ownedPackages.0/@ownedElements.0"/>
+                  </expression>
+                </expression>
+              </statements>
+            </body>
+            <catchClauses originalCompilationUnit="//@compilationUnits.0">
+              <exception originalCompilationUnit="//@compilationUnits.0" name="e">
+                <modifier/>
+                <type type="//@ownedElements.1/@ownedPackages.0/@ownedElements.6"/>
+              </exception>
+              <body originalCompilationUnit="//@compilationUnits.0">
+                <comments xsi:type="java:LineComment" originalCompilationUnit="//@compilationUnits.0" content="// not good" enclosedByParent="true"/>
+              </body>
+            </catchClauses>
+          </statements>
+        </body>
+        <returnType type="//@orphanTypes.5"/>
+      </bodyDeclarations>
+      <bodyDeclarations xsi:type="java:MethodDeclaration" originalCompilationUnit="//@compilationUnits.0" name="doingSomething">
+        <modifier visibility="public"/>
+        <body originalCompilationUnit="//@compilationUnits.0">
+          <statements xsi:type="java:TryStatement" originalCompilationUnit="//@compilationUnits.0">
+            <body originalCompilationUnit="//@compilationUnits.0">
+              <statements xsi:type="java:ExpressionStatement" originalCompilationUnit="//@compilationUnits.0">
+                <expression xsi:type="java:MethodInvocation" originalCompilationUnit="//@compilationUnits.0" method="//@ownedElements.1/@ownedPackages.1/@ownedElements.1/@bodyDeclarations.0">
+                  <arguments xsi:type="java:StringLiteral" originalCompilationUnit="//@compilationUnits.0" escapedValue="&quot;do something !&quot;"/>
+                  <expression xsi:type="java:SingleVariableAccess" variable="//@ownedElements.1/@ownedPackages.0/@ownedElements.0/@bodyDeclarations.0/@fragments.0">
+                    <qualifier xsi:type="java:TypeAccess" type="//@ownedElements.1/@ownedPackages.0/@ownedElements.0"/>
+                  </expression>
+                </expression>
+              </statements>
+            </body>
+            <catchClauses originalCompilationUnit="//@compilationUnits.0">
+              <exception originalCompilationUnit="//@compilationUnits.0" name="e">
+                <modifier/>
+                <type type="//@ownedElements.1/@ownedPackages.0/@ownedElements.6"/>
+              </exception>
+              <body originalCompilationUnit="//@compilationUnits.0">
+                <statements xsi:type="java:ExpressionStatement" originalCompilationUnit="//@compilationUnits.0">
+                  <expression xsi:type="java:MethodInvocation" originalCompilationUnit="//@compilationUnits.0" method="//@ownedElements.1/@ownedPackages.1/@ownedElements.1/@bodyDeclarations.0">
+                    <arguments xsi:type="java:StringLiteral" originalCompilationUnit="//@compilationUnits.0" escapedValue="&quot;I am&quot;"/>
+                    <expression xsi:type="java:SingleVariableAccess" variable="//@ownedElements.1/@ownedPackages.0/@ownedElements.0/@bodyDeclarations.0/@fragments.0">
+                      <qualifier xsi:type="java:TypeAccess" type="//@ownedElements.1/@ownedPackages.0/@ownedElements.0"/>
+                    </expression>
+                  </expression>
+                </statements>
+              </body>
+            </catchClauses>
+          </statements>
+        </body>
+        <returnType type="//@orphanTypes.5"/>
+      </bodyDeclarations>
+    </ownedElements>
+  </ownedElements>
+  <ownedElements name="java" proxy="true">
+    <ownedPackages name="lang" proxy="true">
+      <ownedElements xsi:type="java:ClassDeclaration" name="System" proxy="true" usagesInTypeAccess="//@ownedElements.0/@ownedElements.0/@bodyDeclarations.0/@body/@statements.0/@body/@statements.0/@expression/@expression/@qualifier //@ownedElements.0/@ownedElements.0/@bodyDeclarations.1/@body/@statements.0/@body/@statements.0/@expression/@expression/@qualifier //@ownedElements.0/@ownedElements.0/@bodyDeclarations.1/@body/@statements.0/@catchClauses.0/@body/@statements.0/@expression/@expression/@qualifier">
+        <bodyDeclarations xsi:type="java:FieldDeclaration" proxy="true">
+          <fragments name="out" proxy="true" usageInVariableAccess="//@ownedElements.0/@ownedElements.0/@bodyDeclarations.0/@body/@statements.0/@body/@statements.0/@expression/@expression //@ownedElements.0/@ownedElements.0/@bodyDeclarations.1/@body/@statements.0/@body/@statements.0/@expression/@expression //@ownedElements.0/@ownedElements.0/@bodyDeclarations.1/@body/@statements.0/@catchClauses.0/@body/@statements.0/@expression/@expression"/>
+        </bodyDeclarations>
+      </ownedElements>
+      <ownedElements xsi:type="java:ClassDeclaration" name="String" proxy="true" usagesInTypeAccess="//@ownedElements.1/@ownedPackages.1/@ownedElements.1/@bodyDeclarations.0/@parameters.0/@type">
+        <superInterfaces type="//@ownedElements.1/@ownedPackages.1/@ownedElements.0"/>
+        <superInterfaces type="//@ownedElements.1/@ownedPackages.0/@ownedElements.2"/>
+        <superInterfaces type="//@ownedElements.1/@ownedPackages.0/@ownedElements.3"/>
+      </ownedElements>
+      <ownedElements xsi:type="java:InterfaceDeclaration" name="Comparable" proxy="true" usagesInTypeAccess="//@ownedElements.1/@ownedPackages.0/@ownedElements.1/@superInterfaces.1">
+        <typeParameters name="T" proxy="true"/>
+      </ownedElements>
+      <ownedElements xsi:type="java:InterfaceDeclaration" name="CharSequence" proxy="true" usagesInTypeAccess="//@ownedElements.1/@ownedPackages.0/@ownedElements.1/@superInterfaces.2"/>
+      <ownedElements xsi:type="java:InterfaceDeclaration" name="AutoCloseable" proxy="true" usagesInTypeAccess="//@ownedElements.1/@ownedPackages.1/@ownedElements.4/@superInterfaces.0"/>
+      <ownedElements xsi:type="java:InterfaceDeclaration" name="Appendable" proxy="true" usagesInTypeAccess="//@ownedElements.1/@ownedPackages.1/@ownedElements.1/@superInterfaces.0"/>
+      <ownedElements xsi:type="java:ClassDeclaration" name="Exception" proxy="true" usagesInTypeAccess="//@ownedElements.0/@ownedElements.0/@bodyDeclarations.0/@body/@statements.0/@catchClauses.0/@exception/@type //@ownedElements.0/@ownedElements.0/@bodyDeclarations.1/@body/@statements.0/@catchClauses.0/@exception/@type">
+        <superClass type="//@ownedElements.1/@ownedPackages.0/@ownedElements.7"/>
+      </ownedElements>
+      <ownedElements xsi:type="java:ClassDeclaration" name="Throwable" proxy="true" usagesInTypeAccess="//@ownedElements.1/@ownedPackages.0/@ownedElements.6/@superClass">
+        <superInterfaces type="//@ownedElements.1/@ownedPackages.1/@ownedElements.0"/>
+      </ownedElements>
+    </ownedPackages>
+    <ownedPackages name="io" proxy="true">
+      <ownedElements xsi:type="java:InterfaceDeclaration" name="Serializable" proxy="true" usagesInTypeAccess="//@ownedElements.1/@ownedPackages.0/@ownedElements.1/@superInterfaces.0 //@ownedElements.1/@ownedPackages.0/@ownedElements.7/@superInterfaces.0"/>
+      <ownedElements xsi:type="java:ClassDeclaration" name="PrintStream" proxy="true">
+        <bodyDeclarations xsi:type="java:MethodDeclaration" name="println" proxy="true" usages="//@ownedElements.0/@ownedElements.0/@bodyDeclarations.0/@body/@statements.0/@body/@statements.0/@expression //@ownedElements.0/@ownedElements.0/@bodyDeclarations.1/@body/@statements.0/@body/@statements.0/@expression //@ownedElements.0/@ownedElements.0/@bodyDeclarations.1/@body/@statements.0/@catchClauses.0/@body/@statements.0/@expression">
+          <parameters name="arg0" proxy="true">
+            <type type="//@ownedElements.1/@ownedPackages.0/@ownedElements.1"/>
+          </parameters>
+        </bodyDeclarations>
+        <superInterfaces type="//@ownedElements.1/@ownedPackages.0/@ownedElements.5"/>
+        <superInterfaces type="//@ownedElements.1/@ownedPackages.1/@ownedElements.4"/>
+        <superClass type="//@ownedElements.1/@ownedPackages.1/@ownedElements.2"/>
+      </ownedElements>
+      <ownedElements xsi:type="java:ClassDeclaration" name="FilterOutputStream" proxy="true" usagesInTypeAccess="//@ownedElements.1/@ownedPackages.1/@ownedElements.1/@superClass">
+        <superClass type="//@ownedElements.1/@ownedPackages.1/@ownedElements.3"/>
+      </ownedElements>
+      <ownedElements xsi:type="java:ClassDeclaration" name="OutputStream" proxy="true" usagesInTypeAccess="//@ownedElements.1/@ownedPackages.1/@ownedElements.2/@superClass">
+        <superInterfaces type="//@ownedElements.1/@ownedPackages.1/@ownedElements.4"/>
+        <superInterfaces type="//@ownedElements.1/@ownedPackages.1/@ownedElements.5"/>
+      </ownedElements>
+      <ownedElements xsi:type="java:InterfaceDeclaration" name="Closeable" proxy="true" usagesInTypeAccess="//@ownedElements.1/@ownedPackages.1/@ownedElements.3/@superInterfaces.0 //@ownedElements.1/@ownedPackages.1/@ownedElements.1/@superInterfaces.1">
+        <superInterfaces type="//@ownedElements.1/@ownedPackages.0/@ownedElements.4"/>
+      </ownedElements>
+      <ownedElements xsi:type="java:InterfaceDeclaration" name="Flushable" proxy="true" usagesInTypeAccess="//@ownedElements.1/@ownedPackages.1/@ownedElements.3/@superInterfaces.1"/>
+    </ownedPackages>
+  </ownedElements>
+  <orphanTypes xsi:type="java:PrimitiveTypeInt" name="int"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeLong" name="long"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeFloat" name="float"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeDouble" name="double"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeBoolean" name="boolean"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeVoid" name="void" usagesInTypeAccess="//@ownedElements.0/@ownedElements.0/@bodyDeclarations.0/@returnType //@ownedElements.0/@ownedElements.0/@bodyDeclarations.1/@returnType"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeChar" name="char"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeShort" name="short"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeByte" name="byte"/>
+  <compilationUnits name="EmptyCatchBlock.java" originalFilePath="C:\Users\Charles\Desktop\travail\M2\ATL\EmptyCatchBlock\src\EmptyCatchBlock.java" commentList="//@ownedElements.0/@ownedElements.0/@bodyDeclarations.0/@body/@statements.0/@catchClauses.0/@body/@comments.0" types="//@ownedElements.0/@ownedElements.0"/>
+</java:Model>
--- a/input/generics-naming.xmi
+++ b/input/generics-naming.xmi
+<?xml version="1.0" encoding="ASCII"?>
+<java:Model xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:java="http://www.eclipse.org/MoDisco/Java/0.2.incubation/java" name="GenericsNaming">
+  <ownedElements name="(default package)">
+    <ownedElements xsi:type="java:ClassDeclaration" originalCompilationUnit="//@compilationUnits.0" name="GenericsNaming">
+      <modifier visibility="public"/>
+      <typeParameters originalCompilationUnit="//@compilationUnits.0" name="E"/>
+      <typeParameters originalCompilationUnit="//@compilationUnits.0" name="Ee"/>
+      <typeParameters originalCompilationUnit="//@compilationUnits.0" name="e"/>
+      <typeParameters originalCompilationUnit="//@compilationUnits.0" name="EE"/>
+    </ownedElements>
+  </ownedElements>
+  <orphanTypes xsi:type="java:PrimitiveTypeInt" name="int"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeLong" name="long"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeFloat" name="float"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeDouble" name="double"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeBoolean" name="boolean"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeVoid" name="void"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeChar" name="char"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeShort" name="short"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeByte" name="byte"/>
+  <compilationUnits name="GenericsNaming.java" originalFilePath="C:\Users\Charles\Desktop\travail\M2\ATL\GenericsNaming\src\GenericsNaming.java" types="//@ownedElements.0/@ownedElements.0"/>
+</java:Model>
--- a/input/import-from-same-package.xmi
+++ b/input/import-from-same-package.xmi
+<?xml version="1.0" encoding="ASCII"?>
+<java:Model xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:java="http://www.eclipse.org/MoDisco/Java/0.2.incubation/java" name="ImportFromSamePackage">
+  <ownedElements name="foo" usagesInImports="//@compilationUnits.0/@imports.0">
+    <ownedElements xsi:type="java:ClassDeclaration" originalCompilationUnit="//@compilationUnits.0" name="ImportFromSamePackage">
+      <modifier visibility="public"/>
+    </ownedElements>
+  </ownedElements>
+  <ownedElements name="otherPackage" proxy="true" usagesInImports="//@compilationUnits.0/@imports.1"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeInt" name="int"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeLong" name="long"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeFloat" name="float"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeDouble" name="double"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeBoolean" name="boolean"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeVoid" name="void"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeChar" name="char"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeShort" name="short"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeByte" name="byte"/>
+  <compilationUnits name="ImportFromSamePackage.java" originalFilePath="C:\Users\Charles\Desktop\travail\M2\ATL\ImportFromSamePackage\src\foo\ImportFromSamePackage.java" package="//@ownedElements.0" types="//@ownedElements.0/@ownedElements.0">
+    <imports originalCompilationUnit="//@compilationUnits.0" importedElement="//@ownedElements.0"/>
+    <imports originalCompilationUnit="//@compilationUnits.0" importedElement="//@ownedElements.1"/>
+  </compilationUnits>
+</java:Model>
--- a/input/method-with-same-name-as-enclosing-class.xmi
+++ b/input/method-with-same-name-as-enclosing-class.xmi
+<?xml version="1.0" encoding="ASCII"?>
+<java:Model xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:java="http://www.eclipse.org/MoDisco/Java/0.2.incubation/java" name="MethodWithSameNameAsEnclosingClass">
+  <ownedElements name="(default package)">
+    <ownedElements xsi:type="java:ClassDeclaration" originalCompilationUnit="//@compilationUnits.0" name="MyClass">
+      <modifier visibility="public"/>
+      <bodyDeclarations xsi:type="java:ConstructorDeclaration" originalCompilationUnit="//@compilationUnits.0" name="MyClass">
+        <modifier visibility="public"/>
+        <body originalCompilationUnit="//@compilationUnits.0">
+          <comments xsi:type="java:LineComment" originalCompilationUnit="//@compilationUnits.0" content="// this is OK because it is a constructor"/>
+        </body>
+      </bodyDeclarations>
+      <bodyDeclarations xsi:type="java:MethodDeclaration" originalCompilationUnit="//@compilationUnits.0" name="MyClass">
+        <modifier visibility="public"/>
+        <body originalCompilationUnit="//@compilationUnits.0">
+          <comments xsi:type="java:LineComment" originalCompilationUnit="//@compilationUnits.0" content="// this is bad because it is a method"/>
+        </body>
+        <returnType type="//@orphanTypes.5"/>
+      </bodyDeclarations>
+      <bodyDeclarations xsi:type="java:MethodDeclaration" originalCompilationUnit="//@compilationUnits.0" name="otherMethod">
+        <modifier visibility="public"/>
+        <body originalCompilationUnit="//@compilationUnits.0"/>
+        <returnType type="//@orphanTypes.5"/>
+      </bodyDeclarations>
+    </ownedElements>
+  </ownedElements>
+  <orphanTypes xsi:type="java:PrimitiveTypeInt" name="int"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeLong" name="long"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeFloat" name="float"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeDouble" name="double"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeBoolean" name="boolean"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeVoid" name="void" usagesInTypeAccess="//@ownedElements.0/@ownedElements.0/@bodyDeclarations.1/@returnType //@ownedElements.0/@ownedElements.0/@bodyDeclarations.2/@returnType"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeChar" name="char"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeShort" name="short"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeByte" name="byte"/>
+  <compilationUnits name="MyClass.java" originalFilePath="C:\Users\Charles\Desktop\travail\M2\ATL\MethodWithSameNameAsEnclosingClass\src\MyClass.java" commentList="//@ownedElements.0/@ownedElements.0/@bodyDeclarations.0/@body/@comments.0 //@ownedElements.0/@ownedElements.0/@bodyDeclarations.1/@body/@comments.0" types="//@ownedElements.0/@ownedElements.0"/>
+</java:Model>
--- a/input/misleading-variable-name.xmi
+++ b/input/misleading-variable-name.xmi
+<?xml version="1.0" encoding="ASCII"?>
+<java:Model xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:java="http://www.eclipse.org/MoDisco/Java/0.2.incubation/java" name="MisLeadingVariableName">
+  <ownedElements name="(default package)">
+    <ownedElements xsi:type="java:ClassDeclaration" originalCompilationUnit="//@compilationUnits.0" name="MisLeadingVariableName">
+      <modifier visibility="public"/>
+      <bodyDeclarations xsi:type="java:FieldDeclaration" originalCompilationUnit="//@compilationUnits.0">
+        <comments xsi:type="java:LineComment" originalCompilationUnit="//@compilationUnits.0" content="// OK"/>
+        <modifier visibility="private"/>
+        <type type="//@orphanTypes.0"/>
+        <fragments originalCompilationUnit="//@compilationUnits.0" name="m_foo"/>
+      </bodyDeclarations>
+      <bodyDeclarations xsi:type="java:MethodDeclaration" originalCompilationUnit="//@compilationUnits.0" name="bar">
+        <modifier visibility="public"/>
+        <body originalCompilationUnit="//@compilationUnits.0">
+          <statements xsi:type="java:VariableDeclarationStatement" originalCompilationUnit="//@compilationUnits.0">
+            <comments xsi:type="java:LineComment" originalCompilationUnit="//@compilationUnits.0" content="// Bad" prefixOfParent="true"/>
+            <comments xsi:type="java:LineComment" originalCompilationUnit="//@compilationUnits.0" content="// Bad"/>
+            <type type="//@orphanTypes.0"/>
+            <fragments originalCompilationUnit="//@compilationUnits.0" name="m_boz">
+              <initializer xsi:type="java:NumberLiteral" originalCompilationUnit="//@compilationUnits.0" tokenValue="42"/>
+            </fragments>
+            <modifier/>
+          </statements>
+        </body>
+        <parameters originalCompilationUnit="//@compilationUnits.0" name="m_baz">
+          <modifier/>
+          <type type="//@ownedElements.1/@ownedPackages.0/@ownedElements.0"/>
+        </parameters>
+        <returnType type="//@orphanTypes.5"/>
+      </bodyDeclarations>
+    </ownedElements>
+  </ownedElements>
+  <ownedElements name="java" proxy="true">
+    <ownedPackages name="lang" proxy="true">
+      <ownedElements xsi:type="java:ClassDeclaration" name="String" proxy="true" usagesInTypeAccess="//@ownedElements.0/@ownedElements.0/@bodyDeclarations.1/@parameters.0/@type">
+        <superInterfaces type="//@ownedElements.1/@ownedPackages.1/@ownedElements.0"/>
+        <superInterfaces type="//@ownedElements.1/@ownedPackages.0/@ownedElements.1"/>
+        <superInterfaces type="//@ownedElements.1/@ownedPackages.0/@ownedElements.2"/>
+      </ownedElements>
+      <ownedElements xsi:type="java:InterfaceDeclaration" name="Comparable" proxy="true" usagesInTypeAccess="//@ownedElements.1/@ownedPackages.0/@ownedElements.0/@superInterfaces.1">
+        <typeParameters name="T" proxy="true"/>
+      </ownedElements>
+      <ownedElements xsi:type="java:InterfaceDeclaration" name="CharSequence" proxy="true" usagesInTypeAccess="//@ownedElements.1/@ownedPackages.0/@ownedElements.0/@superInterfaces.2"/>
+    </ownedPackages>
+    <ownedPackages name="io" proxy="true">
+      <ownedElements xsi:type="java:InterfaceDeclaration" name="Serializable" proxy="true" usagesInTypeAccess="//@ownedElements.1/@ownedPackages.0/@ownedElements.0/@superInterfaces.0"/>
+    </ownedPackages>
+  </ownedElements>
+  <orphanTypes xsi:type="java:PrimitiveTypeInt" name="int" usagesInTypeAccess="//@ownedElements.0/@ownedElements.0/@bodyDeclarations.0/@type //@ownedElements.0/@ownedElements.0/@bodyDeclarations.1/@body/@statements.0/@type"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeLong" name="long"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeFloat" name="float"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeDouble" name="double"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeBoolean" name="boolean"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeVoid" name="void" usagesInTypeAccess="//@ownedElements.0/@ownedElements.0/@bodyDeclarations.1/@returnType"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeChar" name="char"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeShort" name="short"/>
+  <orphanTypes xsi:type="java:PrimitiveTypeByte" name="byte"/>
+  <compilationUnits name="MisLeadingVariableName.java" originalFilePath="C:\Users\Charles\Desktop\travail\M2\ATL\MisLeadingVariableName\src\MisLeadingVariableName.java" commentList="//@ownedElements.0/@ownedElements.0/@bodyDeclarations.0/@comments.0 //@ownedElements.0/@ownedElements.0/@bodyDeclarations.1/@body/@statements.0/@comments.0 //@ownedElements.0/@ownedElements.0/@bodyDeclarations.1/@body/@statements.0/@comments.1" types="//@ownedElements.0/@ownedElements.0"/>
+</java:Model>
--- a/src/main/atl/analysis.atl
+++ b/src/main/atl/analysis.atl
@@ -49,6 +49,8 @@ helper def: allMeasures(project : java!Model): Set(smm!Measure) =
 		thisModule.unnecessaryReturn(),
 		thisModule.longVariable(),
 		thisModule.noPackageDeclaration(),
+		thisModule.genericsNaming(),
+		thisModule.misLeadingVariableName(),

 		-- Design rules
 		--
@@ -96,6 +98,11 @@ helper def: allMeasures(project : java!Model): Set(smm!Measure) =
 		thisModule.AvoidEnumAsIdentifier(),
 		thisModule.AvoidCatchingNPE(),
 		thisModule.UseProperClassLoader(),
+		thisModule.avoidCatchingThrowable(),
+		thisModule.doNotCallGarbageCollectionExplicitly(),
+		thisModule.emptyCatchBlock(),
+		thisModule.importFromSamePackage(),
+		thisModule.methodWithSameNameAsEnclosingClass(),
 		
 		-- Best practices rules
 		thisModule.useAssertTrueInsteadOfAssertEquals(),
@@ -1407,4 +1414,137 @@ rule MeasureUseProperClassLoader(w: java!MethodInvocation) {
 	do {
 		noc; 
 	}
+}
+-------------------------------------------GenericsNaming----------------------------------------------
+-- A Measure instance if the class violate the rule GenericsNaming
+rule MeasureGenericsNaming(type :java!TypeParameter) {
+	to
+		om: smm!ObservedMeasure (
+			measure <- noc,
+			measurements <- measurement
+		),
+		noc: smm!DimensionalMeasure (
+			name <- 'GenericsNaming',
+			shortDescription <- 'Names for references to generic values should be limited to a single uppercase letter.'
+		),
+		measurement: smm!DirectMeasurement (
+			error<- 'The generic type ' + type.name + ' should be limited to a single uppercase letter.'
+		)
+	do {
+		noc;
+	}
+}
+-------------------------------------------MisLeadingVariableName----------------------------------------------
+-- A Measure instance if the class violate the rule MisLeadingVariableName
+rule MeasureMisLeadingVariableName(variable :java!VariableDeclarationFragment) {
+	to
+		om: smm!ObservedMeasure (
+			measure <- noc,
+			measurements <- measurement
+		),
+		noc: smm!DimensionalMeasure (
+			name <- 'MisLeadingVariableName',
+			shortDescription <- 'Detects when a non-field has a name starting with m_. This usually denotes a field and could be confusing.'
+		),
+		measurement: smm!DirectMeasurement (
+			error<- 'Variable ' + variable.name + ' should not start with m_ as it is not a field.'
+		)
+	do {
+		noc;
+	}
+}
+-------------------------------------------AvoidCatchingThrowable----------------------------------------------
+-- A Measure instance if the class violate the rule MisLeadingVariableName
+rule MeasureAvoidCatchingThrowable(catch :java!CatchClause) {
+	to
+		om: smm!ObservedMeasure (
+			measure <- noc,
+			measurements <- measurement
+		),
+		noc: smm!DimensionalMeasure (
+			name <- 'AvoidCatchingThrowable',
+			shortDescription <- 'Catching Throwable errors is not recommended since its scope is very broad. It includes runtime issues such as OutOfMemoryError that should be exposed and managed separately.'
+		),
+		measurement: smm!DirectMeasurement (
+			error<- 'Throwable ' + catch.exception.name + ' should not be catched.'
+		)
+	do {
+		noc;
+	}
+}
+-------------------------------------------DoNotCallGarbageCollectionExplicitly----------------------------------------------
+-- A Measure instance if the class violate the rule DoNotCallGarbageCollectionExplicitly
+rule MeasureDoNotCallGarbageCollectionExplicitly(method : java!MethodInvocation) {
+	to
+		om: smm!ObservedMeasure (
+			measure <- noc,
+			measurements <- measurement
+		),
+		noc: smm!DimensionalMeasure (
+			name <- 'DoNotCallGarbageCollectionExplicitly',
+			shortDescription <- 'Calls to System.gc(), Runtime.getRuntime().gc(), and System.runFinalization() are not advised.'
+		),
+		measurement: smm!DirectMeasurement (
+			error<- 'Garbage collector is called explicitly in ' + method.originalCompilationUnit.name
+		)
+	do {
+		noc;
+	}
+}
+-------------------------------------------EmptyCatchBlock----------------------------------------------
+-- A Measure instance if the class violate the rule EmptyCatchBlock
+rule MeasureEmptyCatchBlock(catch : java!CatchClause) {
+	to
+		om: smm!ObservedMeasure (
+			measure <- noc,
+			measurements <- measurement
+		),
+		noc: smm!DimensionalMeasure (
+			name <- 'EmptyCatchBlock',
+			shortDescription <- 'Empty Catch Block finds instances where an exception is caught, but nothing is done. In most circumstances, this swallows an exception which should either be acted on or reported.'
+		),
+		measurement: smm!DirectMeasurement (
+			error<- 'Empty catch block in ' + catch.originalCompilationUnit.name
+		)
+	do {
+		noc;
+	}
+}
+-------------------------------------------ImportFromSamePackage----------------------------------------------
+-- A Measure instance if the class violate the rule ImportFromSamePackage
+rule MeasureImportFromSamePackage(import : java!ImportDeclaration) {
+	to
+		om: smm!ObservedMeasure (
+			measure <- noc,
+			measurements <- measurement
+		),
+		noc: smm!DimensionalMeasure (
+			name <- 'ImportFromSamePackage',
+			shortDescription <- 'There is no need to import a type that lives in the same package.'
+		),
+		measurement: smm!DirectMeasurement (
+			error<- 'No need to import ' + import.importedElement.name + ' in ' + import.originalCompilationUnit.name
+		)
+	do {
+		noc;
+	}
+}
+-------------------------------------------MethodWithSameNameAsEnclosingClass----------------------------------------------
+-- A Measure instance if the class violate the rule MethodWithSameNameAsEnclosingClass
+rule MeasureMethodWithSameNameAsEnclosingClass(method : java!MethodDeclaration) {
+	to
+		om: smm!ObservedMeasure (
+			measure <- noc,
+			measurements <- measurement
+		),
+		noc: smm!DimensionalMeasure (
+			name <- 'MethodWithSameNameAsEnclosingClass',
+			shortDescription <- 'Non-constructor methods should not have the same name as the enclosing class.'
+		),
+		measurement: smm!DirectMeasurement (
+			error<- 'Method ' + method.name + ' has the same name as ' + method.originalCompilationUnit.name + ' and is not a contructor.'
+		)
+	do {
+		noc;
+	}
 }
\ No newline at end of file
--- a/src/main/atl/codestyle.atl
+++ b/src/main/atl/codestyle.atl
@@ -87,6 +87,19 @@ helper def: noPackageDeclaration() : Set(smm!Measure) =
 		->collect(err | thisModule.MesureAvoidNoPackageDeclaration(err));


-
-
-
+--------------------------------------------- GenericsNaming ---------------------------------------------
+-- Rule for metrics GenericsNaming
+helper def: genericsNaming() : Set(smm!Measure) =
+	java!TypeParameter.allInstances()
+		-> reject(type | type.name.size() = 1 and type.name.substring(1,1) = type.name.substring(1,1).toUpper())
+		-> collect(type | thisModule.MeasureGenericsNaming(type));
+
+--------------------------------------------- MisLeadingVariableName ---------------------------------------------
+-- Rule for metrics MisLeadingVariableName
+helper def: misLeadingVariableName() : Set(smm!Measure) =
+	java!VariableDeclarationFragment.allInstances()
+		-> reject(variable | variable.variablesContainer.oclIsTypeOf(java!FieldDeclaration))
+		-> union(java!SingleVariableDeclaration.allInstances())