Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThanh Liem PHAN2016-12-09 14:39:24 +0000
committerGerrit Code Review @ Eclipse.org2017-02-09 16:20:06 +0000
commit5d8412473b5630ff3a1b7c52ade8daf4bbe534c1 (patch)
treebfd5044bc2b4050b8a8ca1fb11dbed20d3d7dc9f
parentae489bf2993c5ebb58a5f1ca12b255f83191a376 (diff)
downloadorg.eclipse.papyrus-5d8412473b5630ff3a1b7c52ade8daf4bbe534c1.tar.gz
org.eclipse.papyrus-5d8412473b5630ff3a1b7c52ade8daf4bbe534c1.tar.xz
org.eclipse.papyrus-5d8412473b5630ff3a1b7c52ade8daf4bbe534c1.zip
Bug 499466: [Table] Table Fill action ignore number prefixed by 000.
https://bugs.eclipse.org/bugs/show_bug.cgi?id=499466 - Handle the fill action for string value such as "001_Class", "Class_0001" and "001_Class_0001" - Format the number string correctly according to the length of its real value - Add unit tests for string with beginning number, with ending number or string surrounded by both beginning and ending number Change-Id: Ia2cd8bb3b393c921d10e6817598e7d237ce4b72e Signed-off-by: Thanh Liem PHAN <thanhliem.phan@all4tec.net>
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/fillhandle/action/PapyrusFillHandleDragMode.java17
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/fillhandle/command/PapyrusFillHandlePasteCommandHandler.java50
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/fillhandle/utils/PapyrusFillHandleUtils.java119
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test.di2
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test.notation80
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test.uml28
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test_Initial.txt13
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test_ResultCopy.txt13
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test_ResultDecrementDown.txt13
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test_ResultDecrementUp.txt13
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test_ResultIncrementDown.txt13
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test_ResultIncrementUp.txt13
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test.di2
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test.notation80
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test.uml28
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test_Initial.txt13
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test_ResultCopy.txt13
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test_ResultDecrementDown.txt13
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test_ResultDecrementUp.txt13
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test_ResultIncrementDown.txt13
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test_ResultIncrementUp.txt13
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test.di2
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test.notation80
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test.uml28
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test_Initial.txt13
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test_ResultCopy.txt13
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test_ResultDecrementDown.txt13
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test_ResultDecrementUp.txt13
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test_ResultIncrementDown.txt13
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test_ResultIncrementUp.txt13
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test.di2
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test.notation80
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test.uml28
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test_Initial.txt13
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test_ResultCopy.txt13
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test_ResultDecrementDown.txt13
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test_ResultDecrementUp.txt13
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test_ResultIncrementDown.txt13
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test_ResultIncrementUp.txt13
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test.java127
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test.java127
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test.java127
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test.java127
-rw-r--r--tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/AllTests.java14
44 files changed, 1391 insertions, 69 deletions
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/fillhandle/action/PapyrusFillHandleDragMode.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/fillhandle/action/PapyrusFillHandleDragMode.java
index 9ece24e2d81..f0fb0ce3849 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/fillhandle/action/PapyrusFillHandleDragMode.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/fillhandle/action/PapyrusFillHandleDragMode.java
@@ -157,7 +157,7 @@ public class PapyrusFillHandleDragMode extends FillHandleDragMode {
boolean result = false;
createDoubleSeriesMenu = false;
- String templateString = null;
+ String templateString = ""; //$NON-NLS-1$
if (null != this.clipboard && null != this.clipboard.getCopiedCells()) {
final ILayerCell[][] copiedCells = this.clipboard.getCopiedCells();
@@ -175,18 +175,19 @@ public class PapyrusFillHandleDragMode extends FillHandleDragMode {
type = cell.getDataValue().getClass();
if (String.class.isAssignableFrom(type)) {
final String stringValue = (String) cell.getDataValue();
- final String currentTemplateString = PapyrusFillHandleUtils.getTemplateString(stringValue);
- templateString = currentTemplateString;
+ final String templateStringWithoutBeginningNumber = PapyrusFillHandleUtils.getTemplateWithoutBeginningNumber(stringValue);
+ final String templateStringWithoutEndingNumber = PapyrusFillHandleUtils.getTemplateWithoutEndingNumber(stringValue);
- final String number = stringValue.replace(currentTemplateString, "");
+ final String beginningNumberString = stringValue.replace(templateStringWithoutBeginningNumber, ""); //$NON-NLS-1$
+ final String endingNumberString = stringValue.replace(templateStringWithoutEndingNumber, ""); //$NON-NLS-1$
// Calculate if the 'increment' and 'decrement' menu must be displayed
// and calculate if the double series menu must be displayed
- // (increment the beginning of the ending of a string)
- if (!number.isEmpty()) {
- final boolean isBeginningByNumber = PapyrusFillHandleUtils.isBeginningByNumber(stringValue, templateString);
- final boolean isEndingByNumber = PapyrusFillHandleUtils.isEndingBNumber(stringValue, templateString);
+ // (increment/decrement the beginning or the ending of a string)
+ if (!beginningNumberString.isEmpty() || !endingNumberString.isEmpty()) {
+ final boolean isBeginningByNumber = PapyrusFillHandleUtils.isBeginningByNumber(stringValue, beginningNumberString);
+ final boolean isEndingByNumber = PapyrusFillHandleUtils.isEndingByNumber(stringValue, endingNumberString);
createDoubleSeriesMenu = isBeginningByNumber && isEndingByNumber;
} else {
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/fillhandle/command/PapyrusFillHandlePasteCommandHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/fillhandle/command/PapyrusFillHandlePasteCommandHandler.java
index 23911a8f8b4..df1ad4ee74b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/fillhandle/command/PapyrusFillHandlePasteCommandHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/fillhandle/command/PapyrusFillHandlePasteCommandHandler.java
@@ -107,25 +107,46 @@ public class PapyrusFillHandlePasteCommandHandler extends FillHandlePasteCommand
if (value instanceof String && FillHandleOperation.SERIES.equals(command.operation)) {
final String stringValue = (String) value;
result = stringValue;
- String templateString = PapyrusFillHandleUtils.getTemplateString(stringValue);
+ String templateString = ""; //$NON-NLS-1$
+ String numberString = ""; //$NON-NLS-1$
- boolean isBeginningByNumber = PapyrusFillHandleUtils.isBeginningByNumber(stringValue, templateString);
- boolean isEndingByNumber = PapyrusFillHandleUtils.isEndingBNumber(stringValue, templateString);
+ final String templateStringWithoutBeginningNumber = PapyrusFillHandleUtils.getTemplateWithoutBeginningNumber(stringValue);
+ final String templateStringWithoutEndingNumber = PapyrusFillHandleUtils.getTemplateWithoutEndingNumber(stringValue);
+ final String beginningNumberString = stringValue.replace(templateStringWithoutBeginningNumber, ""); //$NON-NLS-1$
+ final String endingNumberString = stringValue.replace(templateStringWithoutEndingNumber, ""); //$NON-NLS-1$
+
+ boolean isBeginningByNumber = PapyrusFillHandleUtils.isBeginningByNumber(stringValue, beginningNumberString);
+ boolean isEndingByNumber = PapyrusFillHandleUtils.isEndingByNumber(stringValue, endingNumberString);
+
+ // If string value is both prefixed and suffixed by numbers
if (isBeginningByNumber && isEndingByNumber) {
+ // Redefine its value based on the prefix of the command
isBeginningByNumber = ((PapyrusFillHandlePasteCommand) command).isPrefix();
isEndingByNumber = !isBeginningByNumber;
if (isBeginningByNumber) {
templateString = PapyrusFillHandleUtils.getTemplateWithoutBeginningNumber(stringValue);
+ numberString = beginningNumberString;
} else {
templateString = PapyrusFillHandleUtils.getTemplateWithoutEndingNumber(stringValue);
+ numberString = endingNumberString;
}
}
- final String number = stringValue.replace(templateString, ""); //$NON-NLS-1$
+ // If string value is prefixed or suffixed, the template string and the number string are still empty
+ // Calculate them according to the prefix or the suffix
+ if (templateString.isEmpty() && numberString.isEmpty()) {
+ if (isBeginningByNumber) {
+ templateString = PapyrusFillHandleUtils.getTemplateWithoutBeginningNumber(stringValue);
+ numberString = beginningNumberString;
+ } else {
+ templateString = PapyrusFillHandleUtils.getTemplateWithoutEndingNumber(stringValue);
+ numberString = endingNumberString;
+ }
+ }
- if (!number.isEmpty()) {
- final int intValue = Integer.parseInt(number);
+ if (!numberString.isEmpty()) {
+ final int intValue = Integer.parseInt(numberString);
Object diff = 0;
if (MoveDirectionEnum.LEFT == command.direction || MoveDirectionEnum.RIGHT == command.direction) {
@@ -143,21 +164,24 @@ public class PapyrusFillHandlePasteCommandHandler extends FillHandlePasteCommand
newValue = intValue - ((Integer) diff);
}
+ final String numDigitsFormat = PapyrusFillHandleUtils.getZeroLeadingFormatString(numberString.length(), newValue);
+ final String newValueString = String.format(numDigitsFormat, newValue);
+
if (isBeginningByNumber) {
- result = newValue + templateString;
+ result = newValueString + templateString;
} else if (isEndingByNumber) {
- result = templateString + newValue;
+ result = templateString + newValueString;
}
}
}
}
}
boolean isEditable = EditUtils.isCellEditable(
- this.selectionLayer,
- command.configRegistry,
- new PositionCoordinate(this.selectionLayer,
- cell.getColumnIndex(),
- cell.getRowIndex()));
+ this.selectionLayer,
+ command.configRegistry,
+ new PositionCoordinate(this.selectionLayer,
+ cell.getColumnIndex(),
+ cell.getRowIndex()));
return !isEditable || null != result ? result : super.getPasteValue(cell, command, toColumn, toRow);
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/fillhandle/utils/PapyrusFillHandleUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/fillhandle/utils/PapyrusFillHandleUtils.java
index 18540580e05..03f0aebe6b2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/fillhandle/utils/PapyrusFillHandleUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/fillhandle/utils/PapyrusFillHandleUtils.java
@@ -17,106 +17,135 @@ package org.eclipse.papyrus.infra.nattable.fillhandle.utils;
* The papyrus fill handle utils.
*/
public class PapyrusFillHandleUtils {
-
+
/**
* The negative char.
*/
private static String NEGATIVE_CHAR = "-"; //$NON-NLS-1$
-
+
/**
* Get the template string from a string (without beginning and ending number).
*
- * @param initialString The initial string.
+ * @param initialString
+ * The initial string.
* @return The modified string (without beginning and ending number).
*/
- public static String getTemplateString(final String initialString){
+ public static String getTemplateString(final String initialString) {
return getTemplateWithoutEndingNumber(getTemplateWithoutBeginningNumber(initialString));
}
-
+
/**
* Get the template string from a string (without beginning number).
*
- * @param initialString The initial string.
+ * @param initialString
+ * The initial string.
* @return The modified string (without beginning number).
*/
- public static String getTemplateWithoutBeginningNumber(final String initialString){
+ public static String getTemplateWithoutBeginningNumber(final String initialString) {
String result = initialString;
-
+
// The number must be a negative number
- try{
- if(2 <= result.length() && NEGATIVE_CHAR.equals(result.substring(0, 1))){
+ try {
+ if (2 <= result.length() && NEGATIVE_CHAR.equals(result.substring(0, 1))) {
Integer.parseInt(result.substring(1, 2));
result = result.substring(2);
}
- }catch(Exception e){
+ } catch (Exception e) {
// Continue
}
-
+
// Try to remove beginning number
- try{
- while(!result.isEmpty()){
+ try {
+ while (!result.isEmpty()) {
final String firstChar = result.substring(0, 1);
Integer.parseInt(firstChar);
result = result.substring(1);
}
- }catch(Exception e){
+ } catch (Exception e) {
// Continue
}
-
+
return result;
}
-
+
/**
* Get the template string from a string (without ending number).
*
- * @param initialString The initial string.
+ * @param initialString
+ * The initial string.
* @return The modified string (without ending number).
*/
- public static String getTemplateWithoutEndingNumber(final String initialString){
+ public static String getTemplateWithoutEndingNumber(final String initialString) {
String result = initialString;
-
+
boolean hasNumber = false;
-
+
// Try to remove ending number
- try{
- while(!result.isEmpty()){
- final String lastChar = result.substring(result.length()-1);
+ try {
+ while (!result.isEmpty()) {
+ final String lastChar = result.substring(result.length() - 1);
Integer.parseInt(lastChar);
hasNumber = true;
- result = result.substring(0, result.length()-1);
+ result = result.substring(0, result.length() - 1);
}
- }catch(Exception e){
+ } catch (Exception e) {
// Continue
}
-
+
// If a number is found, check if this is not a negative number
- if(hasNumber && NEGATIVE_CHAR.equals(result.substring(result.length()-1))){
- result = result.substring(0, result.length()-1);
+ if (hasNumber && NEGATIVE_CHAR.equals(result.substring(result.length() - 1))) {
+ result = result.substring(0, result.length() - 1);
}
-
+
return result;
}
-
+
+ /**
+ * Check if a string is starting with the number string.
+ *
+ * @param initialString
+ * The initial string to check
+ * @param numberString
+ * The number string
+ * @return <code>true</code> if the initial string starts with the number string, <code>false</code> otherwise
+ */
+ public static boolean isBeginningByNumber(final String initialString, final String numberString) {
+ return !numberString.isEmpty() && initialString.startsWith(numberString);
+ }
+
/**
- * Check if a string is starting with the template string.
+ * Check if a string is ending with the number string.
*
- * @param initialString The initial string to check.
- * @param templateString The template string.
- * @return <code>true</code> if the initial string starts with template string, <code>false</code> otherwise.
+ * @param initialString
+ * The initial string to check
+ * @param numberString
+ * The number string
+ * @return <code>true</code> if the initial string ends with the number string, <code>false</code> otherwise
*/
- public static boolean isBeginningByNumber(final String initialString, final String templateString){
- return !templateString.isEmpty() && !initialString.startsWith(templateString);
+ public static boolean isEndingByNumber(final String initialString, final String numberString) {
+ return !numberString.isEmpty() && initialString.endsWith(numberString);
}
-
+
/**
- * Check if a string is ending with the template string.
+ * Create the string format for zero leading number.
+ * For instance, if the number of digits is equal to 5, the format string becomes %05d
+ * which specifies an integer with a width of 5 printing leading zeroes.
*
- * @param initialString The initial string to check.
- * @param templateString The template string.
- * @return <code>true</code> if the initial string ends with template string, <code>false</code> otherwise.
+ * @param numDigits
+ * The number of digits to display
+ * @return The created string format
*/
- public static boolean isEndingBNumber(final String initialString, final String templateString){
- return templateString.isEmpty() || !initialString.endsWith(templateString);
+ public static String getZeroLeadingFormatString(final int numDigits, final int numValue) {
+
+ // If the number value is a negative integer, increase the number of digits by 1
+ // which is used for the minus sign
+ int currentNumDigits = numValue >= 0 ? numDigits : numDigits + 1;
+
+ // Meaning of the string format
+ // %% --> %
+ // 0 --> 0
+ // %d --> <value of numDigits>
+ // d --> d
+ return String.format("%%0%dd", currentNumDigits);
}
-
}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test.notation
new file mode 100644
index 00000000000..123216d9456
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test.notation
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider" xmi:id="_0tdPAHcSEeSOKsM2DkqZ0A" name="ClassTreeTable" currentRowAxisProvider="_0tdPA3cSEeSOKsM2DkqZ0A" currentColumnAxisProvider="_0tdPAXcSEeSOKsM2DkqZ0A">
+ <context xmi:type="uml:Model" href="FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>
+ <owner xmi:type="uml:Model" href="FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>
+ <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+ <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+ <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_0tdPAXcSEeSOKsM2DkqZ0A" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+ <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+ </axis>
+ </columnAxisProvidersHistory>
+ <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_0tdPA3cSEeSOKsM2DkqZ0A" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+ <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_yZauQHl4EeWqi9yWvPfrQQ" indexStyle="NUMERIC">
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_SBJNUHmiEeWJ7-W-e5W1og" pasteConfiguration="_SBJNWnmiEeWJ7-W-e5W1og" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+ <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_SBJNUXmiEeWJ7-W-e5W1og" alias="Class">
+ <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+ </axisUsedAsAxisProvider>
+ <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_SBJNUnmiEeWJ7-W-e5W1og" pasteConfiguration="_SBJNW3miEeWJ7-W-e5W1og" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+ <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_SBJNU3miEeWJ7-W-e5W1og" alias="">
+ <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+ </axisUsedAsAxisProvider>
+ <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_SBJNVHmiEeWJ7-W-e5W1og" pasteConfiguration="_SBJNXHmiEeWJ7-W-e5W1og" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+ <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_SBJNVXmiEeWJ7-W-e5W1og" alias="">
+ <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+ </axisUsedAsAxisProvider>
+ <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_SBJNVnmiEeWJ7-W-e5W1og" pasteConfiguration="_SBJNXXmiEeWJ7-W-e5W1og" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+ <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_SBJNV3miEeWJ7-W-e5W1og" alias="">
+ <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+ </axisUsedAsAxisProvider>
+ <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_SBJNWHmiEeWJ7-W-e5W1og" pasteConfiguration="_SBJNXnmiEeWJ7-W-e5W1og" depth="2" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+ <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_SBJNWXmiEeWJ7-W-e5W1og" alias="">
+ <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+ </axisUsedAsAxisProvider>
+ <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_SBJNWnmiEeWJ7-W-e5W1og" pastedElementId="org.eclipse.papyrus.uml.Class">
+ <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+ <axisIdentifier xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_H1ZVkHmjEeWJ7-W-e5W1og">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+ </axisIdentifier>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_SBJNW3miEeWJ7-W-e5W1og" pastedElementId="org.eclipse.papyrus.uml.Property">
+ <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_SBJNXHmiEeWJ7-W-e5W1og" pastedElementId="org.eclipse.papyrus.uml.Class">
+ <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_SBJNXXmiEeWJ7-W-e5W1og" pastedElementId="org.eclipse.papyrus.uml.Operation">
+ <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_SBJNXnmiEeWJ7-W-e5W1og" pastedElementId="org.eclipse.papyrus.uml.Parameter">
+ <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+ </ownedAxisConfigurations>
+ <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_SBHYIHmiEeWJ7-W-e5W1og" localSpecificConfigurations="_SBJNUHmiEeWJ7-W-e5W1og _SBJNUnmiEeWJ7-W-e5W1og _SBJNVHmiEeWJ7-W-e5W1og _SBJNVnmiEeWJ7-W-e5W1og _SBJNWHmiEeWJ7-W-e5W1og">
+ <axisManager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ </axisManagerConfigurations>
+ </localRowHeaderAxisConfiguration>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test.uml
new file mode 100644
index 00000000000..5280fef9e02
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test.uml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_W0BLkGZzEeSDCaDFwPGYVw" name="model">
+ <packagedElement xmi:type="uml:Class" xmi:id="_ANxf4GX6EeWnIND9h9eQPg" name="0Class">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_AN0jMGX6EeWnIND9h9eQPg" name="000_Property0_00" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_AN738GX6EeWnIND9h9eQPg" name="111_Property0_11" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_AN-7QGX6EeWnIND9h9eQPg" name="222_Property0_22" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_4lRfQL37EeaxRN7PnLP-3A" name="333_Property0_33" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_43xkgL37EeaxRN7PnLP-3A" name="444_Property0_44" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_4-DLoL37EeaxRN7PnLP-3A" name="555_Property0_55" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_5KkksL37EeaxRN7PnLP-3A" name="666_Property0_66" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_5PC1AL37EeaxRN7PnLP-3A" name="777_Property0_77" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_5TIDwL37EeaxRN7PnLP-3A" name="888_Property0_88" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_HWWG4L38EeaxRN7PnLP-3A" name="999_Property0_99" visibility="protected" isLeaf="true"/>
+ </packagedElement>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_VhVUAMT4EeWRgPxoFzdn1A">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_vI-ckMT4EeWRgPxoFzdn1A" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vI-ckcT4EeWRgPxoFzdn1A" key="Version" value="0.0.1"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vI-cksT4EeWRgPxoFzdn1A" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vI-ck8T4EeWRgPxoFzdn1A" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vI-clMT4EeWRgPxoFzdn1A" key="Date" value="2016-01-27"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vI-clcT4EeWRgPxoFzdn1A" key="Author" value=""/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VhWiIMT4EeWRgPxoFzdn1A" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="FillHandleProfile.di.profile.uml#_t8whEcT4EeWRgPxoFzdn1A"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="FillHandleProfile.di.profile.uml#_o8C1sMT3EeWRgPxoFzdn1A"/>
+ </profileApplication>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test_Initial.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test_Initial.txt
new file mode 100644
index 00000000000..bdbbc374895
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test_Initial.txt
@@ -0,0 +1,13 @@
+
+0Class public false N/A
+
+000_Property0_00 protected true N/A
+111_Property0_11 protected true N/A
+222_Property0_22 protected true N/A
+333_Property0_33 protected true N/A
+444_Property0_44 protected true N/A
+555_Property0_55 protected true N/A
+666_Property0_66 protected true N/A
+777_Property0_77 protected true N/A
+888_Property0_88 protected true N/A
+999_Property0_99 protected true N/A \ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test_ResultCopy.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test_ResultCopy.txt
new file mode 100644
index 00000000000..a2aef550179
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test_ResultCopy.txt
@@ -0,0 +1,13 @@
+
+0Class public false N/A
+
+000_Property0_00 protected true N/A
+000_Property0_00 protected true N/A
+000_Property0_00 protected true N/A
+000_Property0_00 protected true N/A
+000_Property0_00 protected true N/A
+000_Property0_00 protected true N/A
+000_Property0_00 protected true N/A
+000_Property0_00 protected true N/A
+000_Property0_00 protected true N/A
+000_Property0_00 protected true N/A \ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test_ResultDecrementDown.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test_ResultDecrementDown.txt
new file mode 100644
index 00000000000..0e068555019
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test_ResultDecrementDown.txt
@@ -0,0 +1,13 @@
+
+0Class public false N/A
+
+000_Property0_00 protected true N/A
+-001_Property0_00 protected true N/A
+-002_Property0_00 protected true N/A
+-003_Property0_00 protected true N/A
+-004_Property0_00 protected true N/A
+-005_Property0_00 protected true N/A
+-006_Property0_00 protected true N/A
+-007_Property0_00 protected true N/A
+-008_Property0_00 protected true N/A
+-009_Property0_00 protected true N/A \ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test_ResultDecrementUp.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test_ResultDecrementUp.txt
new file mode 100644
index 00000000000..33d5ade6364
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test_ResultDecrementUp.txt
@@ -0,0 +1,13 @@
+
+0Class public false N/A
+
+990_Property0_99 protected true N/A
+991_Property0_99 protected true N/A
+992_Property0_99 protected true N/A
+993_Property0_99 protected true N/A
+994_Property0_99 protected true N/A
+995_Property0_99 protected true N/A
+996_Property0_99 protected true N/A
+997_Property0_99 protected true N/A
+998_Property0_99 protected true N/A
+999_Property0_99 protected true N/A \ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test_ResultIncrementDown.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test_ResultIncrementDown.txt
new file mode 100644
index 00000000000..ddc81740009
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test_ResultIncrementDown.txt
@@ -0,0 +1,13 @@
+
+0Class public false N/A
+
+000_Property0_00 protected true N/A
+001_Property0_00 protected true N/A
+002_Property0_00 protected true N/A
+003_Property0_00 protected true N/A
+004_Property0_00 protected true N/A
+005_Property0_00 protected true N/A
+006_Property0_00 protected true N/A
+007_Property0_00 protected true N/A
+008_Property0_00 protected true N/A
+009_Property0_00 protected true N/A \ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test_ResultIncrementUp.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test_ResultIncrementUp.txt
new file mode 100644
index 00000000000..ad99101bd17
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test_ResultIncrementUp.txt
@@ -0,0 +1,13 @@
+
+0Class public false N/A
+
+1008_Property0_99 protected true N/A
+1007_Property0_99 protected true N/A
+1006_Property0_99 protected true N/A
+1005_Property0_99 protected true N/A
+1004_Property0_99 protected true N/A
+1003_Property0_99 protected true N/A
+1002_Property0_99 protected true N/A
+1001_Property0_99 protected true N/A
+1000_Property0_99 protected true N/A
+999_Property0_99 protected true N/A \ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test.notation
new file mode 100644
index 00000000000..f86d0a819b0
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test.notation
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider" xmi:id="_0tdPAHcSEeSOKsM2DkqZ0A" name="ClassTreeTable" currentRowAxisProvider="_0tdPA3cSEeSOKsM2DkqZ0A" currentColumnAxisProvider="_0tdPAXcSEeSOKsM2DkqZ0A">
+ <context xmi:type="uml:Model" href="FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>
+ <owner xmi:type="uml:Model" href="FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>
+ <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+ <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+ <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_0tdPAXcSEeSOKsM2DkqZ0A" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+ <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+ </axis>
+ </columnAxisProvidersHistory>
+ <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_0tdPA3cSEeSOKsM2DkqZ0A" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+ <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_yZauQHl4EeWqi9yWvPfrQQ" indexStyle="NUMERIC">
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_SBJNUHmiEeWJ7-W-e5W1og" pasteConfiguration="_SBJNWnmiEeWJ7-W-e5W1og" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+ <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_SBJNUXmiEeWJ7-W-e5W1og" alias="Class">
+ <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+ </axisUsedAsAxisProvider>
+ <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_SBJNUnmiEeWJ7-W-e5W1og" pasteConfiguration="_SBJNW3miEeWJ7-W-e5W1og" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+ <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_SBJNU3miEeWJ7-W-e5W1og" alias="">
+ <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+ </axisUsedAsAxisProvider>
+ <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_SBJNVHmiEeWJ7-W-e5W1og" pasteConfiguration="_SBJNXHmiEeWJ7-W-e5W1og" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+ <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_SBJNVXmiEeWJ7-W-e5W1og" alias="">
+ <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+ </axisUsedAsAxisProvider>
+ <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_SBJNVnmiEeWJ7-W-e5W1og" pasteConfiguration="_SBJNXXmiEeWJ7-W-e5W1og" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+ <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_SBJNV3miEeWJ7-W-e5W1og" alias="">
+ <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+ </axisUsedAsAxisProvider>
+ <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_SBJNWHmiEeWJ7-W-e5W1og" pasteConfiguration="_SBJNXnmiEeWJ7-W-e5W1og" depth="2" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+ <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_SBJNWXmiEeWJ7-W-e5W1og" alias="">
+ <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+ </axisUsedAsAxisProvider>
+ <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_SBJNWnmiEeWJ7-W-e5W1og" pastedElementId="org.eclipse.papyrus.uml.Class">
+ <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+ <axisIdentifier xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_H1ZVkHmjEeWJ7-W-e5W1og">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+ </axisIdentifier>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_SBJNW3miEeWJ7-W-e5W1og" pastedElementId="org.eclipse.papyrus.uml.Property">
+ <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_SBJNXHmiEeWJ7-W-e5W1og" pastedElementId="org.eclipse.papyrus.uml.Class">
+ <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_SBJNXXmiEeWJ7-W-e5W1og" pastedElementId="org.eclipse.papyrus.uml.Operation">
+ <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_SBJNXnmiEeWJ7-W-e5W1og" pastedElementId="org.eclipse.papyrus.uml.Parameter">
+ <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+ </ownedAxisConfigurations>
+ <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_SBHYIHmiEeWJ7-W-e5W1og" localSpecificConfigurations="_SBJNUHmiEeWJ7-W-e5W1og _SBJNUnmiEeWJ7-W-e5W1og _SBJNVHmiEeWJ7-W-e5W1og _SBJNVnmiEeWJ7-W-e5W1og _SBJNWHmiEeWJ7-W-e5W1og">
+ <axisManager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ </axisManagerConfigurations>
+ </localRowHeaderAxisConfiguration>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test.uml
new file mode 100644
index 00000000000..22eafa7cde0
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test.uml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_W0BLkGZzEeSDCaDFwPGYVw" name="model">
+ <packagedElement xmi:type="uml:Class" xmi:id="_ANxf4GX6EeWnIND9h9eQPg" name="0Class">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_AN0jMGX6EeWnIND9h9eQPg" name="0000_Property0_000000" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_AN738GX6EeWnIND9h9eQPg" name="1111_Property0_111111" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_AN-7QGX6EeWnIND9h9eQPg" name="2222_Property0_222222" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_4lRfQL37EeaxRN7PnLP-3A" name="3333_Property0_333333" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_43xkgL37EeaxRN7PnLP-3A" name="4444_Property0_444444" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_4-DLoL37EeaxRN7PnLP-3A" name="5555_Property0_555555" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_5KkksL37EeaxRN7PnLP-3A" name="6666_Property0_666666" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_5PC1AL37EeaxRN7PnLP-3A" name="7777_Property0_777777" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_5TIDwL37EeaxRN7PnLP-3A" name="8888_Property0_888888" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_HWWG4L38EeaxRN7PnLP-3A" name="9999_Property0_999999" visibility="protected" isLeaf="true"/>
+ </packagedElement>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_VhVUAMT4EeWRgPxoFzdn1A">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_vI-ckMT4EeWRgPxoFzdn1A" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vI-ckcT4EeWRgPxoFzdn1A" key="Version" value="0.0.1"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vI-cksT4EeWRgPxoFzdn1A" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vI-ck8T4EeWRgPxoFzdn1A" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vI-clMT4EeWRgPxoFzdn1A" key="Date" value="2016-01-27"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vI-clcT4EeWRgPxoFzdn1A" key="Author" value=""/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VhWiIMT4EeWRgPxoFzdn1A" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="FillHandleProfile.di.profile.uml#_t8whEcT4EeWRgPxoFzdn1A"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="FillHandleProfile.di.profile.uml#_o8C1sMT3EeWRgPxoFzdn1A"/>
+ </profileApplication>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test_Initial.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test_Initial.txt
new file mode 100644
index 00000000000..5514ed0aec2
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test_Initial.txt
@@ -0,0 +1,13 @@
+
+0Class public false N/A
+
+0000_Property0_000000 protected true N/A
+1111_Property0_111111 protected true N/A
+2222_Property0_222222 protected true N/A
+3333_Property0_333333 protected true N/A
+4444_Property0_444444 protected true N/A
+5555_Property0_555555 protected true N/A
+6666_Property0_666666 protected true N/A
+7777_Property0_777777 protected true N/A
+8888_Property0_888888 protected true N/A
+9999_Property0_999999 protected true N/A \ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test_ResultCopy.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test_ResultCopy.txt
new file mode 100644
index 00000000000..d36f3b619de
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test_ResultCopy.txt
@@ -0,0 +1,13 @@
+
+0Class public false N/A
+
+0000_Property0_000000 protected true N/A
+0000_Property0_000000 protected true N/A
+0000_Property0_000000 protected true N/A
+0000_Property0_000000 protected true N/A
+0000_Property0_000000 protected true N/A
+0000_Property0_000000 protected true N/A
+0000_Property0_000000 protected true N/A
+0000_Property0_000000 protected true N/A
+0000_Property0_000000 protected true N/A
+0000_Property0_000000 protected true N/A \ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test_ResultDecrementDown.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test_ResultDecrementDown.txt
new file mode 100644
index 00000000000..d136cabc437
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test_ResultDecrementDown.txt
@@ -0,0 +1,13 @@
+
+0Class public false N/A
+
+0000_Property0_000000 protected true N/A
+0000_Property0_-000001 protected true N/A
+0000_Property0_-000002 protected true N/A
+0000_Property0_-000003 protected true N/A
+0000_Property0_-000004 protected true N/A
+0000_Property0_-000005 protected true N/A
+0000_Property0_-000006 protected true N/A
+0000_Property0_-000007 protected true N/A
+0000_Property0_-000008 protected true N/A
+0000_Property0_-000009 protected true N/A \ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test_ResultDecrementUp.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test_ResultDecrementUp.txt
new file mode 100644
index 00000000000..e35da1aa669
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test_ResultDecrementUp.txt
@@ -0,0 +1,13 @@
+
+0Class public false N/A
+
+9999_Property0_999990 protected true N/A
+9999_Property0_999991 protected true N/A
+9999_Property0_999992 protected true N/A
+9999_Property0_999993 protected true N/A
+9999_Property0_999994 protected true N/A
+9999_Property0_999995 protected true N/A
+9999_Property0_999996 protected true N/A
+9999_Property0_999997 protected true N/A
+9999_Property0_999998 protected true N/A
+9999_Property0_999999 protected true N/A \ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test_ResultIncrementDown.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test_ResultIncrementDown.txt
new file mode 100644
index 00000000000..af491b39944
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test_ResultIncrementDown.txt
@@ -0,0 +1,13 @@
+
+0Class public false N/A
+
+0000_Property0_000000 protected true N/A
+0000_Property0_000001 protected true N/A
+0000_Property0_000002 protected true N/A
+0000_Property0_000003 protected true N/A
+0000_Property0_000004 protected true N/A
+0000_Property0_000005 protected true N/A
+0000_Property0_000006 protected true N/A
+0000_Property0_000007 protected true N/A
+0000_Property0_000008 protected true N/A
+0000_Property0_000009 protected true N/A \ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test_ResultIncrementUp.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test_ResultIncrementUp.txt
new file mode 100644
index 00000000000..6f64d60dbf5
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test_ResultIncrementUp.txt
@@ -0,0 +1,13 @@
+
+0Class public false N/A
+
+9999_Property0_1000008 protected true N/A
+9999_Property0_1000007 protected true N/A
+9999_Property0_1000006 protected true N/A
+9999_Property0_1000005 protected true N/A
+9999_Property0_1000004 protected true N/A
+9999_Property0_1000003 protected true N/A
+9999_Property0_1000002 protected true N/A
+9999_Property0_1000001 protected true N/A
+9999_Property0_1000000 protected true N/A
+9999_Property0_999999 protected true N/A \ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test.notation
new file mode 100644
index 00000000000..2698781e424
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test.notation
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider" xmi:id="_0tdPAHcSEeSOKsM2DkqZ0A" name="ClassTreeTable" currentRowAxisProvider="_0tdPA3cSEeSOKsM2DkqZ0A" currentColumnAxisProvider="_0tdPAXcSEeSOKsM2DkqZ0A">
+ <context xmi:type="uml:Model" href="FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>
+ <owner xmi:type="uml:Model" href="FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>
+ <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+ <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+ <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_0tdPAXcSEeSOKsM2DkqZ0A" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+ <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+ </axis>
+ </columnAxisProvidersHistory>
+ <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_0tdPA3cSEeSOKsM2DkqZ0A" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+ <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_yZauQHl4EeWqi9yWvPfrQQ" indexStyle="NUMERIC">
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_SBJNUHmiEeWJ7-W-e5W1og" pasteConfiguration="_SBJNWnmiEeWJ7-W-e5W1og" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+ <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_SBJNUXmiEeWJ7-W-e5W1og" alias="Class">
+ <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+ </axisUsedAsAxisProvider>
+ <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_SBJNUnmiEeWJ7-W-e5W1og" pasteConfiguration="_SBJNW3miEeWJ7-W-e5W1og" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+ <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_SBJNU3miEeWJ7-W-e5W1og" alias="">
+ <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+ </axisUsedAsAxisProvider>
+ <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_SBJNVHmiEeWJ7-W-e5W1og" pasteConfiguration="_SBJNXHmiEeWJ7-W-e5W1og" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+ <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_SBJNVXmiEeWJ7-W-e5W1og" alias="">
+ <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+ </axisUsedAsAxisProvider>
+ <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_SBJNVnmiEeWJ7-W-e5W1og" pasteConfiguration="_SBJNXXmiEeWJ7-W-e5W1og" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+ <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_SBJNV3miEeWJ7-W-e5W1og" alias="">
+ <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+ </axisUsedAsAxisProvider>
+ <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_SBJNWHmiEeWJ7-W-e5W1og" pasteConfiguration="_SBJNXnmiEeWJ7-W-e5W1og" depth="2" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+ <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_SBJNWXmiEeWJ7-W-e5W1og" alias="">
+ <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+ </axisUsedAsAxisProvider>
+ <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_SBJNWnmiEeWJ7-W-e5W1og" pastedElementId="org.eclipse.papyrus.uml.Class">
+ <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+ <axisIdentifier xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_H1ZVkHmjEeWJ7-W-e5W1og">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+ </axisIdentifier>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_SBJNW3miEeWJ7-W-e5W1og" pastedElementId="org.eclipse.papyrus.uml.Property">
+ <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_SBJNXHmiEeWJ7-W-e5W1og" pastedElementId="org.eclipse.papyrus.uml.Class">
+ <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_SBJNXXmiEeWJ7-W-e5W1og" pastedElementId="org.eclipse.papyrus.uml.Operation">
+ <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_SBJNXnmiEeWJ7-W-e5W1og" pastedElementId="org.eclipse.papyrus.uml.Parameter">
+ <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+ </ownedAxisConfigurations>
+ <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_SBHYIHmiEeWJ7-W-e5W1og" localSpecificConfigurations="_SBJNUHmiEeWJ7-W-e5W1og _SBJNUnmiEeWJ7-W-e5W1og _SBJNVHmiEeWJ7-W-e5W1og _SBJNVnmiEeWJ7-W-e5W1og _SBJNWHmiEeWJ7-W-e5W1og">
+ <axisManager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ </axisManagerConfigurations>
+ </localRowHeaderAxisConfiguration>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test.uml
new file mode 100644
index 00000000000..673d6c668c9
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test.uml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_W0BLkGZzEeSDCaDFwPGYVw" name="model">
+ <packagedElement xmi:type="uml:Class" xmi:id="_ANxf4GX6EeWnIND9h9eQPg" name="0Class">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_AN0jMGX6EeWnIND9h9eQPg" name="00_Property" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_AN738GX6EeWnIND9h9eQPg" name="11_Property" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_AN-7QGX6EeWnIND9h9eQPg" name="22_Property" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_4lRfQL37EeaxRN7PnLP-3A" name="33_Property" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_43xkgL37EeaxRN7PnLP-3A" name="44_Property" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_4-DLoL37EeaxRN7PnLP-3A" name="55_Property" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_5KkksL37EeaxRN7PnLP-3A" name="66_Property" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_5PC1AL37EeaxRN7PnLP-3A" name="77_Property" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_5TIDwL37EeaxRN7PnLP-3A" name="88_Property" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_HWWG4L38EeaxRN7PnLP-3A" name="99_Property" visibility="protected" isLeaf="true"/>
+ </packagedElement>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_VhVUAMT4EeWRgPxoFzdn1A">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_vI-ckMT4EeWRgPxoFzdn1A" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vI-ckcT4EeWRgPxoFzdn1A" key="Version" value="0.0.1"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vI-cksT4EeWRgPxoFzdn1A" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vI-ck8T4EeWRgPxoFzdn1A" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vI-clMT4EeWRgPxoFzdn1A" key="Date" value="2016-01-27"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vI-clcT4EeWRgPxoFzdn1A" key="Author" value=""/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VhWiIMT4EeWRgPxoFzdn1A" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="FillHandleProfile.di.profile.uml#_t8whEcT4EeWRgPxoFzdn1A"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="FillHandleProfile.di.profile.uml#_o8C1sMT3EeWRgPxoFzdn1A"/>
+ </profileApplication>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test_Initial.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test_Initial.txt
new file mode 100644
index 00000000000..17a6ede93fb
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test_Initial.txt
@@ -0,0 +1,13 @@
+
+0Class public false N/A
+
+00_Property protected true N/A
+11_Property protected true N/A
+22_Property protected true N/A
+33_Property protected true N/A
+44_Property protected true N/A
+55_Property protected true N/A
+66_Property protected true N/A
+77_Property protected true N/A
+88_Property protected true N/A
+99_Property protected true N/A \ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test_ResultCopy.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test_ResultCopy.txt
new file mode 100644
index 00000000000..c757a34e871
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test_ResultCopy.txt
@@ -0,0 +1,13 @@
+
+0Class public false N/A
+
+00_Property protected true N/A
+00_Property protected true N/A
+00_Property protected true N/A
+00_Property protected true N/A
+00_Property protected true N/A
+00_Property protected true N/A
+00_Property protected true N/A
+00_Property protected true N/A
+00_Property protected true N/A
+00_Property protected true N/A \ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test_ResultDecrementDown.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test_ResultDecrementDown.txt
new file mode 100644
index 00000000000..ce464b42d7d
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test_ResultDecrementDown.txt
@@ -0,0 +1,13 @@
+
+0Class public false N/A
+
+00_Property protected true N/A
+-01_Property protected true N/A
+-02_Property protected true N/A
+-03_Property protected true N/A
+-04_Property protected true N/A
+-05_Property protected true N/A
+-06_Property protected true N/A
+-07_Property protected true N/A
+-08_Property protected true N/A
+-09_Property protected true N/A \ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test_ResultDecrementUp.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test_ResultDecrementUp.txt
new file mode 100644
index 00000000000..a0ccd28b43d
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test_ResultDecrementUp.txt
@@ -0,0 +1,13 @@
+
+0Class public false N/A
+
+90_Property protected true N/A
+91_Property protected true N/A
+92_Property protected true N/A
+93_Property protected true N/A
+94_Property protected true N/A
+95_Property protected true N/A
+96_Property protected true N/A
+97_Property protected true N/A
+98_Property protected true N/A
+99_Property protected true N/A \ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test_ResultIncrementDown.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test_ResultIncrementDown.txt
new file mode 100644
index 00000000000..447c8e32d21
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test_ResultIncrementDown.txt
@@ -0,0 +1,13 @@
+
+0Class public false N/A
+
+00_Property protected true N/A
+01_Property protected true N/A
+02_Property protected true N/A
+03_Property protected true N/A
+04_Property protected true N/A
+05_Property protected true N/A
+06_Property protected true N/A
+07_Property protected true N/A
+08_Property protected true N/A
+09_Property protected true N/A \ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test_ResultIncrementUp.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test_ResultIncrementUp.txt
new file mode 100644
index 00000000000..51dc89e9a4a
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test_ResultIncrementUp.txt
@@ -0,0 +1,13 @@
+
+0Class public false N/A
+
+108_Property protected true N/A
+107_Property protected true N/A
+106_Property protected true N/A
+105_Property protected true N/A
+104_Property protected true N/A
+103_Property protected true N/A
+102_Property protected true N/A
+101_Property protected true N/A
+100_Property protected true N/A
+99_Property protected true N/A \ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test.di b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test.di
new file mode 100644
index 00000000000..bf9abab340f
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test.notation b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test.notation
new file mode 100644
index 00000000000..937df904bbc
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test.notation
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider http://www.eclipse.org/papyrus/nattable/model#//nattablelabelprovider" xmi:id="_0tdPAHcSEeSOKsM2DkqZ0A" name="ClassTreeTable" currentRowAxisProvider="_0tdPA3cSEeSOKsM2DkqZ0A" currentColumnAxisProvider="_0tdPAXcSEeSOKsM2DkqZ0A">
+ <context xmi:type="uml:Model" href="FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>
+ <owner xmi:type="uml:Model" href="FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test.uml#_W0BLkGZzEeSDCaDFwPGYVw"/>
+ <prototype xmi:type="configuration:PapyrusSyncTable" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/classTreeTable.configuration#_P3J1cEr7EeSVGbM3cmVSqQ"/>
+ <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+ <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_0tdPAXcSEeSOKsM2DkqZ0A" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+ <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Yk1o8mZzEeSDCaDFwPGYVw">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9OSsHrxEeSFP8xW-pegcg">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wHrxEeSFP8xW-pegcg">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement/isLeaf"/>
+ </axis>
+ <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_c9O5wXrxEeSFP8xW-pegcg">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter/direction"/>
+ </axis>
+ </columnAxisProvidersHistory>
+ <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_0tdPA3cSEeSOKsM2DkqZ0A" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowaAxisManager" disconnectSlave="true"/>
+ <localRowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:LocalTableHeaderAxisConfiguration" xmi:id="_yZauQHl4EeWqi9yWvPfrQQ" indexStyle="NUMERIC">
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_SBJNUHmiEeWJ7-W-e5W1og" pasteConfiguration="_SBJNWnmiEeWJ7-W-e5W1og" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+ <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_SBJNUXmiEeWJ7-W-e5W1og" alias="Class">
+ <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+ </axisUsedAsAxisProvider>
+ <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_SBJNUnmiEeWJ7-W-e5W1og" pasteConfiguration="_SBJNW3miEeWJ7-W-e5W1og" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+ <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_SBJNU3miEeWJ7-W-e5W1og" alias="">
+ <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+ </axisUsedAsAxisProvider>
+ <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_SBJNVHmiEeWJ7-W-e5W1og" pasteConfiguration="_SBJNXHmiEeWJ7-W-e5W1og" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+ <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_SBJNVXmiEeWJ7-W-e5W1og" alias="">
+ <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+ </axisUsedAsAxisProvider>
+ <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_SBJNVnmiEeWJ7-W-e5W1og" pasteConfiguration="_SBJNXXmiEeWJ7-W-e5W1og" depth="1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+ <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_SBJNV3miEeWJ7-W-e5W1og" alias="">
+ <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+ </axisUsedAsAxisProvider>
+ <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_SBJNWHmiEeWJ7-W-e5W1og" pasteConfiguration="_SBJNXnmiEeWJ7-W-e5W1og" depth="2" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+ <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_SBJNWXmiEeWJ7-W-e5W1og" alias="">
+ <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+ </axisUsedAsAxisProvider>
+ <labelProvider xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_SBJNWnmiEeWJ7-W-e5W1og" pastedElementId="org.eclipse.papyrus.uml.Class">
+ <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+ <axisIdentifier xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_H1ZVkHmjEeWJ7-W-e5W1og">
+ <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+ <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+ </axisIdentifier>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_SBJNW3miEeWJ7-W-e5W1og" pastedElementId="org.eclipse.papyrus.uml.Property">
+ <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_SBJNXHmiEeWJ7-W-e5W1og" pastedElementId="org.eclipse.papyrus.uml.Class">
+ <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_SBJNXXmiEeWJ7-W-e5W1og" pastedElementId="org.eclipse.papyrus.uml.Operation">
+ <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/ownedOperation"/>
+ </ownedAxisConfigurations>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_SBJNXnmiEeWJ7-W-e5W1og" pastedElementId="org.eclipse.papyrus.uml.Parameter">
+ <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/ownedParameter"/>
+ </ownedAxisConfigurations>
+ <axisManagerConfigurations xmi:type="nattableaxisconfiguration:AxisManagerConfiguration" xmi:id="_SBHYIHmiEeWJ7-W-e5W1og" localSpecificConfigurations="_SBJNUHmiEeWJ7-W-e5W1og _SBJNUnmiEeWJ7-W-e5W1og _SBJNVHmiEeWJ7-W-e5W1og _SBJNVnmiEeWJ7-W-e5W1og _SBJNWHmiEeWJ7-W-e5W1og">
+ <axisManager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+ </axisManagerConfigurations>
+ </localRowHeaderAxisConfiguration>
+</nattable:Table>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test.uml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test.uml
new file mode 100644
index 00000000000..0573444fe81
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test.uml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_W0BLkGZzEeSDCaDFwPGYVw" name="model">
+ <packagedElement xmi:type="uml:Class" xmi:id="_ANxf4GX6EeWnIND9h9eQPg" name="0Class">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_AN0jMGX6EeWnIND9h9eQPg" name="Property0_00" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_AN738GX6EeWnIND9h9eQPg" name="Property0_11" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_AN-7QGX6EeWnIND9h9eQPg" name="Property0_22" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_4lRfQL37EeaxRN7PnLP-3A" name="Property0_33" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_43xkgL37EeaxRN7PnLP-3A" name="Property0_44" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_4-DLoL37EeaxRN7PnLP-3A" name="Property0_55" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_5KkksL37EeaxRN7PnLP-3A" name="Property0_66" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_5PC1AL37EeaxRN7PnLP-3A" name="Property0_77" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_5TIDwL37EeaxRN7PnLP-3A" name="Property0_88" visibility="protected" isLeaf="true"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_HWWG4L38EeaxRN7PnLP-3A" name="Property0_99" visibility="protected" isLeaf="true"/>
+ </packagedElement>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_VhVUAMT4EeWRgPxoFzdn1A">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_vI-ckMT4EeWRgPxoFzdn1A" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vI-ckcT4EeWRgPxoFzdn1A" key="Version" value="0.0.1"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vI-cksT4EeWRgPxoFzdn1A" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vI-ck8T4EeWRgPxoFzdn1A" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vI-clMT4EeWRgPxoFzdn1A" key="Date" value="2016-01-27"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vI-clcT4EeWRgPxoFzdn1A" key="Author" value=""/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VhWiIMT4EeWRgPxoFzdn1A" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="FillHandleProfile.di.profile.uml#_t8whEcT4EeWRgPxoFzdn1A"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="FillHandleProfile.di.profile.uml#_o8C1sMT3EeWRgPxoFzdn1A"/>
+ </profileApplication>
+</uml:Model>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test_Initial.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test_Initial.txt
new file mode 100644
index 00000000000..98c089acf4b
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test_Initial.txt
@@ -0,0 +1,13 @@
+
+0Class public false N/A
+
+Property0_00 protected true N/A
+Property0_11 protected true N/A
+Property0_22 protected true N/A
+Property0_33 protected true N/A
+Property0_44 protected true N/A
+Property0_55 protected true N/A
+Property0_66 protected true N/A
+Property0_77 protected true N/A
+Property0_88 protected true N/A
+Property0_99 protected true N/A \ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test_ResultCopy.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test_ResultCopy.txt
new file mode 100644
index 00000000000..ccd4b8695ea
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test_ResultCopy.txt
@@ -0,0 +1,13 @@
+
+0Class public false N/A
+
+Property0_00 protected true N/A
+Property0_00 protected true N/A
+Property0_00 protected true N/A
+Property0_00 protected true N/A
+Property0_00 protected true N/A
+Property0_00 protected true N/A
+Property0_00 protected true N/A
+Property0_00 protected true N/A
+Property0_00 protected true N/A
+Property0_00 protected true N/A \ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test_ResultDecrementDown.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test_ResultDecrementDown.txt
new file mode 100644
index 00000000000..5f03101dd00
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test_ResultDecrementDown.txt
@@ -0,0 +1,13 @@
+
+0Class public false N/A
+
+Property0_00 protected true N/A
+Property0_-01 protected true N/A
+Property0_-02 protected true N/A
+Property0_-03 protected true N/A
+Property0_-04 protected true N/A
+Property0_-05 protected true N/A
+Property0_-06 protected true N/A
+Property0_-07 protected true N/A
+Property0_-08 protected true N/A
+Property0_-09 protected true N/A \ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test_ResultDecrementUp.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test_ResultDecrementUp.txt
new file mode 100644
index 00000000000..7fb02875456
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test_ResultDecrementUp.txt
@@ -0,0 +1,13 @@
+
+0Class public false N/A
+
+Property0_90 protected true N/A
+Property0_91 protected true N/A
+Property0_92 protected true N/A
+Property0_93 protected true N/A
+Property0_94 protected true N/A
+Property0_95 protected true N/A
+Property0_96 protected true N/A
+Property0_97 protected true N/A
+Property0_98 protected true N/A
+Property0_99 protected true N/A \ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test_ResultIncrementDown.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test_ResultIncrementDown.txt
new file mode 100644
index 00000000000..1fcdac42010
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test_ResultIncrementDown.txt
@@ -0,0 +1,13 @@
+
+0Class public false N/A
+
+Property0_00 protected true N/A
+Property0_01 protected true N/A
+Property0_02 protected true N/A
+Property0_03 protected true N/A
+Property0_04 protected true N/A
+Property0_05 protected true N/A
+Property0_06 protected true N/A
+Property0_07 protected true N/A
+Property0_08 protected true N/A
+Property0_09 protected true N/A \ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test_ResultIncrementUp.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test_ResultIncrementUp.txt
new file mode 100644
index 00000000000..d078a00adfd
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test_ResultIncrementUp.txt
@@ -0,0 +1,13 @@
+
+0Class public false N/A
+
+Property0_108 protected true N/A
+Property0_107 protected true N/A
+Property0_106 protected true N/A
+Property0_105 protected true N/A
+Property0_104 protected true N/A
+Property0_103 protected true N/A
+Property0_102 protected true N/A
+Property0_101 protected true N/A
+Property0_100 protected true N/A
+Property0_99 protected true N/A \ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test.java
new file mode 100644
index 00000000000..7ab0c37a9ea
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test.java
@@ -0,0 +1,127 @@
+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Thanh Liem PHAN (ALL4TEC) thanhliem.phan@all4tec.net - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle;
+
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.nebula.widgets.nattable.command.ILayerCommand;
+import org.eclipse.nebula.widgets.nattable.fillhandle.command.FillHandlePasteCommand.FillHandleOperation;
+import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer.MoveDirectionEnum;
+import org.eclipse.papyrus.infra.nattable.fillhandle.command.PapyrusFillHandlePasteCommand;
+import org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager;
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
+import org.eclipse.swt.graphics.Rectangle;
+
+/**
+ * This allows to manage the fill handle prefix tests for the name column.
+ * As showed in the bug 499466, the fill action can not handle correctly the string surrounded by numbers such as "000_Req_00".
+ * It returns "001_Req_00", "002_Req_00" for a down-fill prefix action.
+ */
+@PluginResource("resources/fillhandle/FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test.di")
+public class FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test extends AbstractFillHandleTest {
+
+ /**
+ * Constructor.
+ */
+ public FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test() {
+ super();
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#selectCellToFillToUp(org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager)
+ */
+ @Override
+ protected void selectCellToFillToUp(final TreeNattableModelManager treeManager) {
+ treeManager.getBodyLayerStack().getSelectionLayer().setSelectedCell(0, 12);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#selectCellToFillToDown(org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager)
+ */
+ @Override
+ protected void selectCellToFillToDown(final TreeNattableModelManager treeManager) {
+ treeManager.getBodyLayerStack().getSelectionLayer().setSelectedCell(0, 3);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#setFillHandlerRegionToUp(org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager)
+ */
+ @Override
+ protected void setFillHandlerRegionToUp(final TreeNattableModelManager treeManager) {
+ treeManager.getBodyLayerStack().getSelectionLayer().setFillHandleRegion(new Rectangle(0, 3, 1, 10));
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#setFillHandlerRegionToDown(org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager)
+ */
+ @Override
+ protected void setFillHandlerRegionToDown(final TreeNattableModelManager treeManager) {
+ treeManager.getBodyLayerStack().getSelectionLayer().setFillHandleRegion(new Rectangle(0, 3, 1, 10));
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#getCopyCommand()
+ */
+ @Override
+ protected ILayerCommand getCopyCommand(final NatTable natTable) {
+ return new PapyrusFillHandlePasteCommand(FillHandleOperation.COPY, MoveDirectionEnum.DOWN, natTable.getConfigRegistry(), false, true);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#getIncrementUpCommand(org.eclipse.nebula.widgets.nattable.NatTable)
+ */
+ @Override
+ protected ILayerCommand getIncrementUpCommand(final NatTable natTable) {
+ return new PapyrusFillHandlePasteCommand(FillHandleOperation.SERIES, MoveDirectionEnum.UP, natTable.getConfigRegistry(), true, true);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#getIncrementDownCommand(org.eclipse.nebula.widgets.nattable.NatTable)
+ */
+ @Override
+ protected ILayerCommand getIncrementDownCommand(final NatTable natTable) {
+ return new PapyrusFillHandlePasteCommand(FillHandleOperation.SERIES, MoveDirectionEnum.DOWN, natTable.getConfigRegistry(), true, true);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#getDecrementUpCommand(org.eclipse.nebula.widgets.nattable.NatTable)
+ */
+ @Override
+ protected ILayerCommand getDecrementUpCommand(final NatTable natTable) {
+ return new PapyrusFillHandlePasteCommand(FillHandleOperation.SERIES, MoveDirectionEnum.UP, natTable.getConfigRegistry(), false, true);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#getDecrementDownCommand(org.eclipse.nebula.widgets.nattable.NatTable)
+ */
+ @Override
+ protected ILayerCommand getDecrementDownCommand(final NatTable natTable) {
+ return new PapyrusFillHandlePasteCommand(FillHandleOperation.SERIES, MoveDirectionEnum.DOWN, natTable.getConfigRegistry(), false, true);
+ }
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test.java
new file mode 100644
index 00000000000..9ec8ddc9f0a
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test.java
@@ -0,0 +1,127 @@
+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Thanh Liem PHAN (ALL4TEC) thanhliem.phan@all4tec.net - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle;
+
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.nebula.widgets.nattable.command.ILayerCommand;
+import org.eclipse.nebula.widgets.nattable.fillhandle.command.FillHandlePasteCommand.FillHandleOperation;
+import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer.MoveDirectionEnum;
+import org.eclipse.papyrus.infra.nattable.fillhandle.command.PapyrusFillHandlePasteCommand;
+import org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager;
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
+import org.eclipse.swt.graphics.Rectangle;
+
+/**
+ * This allows to manage the fill handle suffix tests for the name column.
+ * As showed in the bug 499466, the fill action can not handle correctly the string surrounded by numbers such as "0000_Req_000000".
+ * It returns "0000_Req_000001", "0002_Req_000002" for a down-fill suffix action.
+ */
+@PluginResource("resources/fillhandle/FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test.di")
+public class FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test extends AbstractFillHandleTest {
+
+ /**
+ * Constructor.
+ */
+ public FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test() {
+ super();
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#selectCellToFillToUp(org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager)
+ */
+ @Override
+ protected void selectCellToFillToUp(final TreeNattableModelManager treeManager) {
+ treeManager.getBodyLayerStack().getSelectionLayer().setSelectedCell(0, 12);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#selectCellToFillToDown(org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager)
+ */
+ @Override
+ protected void selectCellToFillToDown(final TreeNattableModelManager treeManager) {
+ treeManager.getBodyLayerStack().getSelectionLayer().setSelectedCell(0, 3);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#setFillHandlerRegionToUp(org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager)
+ */
+ @Override
+ protected void setFillHandlerRegionToUp(final TreeNattableModelManager treeManager) {
+ treeManager.getBodyLayerStack().getSelectionLayer().setFillHandleRegion(new Rectangle(0, 3, 1, 10));
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#setFillHandlerRegionToDown(org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager)
+ */
+ @Override
+ protected void setFillHandlerRegionToDown(final TreeNattableModelManager treeManager) {
+ treeManager.getBodyLayerStack().getSelectionLayer().setFillHandleRegion(new Rectangle(0, 3, 1, 10));
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#getCopyCommand()
+ */
+ @Override
+ protected ILayerCommand getCopyCommand(final NatTable natTable) {
+ return new PapyrusFillHandlePasteCommand(FillHandleOperation.COPY, MoveDirectionEnum.DOWN, natTable.getConfigRegistry(), false, false);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#getIncrementUpCommand(org.eclipse.nebula.widgets.nattable.NatTable)
+ */
+ @Override
+ protected ILayerCommand getIncrementUpCommand(final NatTable natTable) {
+ return new PapyrusFillHandlePasteCommand(FillHandleOperation.SERIES, MoveDirectionEnum.UP, natTable.getConfigRegistry(), true, false);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#getIncrementDownCommand(org.eclipse.nebula.widgets.nattable.NatTable)
+ */
+ @Override
+ protected ILayerCommand getIncrementDownCommand(final NatTable natTable) {
+ return new PapyrusFillHandlePasteCommand(FillHandleOperation.SERIES, MoveDirectionEnum.DOWN, natTable.getConfigRegistry(), true, false);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#getDecrementUpCommand(org.eclipse.nebula.widgets.nattable.NatTable)
+ */
+ @Override
+ protected ILayerCommand getDecrementUpCommand(final NatTable natTable) {
+ return new PapyrusFillHandlePasteCommand(FillHandleOperation.SERIES, MoveDirectionEnum.UP, natTable.getConfigRegistry(), false, false);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#getDecrementDownCommand(org.eclipse.nebula.widgets.nattable.NatTable)
+ */
+ @Override
+ protected ILayerCommand getDecrementDownCommand(final NatTable natTable) {
+ return new PapyrusFillHandlePasteCommand(FillHandleOperation.SERIES, MoveDirectionEnum.DOWN, natTable.getConfigRegistry(), false, false);
+ }
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test.java
new file mode 100644
index 00000000000..8a43e892cac
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test.java
@@ -0,0 +1,127 @@
+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Thanh Liem PHAN (ALL4TEC) thanhliem.phan@all4tec.net - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle;
+
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.nebula.widgets.nattable.command.ILayerCommand;
+import org.eclipse.nebula.widgets.nattable.fillhandle.command.FillHandlePasteCommand.FillHandleOperation;
+import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer.MoveDirectionEnum;
+import org.eclipse.papyrus.infra.nattable.fillhandle.command.PapyrusFillHandlePasteCommand;
+import org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager;
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
+import org.eclipse.swt.graphics.Rectangle;
+
+/**
+ * This allows to manage the fill handle tests for the name column.
+ * As showed in the bug 499466, the fill action can not handle correctly the string such as "001_Req".
+ * It returns "1_Req", "2_Req" for a down-fill prefix action instead of "001_Req" and "002_Req".
+ */
+@PluginResource("resources/fillhandle/FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test.di")
+public class FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test extends AbstractFillHandleTest {
+
+ /**
+ * Constructor.
+ */
+ public FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test() {
+ super();
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#selectCellToFillToUp(org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager)
+ */
+ @Override
+ protected void selectCellToFillToUp(final TreeNattableModelManager treeManager) {
+ treeManager.getBodyLayerStack().getSelectionLayer().setSelectedCell(0, 12);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#selectCellToFillToDown(org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager)
+ */
+ @Override
+ protected void selectCellToFillToDown(final TreeNattableModelManager treeManager) {
+ treeManager.getBodyLayerStack().getSelectionLayer().setSelectedCell(0, 3);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#setFillHandlerRegionToUp(org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager)
+ */
+ @Override
+ protected void setFillHandlerRegionToUp(final TreeNattableModelManager treeManager) {
+ treeManager.getBodyLayerStack().getSelectionLayer().setFillHandleRegion(new Rectangle(0, 3, 1, 10));
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#setFillHandlerRegionToDown(org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager)
+ */
+ @Override
+ protected void setFillHandlerRegionToDown(final TreeNattableModelManager treeManager) {
+ treeManager.getBodyLayerStack().getSelectionLayer().setFillHandleRegion(new Rectangle(0, 3, 1, 10));
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#getCopyCommand()
+ */
+ @Override
+ protected ILayerCommand getCopyCommand(final NatTable natTable) {
+ return new PapyrusFillHandlePasteCommand(FillHandleOperation.COPY, MoveDirectionEnum.DOWN, natTable.getConfigRegistry(), false, true);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#getIncrementUpCommand(org.eclipse.nebula.widgets.nattable.NatTable)
+ */
+ @Override
+ protected ILayerCommand getIncrementUpCommand(final NatTable natTable) {
+ return new PapyrusFillHandlePasteCommand(FillHandleOperation.SERIES, MoveDirectionEnum.UP, natTable.getConfigRegistry(), true, true);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#getIncrementDownCommand(org.eclipse.nebula.widgets.nattable.NatTable)
+ */
+ @Override
+ protected ILayerCommand getIncrementDownCommand(final NatTable natTable) {
+ return new PapyrusFillHandlePasteCommand(FillHandleOperation.SERIES, MoveDirectionEnum.DOWN, natTable.getConfigRegistry(), true, true);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#getDecrementUpCommand(org.eclipse.nebula.widgets.nattable.NatTable)
+ */
+ @Override
+ protected ILayerCommand getDecrementUpCommand(final NatTable natTable) {
+ return new PapyrusFillHandlePasteCommand(FillHandleOperation.SERIES, MoveDirectionEnum.UP, natTable.getConfigRegistry(), false, true);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#getDecrementDownCommand(org.eclipse.nebula.widgets.nattable.NatTable)
+ */
+ @Override
+ protected ILayerCommand getDecrementDownCommand(final NatTable natTable) {
+ return new PapyrusFillHandlePasteCommand(FillHandleOperation.SERIES, MoveDirectionEnum.DOWN, natTable.getConfigRegistry(), false, true);
+ }
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test.java
new file mode 100644
index 00000000000..4c879167019
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test.java
@@ -0,0 +1,127 @@
+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Thanh Liem PHAN (ALL4TEC) thanhliem.phan@all4tec.net - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle;
+
+import org.eclipse.nebula.widgets.nattable.NatTable;
+import org.eclipse.nebula.widgets.nattable.command.ILayerCommand;
+import org.eclipse.nebula.widgets.nattable.fillhandle.command.FillHandlePasteCommand.FillHandleOperation;
+import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer.MoveDirectionEnum;
+import org.eclipse.papyrus.infra.nattable.fillhandle.command.PapyrusFillHandlePasteCommand;
+import org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager;
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
+import org.eclipse.swt.graphics.Rectangle;
+
+/**
+ * This allows to manage the fill handle tests for the name column.
+ * As showed in the bug 499466, the fill action can not handle correctly the string such as "Req_001".
+ * It returns "Req_1", "Req_2" for a down-fill action instead of "Req_001" and "Req_002".
+ */
+@PluginResource("resources/fillhandle/FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test.di")
+public class FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test extends AbstractFillHandleTest {
+
+ /**
+ * Constructor.
+ */
+ public FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test() {
+ super();
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#selectCellToFillToUp(org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager)
+ */
+ @Override
+ protected void selectCellToFillToUp(final TreeNattableModelManager treeManager) {
+ treeManager.getBodyLayerStack().getSelectionLayer().setSelectedCell(0, 12);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#selectCellToFillToDown(org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager)
+ */
+ @Override
+ protected void selectCellToFillToDown(final TreeNattableModelManager treeManager) {
+ treeManager.getBodyLayerStack().getSelectionLayer().setSelectedCell(0, 3);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#setFillHandlerRegionToUp(org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager)
+ */
+ @Override
+ protected void setFillHandlerRegionToUp(final TreeNattableModelManager treeManager) {
+ treeManager.getBodyLayerStack().getSelectionLayer().setFillHandleRegion(new Rectangle(0, 3, 1, 10));
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#setFillHandlerRegionToDown(org.eclipse.papyrus.infra.nattable.manager.table.TreeNattableModelManager)
+ */
+ @Override
+ protected void setFillHandlerRegionToDown(final TreeNattableModelManager treeManager) {
+ treeManager.getBodyLayerStack().getSelectionLayer().setFillHandleRegion(new Rectangle(0, 3, 1, 10));
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#getCopyCommand()
+ */
+ @Override
+ protected ILayerCommand getCopyCommand(final NatTable natTable) {
+ return new PapyrusFillHandlePasteCommand(FillHandleOperation.COPY, MoveDirectionEnum.DOWN, natTable.getConfigRegistry(), false, false);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#getIncrementUpCommand(org.eclipse.nebula.widgets.nattable.NatTable)
+ */
+ @Override
+ protected ILayerCommand getIncrementUpCommand(final NatTable natTable) {
+ return new PapyrusFillHandlePasteCommand(FillHandleOperation.SERIES, MoveDirectionEnum.UP, natTable.getConfigRegistry(), true, false);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#getIncrementDownCommand(org.eclipse.nebula.widgets.nattable.NatTable)
+ */
+ @Override
+ protected ILayerCommand getIncrementDownCommand(final NatTable natTable) {
+ return new PapyrusFillHandlePasteCommand(FillHandleOperation.SERIES, MoveDirectionEnum.DOWN, natTable.getConfigRegistry(), true, false);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#getDecrementUpCommand(org.eclipse.nebula.widgets.nattable.NatTable)
+ */
+ @Override
+ protected ILayerCommand getDecrementUpCommand(final NatTable natTable) {
+ return new PapyrusFillHandlePasteCommand(FillHandleOperation.SERIES, MoveDirectionEnum.UP, natTable.getConfigRegistry(), false, false);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.AbstractFillHandleTest#getDecrementDownCommand(org.eclipse.nebula.widgets.nattable.NatTable)
+ */
+ @Override
+ protected ILayerCommand getDecrementDownCommand(final NatTable natTable) {
+ return new PapyrusFillHandlePasteCommand(FillHandleOperation.SERIES, MoveDirectionEnum.DOWN, natTable.getConfigRegistry(), false, false);
+ }
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/AllTests.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/AllTests.java
index bca8eea1a3b..629ad3832aa 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/AllTests.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/tests/AllTests.java
@@ -42,6 +42,10 @@ import org.eclipse.papyrus.uml.nattable.clazz.config.tests.creation.outside.Crea
import org.eclipse.papyrus.uml.nattable.clazz.config.tests.creation.outside.CreateElementDepth2_V1_V3_H1_Test;
import org.eclipse.papyrus.uml.nattable.clazz.config.tests.creation.outside.CreateElementDepth2_V1_V3_V1_Test;
import org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.FillHandleInteger_V1_V3_V1_Test;
+import org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test;
+import org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test;
+import org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test;
+import org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test;
import org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.FillHandleStringOnlyPrefix_V1_V3_V1_Test;
import org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.FillHandleStringOnlySuffix_V1_V3_V1_Test;
import org.eclipse.papyrus.uml.nattable.clazz.config.tests.fillhandle.FillHandleStringPrefix_V1_V3_V1_Test;
@@ -206,13 +210,13 @@ import org.junit.runners.Suite.SuiteClasses;
// Move elements
MoveElementsTreeTableTest.class,
-
+
// Bug 467723: Change categories with hidden categories display
ChangeCategoryNotExpandedTest.class,
-
+
// Delete row elements
DeleteRowElementTest.class,
-
+
// Destroy column
DestroyColumnTest.class,
@@ -273,6 +277,10 @@ import org.junit.runners.Suite.SuiteClasses;
FillHandleStringOnlyPrefix_V1_V3_V1_Test.class,
FillHandleStringSuffix_V1_V3_V1_Test.class,
FillHandleStringPrefix_V1_V3_V1_Test.class,
+ FillHandleNameBug499466BeginningPrefix_V1_V3_V1_Test.class,
+ FillHandleNameBug499466EndingSuffix_V1_V3_V1_Test.class,
+ FillHandleNameBug499466BeginningEndingPrefix_V1_V3_V1_Test.class,
+ FillHandleNameBug499466BeginningEndingSuffix_V1_V3_V1_Test.class,
// Attached Mode
// Paste tests for single column

Back to the top