[Modelwizard-cvs] source/Chameleon Plugin/src/net/sourceforge/modelWizard/chameleon/ModelAbstraction UmlUtilities.java, 1.6, 1.7

[jistrawn <jis...@us...>]

Update of /cvsroot/modelwizard/source/Chameleon Plugin/src/net/sourceforge/modelWizard/chameleon/ModelAbstraction
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28054/src/net/sourceforge/modelWizard/chameleon/ModelAbstraction

Modified Files:
	UmlUtilities.java 
Log Message:
added support for associations

Index: UmlUtilities.java
===================================================================
RCS file: /cvsroot/modelwizard/source/Chameleon Plugin/src/net/sourceforge/modelWizard/chameleon/ModelAbstraction/UmlUtilities.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** UmlUtilities.java	2 Oct 2006 17:26:37 -0000	1.6
--- UmlUtilities.java	30 Oct 2006 15:28:46 -0000	1.7
***************
*** 133,137 ****
      }
  
- 	
      /**
       * Return a string array containing all of the properties (UML attributes)
--- 133,136 ----
***************
*** 143,146 ****
--- 142,150 ----
       */
      public static Iterator getProperties(Collection local, Collection inherited, boolean fromSuper) {
+     	return getProperties(local, inherited, fromSuper, false);
+     }
+     
+     
+     public static Iterator getProperties(Collection local, Collection inherited, boolean fromSuper, boolean includeAssociations) {
          ArrayList classProperties = new ArrayList();
  
***************
*** 150,156 ****
  
              if (p.getAssociation() != null) {
!                 continue;
              }
- 
              classProperties.add(p);
          }
--- 154,161 ----
  
              if (p.getAssociation() != null) {
!                 if(!includeAssociations) {
!                 	continue;
!                 }
              }
              classProperties.add(p);
          }