svn commit: r15075 - branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics

Author: maurelio1234
Date: 2008-06-24 02:08:33-0700
New Revision: 15075

Added:
   branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAssocNameConflict.java   (contents, props changed)
      - copied, changed from r14983, /branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAssocNameConflict.java
   branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAttrNameConflict.java   (contents, props changed)
      - copied, changed from r14983, /branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAttrNameConflict.java
   branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCircularInheritance.java   (contents, props changed)
      - copied, changed from r14983, /branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCircularInheritance.java
   branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrConflictingComposites.java   (contents, props changed)
      - copied, changed from r14983, /branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrConflictingComposites.java
   branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCrossNamespaceAssoc.java   (contents, props changed)
      - copied, changed from r14983, /branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCrossNamespaceAssoc.java
   branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDisambigClassName.java   (contents, props changed)
      - copied, changed from r14983, /branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDisambigClassName.java
   branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDupParamName.java   (contents, props changed)
      - copied, changed from r14983, /branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDupParamName.java
   branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDupRoleNames.java   (contents, props changed)
      - copied, changed from r14983, /branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDupRoleNames.java
   branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrFinalSubclassed.java   (contents, props changed)
      - copied, changed from r14983, /branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrFinalSubclassed.java
   branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrForkOutgoingTransition.java   (contents, props changed)
      - copied, changed from r14983, /branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrForkOutgoingTransition.java
   branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrIllegalGeneralization.java   (contents, props changed)
      - copied, changed from r14983, /branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrIllegalGeneralization.java
Modified:
   branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java

Log:
updating project (no need to move critics to outside ArgoUML-App)

Copied: branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAssocNameConflict.java (from r14983, /branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAssocNameConflict.java)
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAssocNameConflict.java?view=diff&rev=15075&p1=/branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAssocNameConflict.java&p2=branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAssocNameConflict.java&r1=14983&r2=15075
==============================================================================

Copied: branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAttrNameConflict.java (from r14983, /branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAttrNameConflict.java)
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAttrNameConflict.java?view=diff&rev=15075&p1=/branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAttrNameConflict.java&p2=branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAttrNameConflict.java&r1=14983&r2=15075
==============================================================================

Copied: branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCircularInheritance.java (from r14983, /branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCircularInheritance.java)
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCircularInheritance.java?view=diff&rev=15075&p1=/branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCircularInheritance.java&p2=branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCircularInheritance.java&r1=14983&r2=15075
==============================================================================

Copied: branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrConflictingComposites.java (from r14983, /branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrConflictingComposites.java)
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrConflictingComposites.java?view=diff&rev=15075&p1=/branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrConflictingComposites.java&p2=branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrConflictingComposites.java&r1=14983&r2=15075
==============================================================================

Copied: branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCrossNamespaceAssoc.java (from r14983, /branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCrossNamespaceAssoc.java)
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCrossNamespaceAssoc.java?view=diff&rev=15075&p1=/branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCrossNamespaceAssoc.java&p2=branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCrossNamespaceAssoc.java&r1=14983&r2=15075
==============================================================================

Copied: branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDisambigClassName.java (from r14983, /branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDisambigClassName.java)
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDisambigClassName.java?view=diff&rev=15075&p1=/branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDisambigClassName.java&p2=branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDisambigClassName.java&r1=14983&r2=15075
==============================================================================

Copied: branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDupParamName.java (from r14983, /branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDupParamName.java)
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDupParamName.java?view=diff&rev=15075&p1=/branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDupParamName.java&p2=branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDupParamName.java&r1=14983&r2=15075
==============================================================================

Copied: branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDupRoleNames.java (from r14983, /branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDupRoleNames.java)
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDupRoleNames.java?view=diff&rev=15075&p1=/branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDupRoleNames.java&p2=branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDupRoleNames.java&r1=14983&r2=15075
==============================================================================

Copied: branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrFinalSubclassed.java (from r14983, /branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrFinalSubclassed.java)
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrFinalSubclassed.java?view=diff&rev=15075&p1=/branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrFinalSubclassed.java&p2=branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrFinalSubclassed.java&r1=14983&r2=15075
==============================================================================

Copied: branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrForkOutgoingTransition.java (from r14983, /branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrForkOutgoingTransition.java)
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrForkOutgoingTransition.java?view=diff&rev=15075&p1=/branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrForkOutgoingTransition.java&p2=branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrForkOutgoingTransition.java&r1=14983&r2=15075
==============================================================================

Copied: branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrIllegalGeneralization.java (from r14983, /branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrIllegalGeneralization.java)
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrIllegalGeneralization.java?view=diff&rev=15075&p1=/branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrIllegalGeneralization.java&p2=branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/CrIllegalGeneralization.java&r1=14983&r2=15075
==============================================================================

