From 75da485e285e0b773e742a5d91adcb0936e3f0c0 Mon Sep 17 00:00:00 2001
From: Andrea Enrici <andrea.enrici@nokia.com>
Date: Tue, 16 Sep 2014 13:10:17 +0000
Subject: [PATCH] corrected bug when initializing attributes of TMLSD instances
---
src/ui/window/JDialogTMLSDInstance.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/ui/window/JDialogTMLSDInstance.java b/src/ui/window/JDialogTMLSDInstance.java
index d8c3513872..9d9cddfa92 100755
--- a/src/ui/window/JDialogTMLSDInstance.java
+++ b/src/ui/window/JDialogTMLSDInstance.java
@@ -188,7 +188,7 @@ public abstract class JDialogTMLSDInstance extends javax.swing.JDialog implement
if( s.length() > 0 ) {
if( ( TAttribute.isAValidId( s, checkKeyword, checkJavaKeyword ) ) && ( TAttribute.notIn(s, forbidden ) ) ) {
int i = TAttribute.getAccess(o1.toString());
- int j = TAttribute.getAvatarType(o2.toString());
+ int j = TAttribute.getType(o2.toString());
if( ( j == TAttribute.ARRAY_NAT ) && ( value.length() < 1 ) ) {
value = "2";
}
@@ -198,18 +198,17 @@ public abstract class JDialogTMLSDInstance extends javax.swing.JDialog implement
}
else {
if( !TAttribute.isAValidInitialValue(j, value) ) {
+ //TraceManager.addDev( "Initial value issue i = " + i + " j = " + j );
JOptionPane.showMessageDialog( frame, "The initial value is not valid", "Error", JOptionPane.INFORMATION_MESSAGE );
return;
}
}
if( j == TAttribute.OTHER ) {
a = new TAttribute(i, s, value, o2.toString());
- a.isAvatar = true;
//System.out.println("New attribute: " + o2.toString());
}
else {
a = new TAttribute(i, s, value, j);
- a.isAvatar = true;
}
//checks whether the same attribute already belongs to the list
int index = attributes.size();
--
GitLab