[Mobies-commit] [commit] r4098 - UDM/trunk/src/Udm/JavaAPIGen

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Tue Aug 28 14:09:11 2012
New Revision: 4098

Log:
Constructors need to be public to be accessed by classes outside of the scope, e.g. for getref. Fix simple association cardinality mixup

Modified:
   UDM/trunk/src/Udm/JavaAPIGen/ClassGen.cpp

Modified: UDM/trunk/src/Udm/JavaAPIGen/ClassGen.cpp
==============================================================================
--- UDM/trunk/src/Udm/JavaAPIGen/ClassGen.cpp	Tue Aug 21 10:38:32 2012	(r4097)
+++ UDM/trunk/src/Udm/JavaAPIGen/ClassGen.cpp	Tue Aug 28 14:09:11 2012	(r4098)
@@ -200,7 +200,7 @@
   m_output << "\t * @param  metaDiagram The diagram of the data network" << endl;
   m_output << "\t * @throws  UdmException If any Udm related exception occurred" << endl;
   m_output << "\t */ " << endl;
-  m_output << "\tprotected " << m_cl_name << "(UdmPseudoObject upo, Diagram metaDiagram) \n\t\tthrows UdmException" << endl;
+  m_output << "\tpublic " << m_cl_name << "(UdmPseudoObject upo, Diagram metaDiagram) \n\t\tthrows UdmException" << endl;
   m_output << "\t{" << endl;
   m_output << "\t\tsuper(upo, metaDiagram);" << endl;
   m_output << "\t}" << endl << endl;
@@ -699,7 +699,7 @@
       // the canonical form of the to_class
       string pckg_signature = Utils::getPackageSignature(to_class, m_ns_path, m_package_name);
 
-      if ( (ar_i->max() == 0) || (ar_i->max() == 1) )
+	  if ( (Uml::theOther(*ar_i).max() == 0) || (Uml::theOther(*ar_i).max() == 1) )
       {
         //single cardinality
         m_output << "\t/**" << endl;