Modified: branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java?view=diff&rev=15075&p1=branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java&p2=branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java&r1=15074&r2=15075
==============================================================================
--- branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java	(original)
+++ branches/gsoc2008/work_criticsprofiles_maurelio1234/src/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java	2008-06-24 02:08:33-0700
@@ -49,28 +49,28 @@
 public class InitCognitiveCritics implements InitSubsystem {
 
     // UML specific
-//    private static Critic crAssocNameConflict = new CrAssocNameConflict();
+    private static Critic crAssocNameConflict = new CrAssocNameConflict();
     
-    //    private static Critic crAttrNameConflict = new CrAttrNameConflict();
+    private static Critic crAttrNameConflict = new CrAttrNameConflict();
 
     private static Critic crOperNameConflict = new CrOperNameConflict();
 
     private static Critic crCircularAssocClass = new CrCircularAssocClass();
 
-    //    private static Critic crCircularInheritance = new CrCircularInheritance();
+    private static Critic crCircularInheritance = new CrCircularInheritance();
 
     private static Critic crCircularComposition = new CrCircularComposition();
 
-    //    private static Critic crCrossNamespaceAssoc = new CrCrossNamespaceAssoc();
+    private static Critic crCrossNamespaceAssoc = new CrCrossNamespaceAssoc();
 
-    //    private static Critic crDupParamName = new CrDupParamName();
+    private static Critic crDupParamName = new CrDupParamName();
 
-    //    private static Critic crDupRoleNames = new CrDupRoleNames();
+    private static Critic crDupRoleNames = new CrDupRoleNames();
 
-    //    private static Critic crFinalSubclassed = new CrFinalSubclassed();
+    private static Critic crFinalSubclassed = new CrFinalSubclassed();
 
-    //private static Critic crIllegalGeneralization = 
-    //    new CrIllegalGeneralization();
+    private static Critic crIllegalGeneralization =
+	new CrIllegalGeneralization();
 
     private static Critic crAlreadyRealizes = new CrAlreadyRealizes();
 
@@ -108,7 +108,7 @@
 
     private static Critic crUselessInterface = new CrUselessInterface();
 
-    //    private static Critic crDisambigClassName = new CrDisambigClassName();
+    private static Critic crDisambigClassName = new CrDisambigClassName();
 
     private static Critic crDisambigStateName = new CrDisambigStateName();
 
@@ -210,8 +210,8 @@
     private static Critic crInvalidInitial =
         new CrInvalidInitial();
 
-    //    private static Critic crForkOutgoingTransition =
-    //new CrForkOutgoingTransition();
+    private static Critic crForkOutgoingTransition =
+        new CrForkOutgoingTransition();
 
     private static Critic crJoinIncomingTransition =
         new CrJoinIncomingTransition();
@@ -252,11 +252,8 @@
     private static Critic crZeroLengthEdge = new CrZeroLengthEdge();
 
     // Compound critics
-    // TODO: check this!
-    //private static CompoundCritic clsNaming =
-    //new CompoundCritic(crMissingClassName, crDisambigClassName);
-
-    private static Critic clsNaming = crMissingClassName;
+    private static CompoundCritic clsNaming =
+	new CompoundCritic(crMissingClassName, crDisambigClassName);
 
     private static CompoundCritic noTrans1 =
 	new CompoundCritic(crNoTransitions, crNoIncomingTransitions);
@@ -299,19 +296,19 @@
 
 	// TODO: Agency should allow registration by interface
 	// useful for MAssociation.
-        //        Agency.register(crAssocNameConflict, namespaceCls);
-        //Agency.register(crAttrNameConflict, classifierCls);
+        Agency.register(crAssocNameConflict, namespaceCls);
+	Agency.register(crAttrNameConflict, classifierCls);
 	Agency.register(crOperNameConflict, classifierCls);
 	Agency.register(crCircularAssocClass, assocClassCls);
-        //Agency.register(crCircularInheritance, genElementCls);
+	Agency.register(crCircularInheritance, genElementCls);
 	Agency.register(crCircularComposition, classCls);
 	Agency.register(crClassMustBeAbstract, classCls);
-        //Agency.register(crCrossNamespaceAssoc, assocCls);
-        //Agency.register(crDupParamName, operCls);
-        //Agency.register(crDupRoleNames, assocCls);
-        //Agency.register(crFinalSubclassed, classCls);
-        //Agency.register(crFinalSubclassed, interfaceCls);
-        //Agency.register(crIllegalGeneralization, genCls);
+	Agency.register(crCrossNamespaceAssoc, assocCls);
+	Agency.register(crDupParamName, operCls);
+	Agency.register(crDupRoleNames, assocCls);
+	Agency.register(crFinalSubclassed, classCls);
+	Agency.register(crFinalSubclassed, interfaceCls);
+	Agency.register(crIllegalGeneralization, genCls);
 	Agency.register(crAlreadyRealizes, classCls);
 	Agency.register(crInterfaceAllPublic, interfaceCls);
 	Agency.register(crInterfaceOperOnly, interfaceCls);
@@ -399,7 +396,7 @@
 	Agency.register(crInvalidForkTriggerOrGuard, transitionCls);
 	Agency.register(crInvalidPseudoStateTrigger, transitionCls);
 	Agency.register(crInvalidInitial, pseudostateCls);
-	//Agency.register(crForkOutgoingTransition, transitionCls);
+	Agency.register(crForkOutgoingTransition, transitionCls);
 	Agency.register(crJoinIncomingTransition, transitionCls);
 
 	// Class sequenceDiagramCls = UMLSequenceDiagram.class;