Commit b0e9b42f authored by Farkas Ingrid's avatar Farkas Ingrid

changed the createStringRep_for_OpenType_AltName functions

Signed-off-by: Farkas Ingrid's avatarFarkas Ingrid <farkas94ingi@gmail.com>
parent d277cc47
......@@ -375,8 +375,7 @@ public final class TableConstraint extends Constraint {
//Original titan.core version: t_type->get_otaltname(is_strange);
private Identifier getOpenTypeAlternativeName(final CompilationTimeStamp timestamp, final Type type, final AtomicBoolean isStrange) {
final StringBuffer sb = new StringBuffer();
//TODO: if (is_tagged() || is_constrained() || hasRawAttrs()) {
if (!type.getIsErroneous(timestamp) && (type.isTagged() || type.isConstrained())) {
if (!type.getIsErroneous(timestamp) && (type.isTagged() || type.isConstrained() || type.hasRawAttributes(timestamp))) {
sb.append(type.getGenNameOwn());
isStrange.set(true);
} else if (!type.getIsErroneous(timestamp) && type instanceof Referenced_Type) {
......
......@@ -535,7 +535,7 @@ public final class ASN1_BitString_Type extends ASN1Type {
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if(isTagged() /*|| hasRawAttrs()*/) {
if(isTagged() || hasRawAttributes(timestamp)) {
return getGenNameOwn();
}
......
......@@ -635,7 +635,7 @@ public final class ASN1_Integer_Type extends ASN1Type {
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if(isTagged() /*|| hasRawAttrs()*/) {
if(isTagged() || hasRawAttributes(timestamp)) {
return getGenNameOwn();
}
......
......@@ -256,7 +256,7 @@ public final class Any_Type extends ASN1Type {
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if(isTagged() /*|| hasRawAttrs()*/) {
if(isTagged() || hasRawAttributes(timestamp)) {
return getGenNameOwn();
}
......
......@@ -279,7 +279,7 @@ public final class BMPString_Type extends ASN1Type {
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if(isTagged() /*|| hasRawAttrs()*/) {
if(isTagged() || hasRawAttributes(timestamp)) {
return getGenNameOwn();
}
......
......@@ -277,7 +277,7 @@ public final class GeneralString_Type extends ASN1Type {
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if(isTagged() /*|| hasRawAttrs()*/) {
if(isTagged() || hasRawAttributes(timestamp)) {
return getGenNameOwn();
}
......
......@@ -254,7 +254,7 @@ public final class GeneralizedTime_Type extends ASN1Type {
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if(isTagged() /*|| hasRawAttrs()*/) {
if(isTagged() || hasRawAttributes(timestamp)) {
return getGenNameOwn();
}
......
......@@ -277,7 +277,7 @@ public final class GraphicString_Type extends ASN1Type {
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if(isTagged() /*|| hasRawAttrs()*/) {
if(isTagged() || hasRawAttributes(timestamp)) {
return getGenNameOwn();
}
......
......@@ -269,7 +269,7 @@ public final class IA5String_Type extends ASN1Type {
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if(isTagged() /*|| hasRawAttrs()*/) {
if(isTagged() || hasRawAttributes(timestamp)) {
return getGenNameOwn();
}
......
......@@ -241,7 +241,7 @@ public final class NULL_Type extends ASN1Type {
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if(isTagged() /*|| hasRawAttrs()*/) {
if(isTagged() || hasRawAttributes(timestamp)) {
return getGenNameOwn();
}
......
......@@ -354,8 +354,8 @@ public final class ObjectClassField_Type extends ASN1Type implements IReferencin
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if (isTagged() || constraints != null /*||
(withAttributesPath != null && withAttributesPath.has_attribs())*/) {
if (isTagged() || constraints != null ||
(withAttributesPath != null && withAttributesPath.hasAttributes(timestamp))) {
return getGenNameOwn();
} else {
return getTypeRefdLast(timestamp).createStringRep_for_OpenType_AltName(timestamp);
......
......@@ -251,7 +251,7 @@ public final class ObjectDescriptor_Type extends ASN1Type {
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if(isTagged() /*|| hasRawAttrs()*/) {
if(isTagged() || hasRawAttributes(timestamp)) {
return getGenNameOwn();
}
......
......@@ -265,7 +265,7 @@ public final class PrintableString_Type extends ASN1Type {
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if(isTagged() /*|| hasRawAttrs()*/) {
if(isTagged() || hasRawAttributes(timestamp)) {
return getGenNameOwn();
}
......
......@@ -260,7 +260,7 @@ public final class RelativeObjectIdentifier_Type extends ASN1Type {
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if(isTagged() /*|| hasRawAttrs()*/) {
if(isTagged() || hasRawAttributes(timestamp)) {
return getGenNameOwn();
}
......
......@@ -339,8 +339,8 @@ public final class Selection_Type extends ASN1Type implements IReferencingType {
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if (isTagged() || constraints != null /*||
(withAttributesPath != null && withAttributesPath.has_attribs())*/) {
if (isTagged() || constraints != null ||
(withAttributesPath != null && withAttributesPath.hasAttributes(timestamp))) {
return getGenNameOwn();
} else {
return getTypeRefdLast(timestamp).createStringRep_for_OpenType_AltName(timestamp);
......
......@@ -277,7 +277,7 @@ public final class TeletexString_Type extends ASN1Type {
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if(isTagged() /*|| hasRawAttrs()*/) {
if(isTagged() || hasRawAttributes(timestamp)) {
return getGenNameOwn();
}
......
......@@ -254,7 +254,7 @@ public final class UTCTime_Type extends ASN1Type {
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if(isTagged() /*|| hasRawAttrs()*/) {
if(isTagged() || hasRawAttributes(timestamp)) {
return getGenNameOwn();
}
......
......@@ -279,7 +279,7 @@ public final class UTF8String_Type extends ASN1Type {
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if(isTagged() /*|| hasRawAttrs()*/) {
if(isTagged() || hasRawAttributes(timestamp)) {
return getGenNameOwn();
}
......
......@@ -279,7 +279,7 @@ public final class UniversalString_Type extends ASN1Type {
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if(isTagged() /*|| hasRawAttrs()*/) {
if(isTagged() || hasRawAttributes(timestamp)) {
return getGenNameOwn();
}
......
......@@ -277,7 +277,7 @@ public final class VideotexString_Type extends ASN1Type {
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if(isTagged() /*|| hasRawAttrs()*/) {
if(isTagged() || hasRawAttributes(timestamp)) {
return getGenNameOwn();
}
......
......@@ -269,7 +269,7 @@ public final class VisibleString_Type extends ASN1Type {
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if(isTagged() /*|| hasRawAttrs()*/) {
if(isTagged() || hasRawAttributes(timestamp)) {
return getGenNameOwn();
}
......
......@@ -345,13 +345,15 @@ public final class BitString_Type extends Type {
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if(isTagged() /*|| hasRawAttrs()*/) {
if(isTagged() || hasRawAttributes(timestamp)) {
return getGenNameOwn();
}
return "BIT__STRING";
}
@Override
/** {@inheritDoc} */
public String getGenNameValue(final JavaGenData aData, final StringBuilder source) {
......
......@@ -327,7 +327,7 @@ public final class Boolean_Type extends ASN1Type {
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if(isTagged() /*|| hasRawAttrs()*/) {
if(isTagged() || hasRawAttributes(timestamp)) {
return getGenNameOwn();
}
......
......@@ -465,7 +465,7 @@ public final class CharString_Type extends Type {
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if(isTagged() /*|| hasRawAttrs()*/) {
if(isTagged() || hasRawAttributes(timestamp)) {
return getGenNameOwn();
}
......
......@@ -429,7 +429,7 @@ public final class Float_Type extends ASN1Type {
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if(isTagged() /*|| hasRawAttrs()*/) {
if(isTagged() || hasRawAttributes(timestamp)) {
return getGenNameOwn();
}
......
......@@ -349,7 +349,7 @@ public final class HexString_Type extends Type {
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if(isTagged() /*|| hasRawAttrs()*/) {
if(isTagged() || hasRawAttributes(timestamp)) {
return getGenNameOwn();
}
......
......@@ -507,7 +507,7 @@ public final class Integer_Type extends Type {
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if(isTagged() /*|| hasRawAttrs()*/) {
if(isTagged() || hasRawAttributes(timestamp)) {
return getGenNameOwn();
}
......
......@@ -297,7 +297,7 @@ public final class ObjectID_Type extends ASN1Type {
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if(isTagged() /*|| hasRawAttrs()*/) {
if(isTagged() || hasRawAttributes(timestamp)) {
return getGenNameOwn();
}
......
......@@ -388,7 +388,7 @@ public final class OctetString_Type extends ASN1Type {
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if(isTagged() /*|| hasRawAttrs()*/) {
if(isTagged() || hasRawAttributes(timestamp)) {
return getGenNameOwn();
}
......
......@@ -319,8 +319,8 @@ public class RefdSpec_Type extends ASN1Type implements IReferencingType {
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if (isTagged() || constraints != null /*||
(withAttributesPath != null && withAttributesPath.has_attribs())*/) {
if (isTagged() || constraints != null ||
(withAttributesPath != null && withAttributesPath.hasAttributes(timestamp))) {
return getGenNameOwn();
} else {
return getTypeRefdLast(timestamp).createStringRep_for_OpenType_AltName(timestamp);
......
......@@ -941,8 +941,8 @@ public final class Referenced_Type extends ASN1Type implements IReferencingType
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if (isTagged() || constraints != null /*||
(withAttributesPath != null && withAttributesPath.has_attribs())*/) {
if (isTagged() || constraints != null ||
(withAttributesPath != null && withAttributesPath.hasAttributes(timestamp))) {
return getGenNameOwn();
} else {
return getTypeRefdLast(timestamp).createStringRep_for_OpenType_AltName(timestamp);
......
......@@ -488,7 +488,7 @@ public final class UniversalCharstring_Type extends Type {
@Override
/** {@inheritDoc} */
public String createStringRep_for_OpenType_AltName(final CompilationTimeStamp timestamp) {
if(isTagged() /*|| hasRawAttrs()*/) {
if(isTagged() || hasRawAttributes(timestamp)) {
return getGenNameOwn();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment