diff --git a/src/main/resources/com/sonar/sqale/oclint-model.xml b/src/main/resources/com/sonar/sqale/oclint-model.xml
index 42c209fb..b64f6550 100644
--- a/src/main/resources/com/sonar/sqale/oclint-model.xml
+++ b/src/main/resources/com/sonar/sqale/oclint-model.xml
@@ -50,17 +50,17 @@
unused method parameter
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -68,17 +68,17 @@
unused local variable
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -86,17 +86,17 @@
replace with number literal
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -104,17 +104,17 @@
replace with boxed expression
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -122,17 +122,17 @@
unnecessary else statement
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -140,17 +140,17 @@
redundant local variable
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -158,17 +158,17 @@
redundant if statement
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -176,17 +176,17 @@
redundant conditional operator
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -194,17 +194,17 @@
replace with container literal
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -212,17 +212,17 @@
long line
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -230,17 +230,17 @@
long method
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 30
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 30
+ mn
@@ -248,17 +248,17 @@
for loop should be while loop
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -266,17 +266,17 @@
too many methods
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 1
- h
+ 0.0
+ d
offset
- 0.0
- d
+ 1
+ h
@@ -284,17 +284,17 @@
long class
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 1
- h
+ 0.0
+ d
offset
- 0.0
- d
+ 1
+ h
@@ -302,17 +302,17 @@
too many fields
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 1
- h
+ 0.0
+ d
offset
- 0.0
- d
+ 1
+ h
@@ -320,17 +320,17 @@
collapsible if statements
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 30
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 30
+ mn
@@ -338,17 +338,17 @@
deep nested block
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 30
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 30
+ mn
@@ -356,17 +356,17 @@
high cyclomatic complexity
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 30
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 30
+ mn
@@ -374,17 +374,17 @@
too few branches in switch statement
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -392,17 +392,17 @@
non case label in switch statement
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -410,17 +410,17 @@
short variable name
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -428,17 +428,17 @@
long variable name
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -446,17 +446,17 @@
default label not last in switch statement
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -464,17 +464,17 @@
replace with object subscripting
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -486,17 +486,17 @@
useless parentheses
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -504,17 +504,17 @@
use early exits and continue
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -522,17 +522,17 @@
high npath complexity
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 30
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 30
+ mn
@@ -540,17 +540,17 @@
inverted logic
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -558,17 +558,17 @@
multiple unary operator
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -576,17 +576,17 @@
redundant nil check
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -594,17 +594,17 @@
high ncss method
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -612,17 +612,17 @@
dead code
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -630,17 +630,17 @@
double negative
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -648,17 +648,17 @@
bitwise operator in conditional
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -666,17 +666,17 @@
empty if statement
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -684,17 +684,17 @@
empty while statement
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -702,17 +702,17 @@
empty else block
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -720,17 +720,17 @@
empty for statement
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -738,17 +738,17 @@
empty do/while statement
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -756,17 +756,17 @@
empty switch statement
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -774,17 +774,17 @@
too many parameters
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 30
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 30
+ mn
@@ -792,17 +792,17 @@
switch statements don't need default when fully covered
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -874,17 +874,17 @@
empty finally statement
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -892,17 +892,17 @@
return from finally block
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -910,17 +910,17 @@
empty catch statement
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -928,17 +928,17 @@
empty try statement
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -946,17 +946,17 @@
throw exception from finally block
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -972,17 +972,17 @@
must override hash with isEqual
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -990,17 +990,17 @@
parameter reassignment
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 30
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 30
+ mn
@@ -1008,17 +1008,17 @@
ivar assignment outside accessors or init
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -1030,17 +1030,17 @@
missing break in switch statement
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -1048,17 +1048,17 @@
avoid branching statement as last in loop
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 30
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 30
+ mn
@@ -1066,17 +1066,17 @@
switch statements should have default
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -1084,17 +1084,17 @@
jumbled incrementer
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -1102,17 +1102,17 @@
broken null check
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -1120,17 +1120,17 @@
broken nil check
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -1138,17 +1138,17 @@
broken oddness check
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -1156,17 +1156,17 @@
misplaced nil check
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -1174,17 +1174,17 @@
misplaced null check
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -1192,17 +1192,17 @@
goto statement
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 30
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 30
+ mn
@@ -1210,17 +1210,17 @@
goto statement
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 30
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 30
+ mn
@@ -1228,17 +1228,17 @@
constant if expression
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn
@@ -1246,17 +1246,17 @@
constant conditional operator
remediationFunction
- linear
+ CONSTANT_ISSUE
remediationFactor
- 10
- mn
+ 0.0
+ d
offset
- 0.0
- d
+ 10
+ mn