svn commit: r15324 - branches/gsoc2008/work_midterm_maurelio1234: . src/org/argouml/cognitive src/org/argouml/ui/explorer src/org/argouml/uml/cognitive/critics
[email protected] 21 Jul 2008 11:08:02 -0000
Newsgroups
gmane.comp.lang.uml.argouml.cvs
Message-ID
<[email protected] >
Author: maurelio1234
Date: 2008-07-21 04:08:02-0700
New Revision: 15324
Added:
branches/gsoc2008/work_midterm_maurelio1234/argouml.log
Modified:
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/cognitive/Agency.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/cognitive/CompoundCritic.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/ui/explorer/ExplorerPopup.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAlreadyRealizes.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAssocNameConflict.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCircularAssocClass.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCircularComposition.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCircularInheritance.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrClassMustBeAbstract.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCrossNamespaceAssoc.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDisambigStateName.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDupParamName.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDupRoleNames.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrEmptyPackage.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrFinalSubclassed.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrIllegalGeneralization.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrIllegalName.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrInterfaceAllPublic.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrInterfaceOperOnly.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMergeClasses.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMissingAttrName.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMissingClassName.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMissingOperName.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMissingStateName.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMultipleAgg.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNWayAgg.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNameConflictAC.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNameConfusion.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNavFromInterface.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNoAssociations.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNoOperations.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNonAggDataType.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrOperNameConflict.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrReservedName.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrSubclassReference.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyAssoc.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyAttr.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyClasses.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyOper.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyStates.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyTransitions.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrUnnavigableAssoc.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrUselessAbstract.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrUselessInterface.java
branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java
Log:
solving problem with "export xmi" action
creating "getCriticizedMetatypes()" for the critics (unfinished)
Added: branches/gsoc2008/work_midterm_maurelio1234/argouml.log
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/argouml.log?view=auto&rev=15324
==============================================================================
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/cognitive/Agency.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/cognitive/Agency.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/cognitive/Agency.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/cognitive/Agency.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/cognitive/Agency.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/cognitive/Agency.java 2008-07-21 04:08:02-0700
@@ -250,6 +250,19 @@
}
}
+ /**
+ * Register a compound critic in the global table of critics that have been
+ * loaded.
+ *
+ * @param cr the critic to register
+ */
+ public static void register(CompoundCritic cr) {
+ Set<Object> metas = cr.getCriticizedMetatypes();
+ for (Object meta : metas) {
+ register(cr, meta);
+ }
+ }
+
private static Hashtable<Class, Collection<Critic>> cachedCritics =
new Hashtable<Class, Collection<Critic>>();
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/cognitive/CompoundCritic.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/cognitive/CompoundCritic.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/cognitive/CompoundCritic.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/cognitive/CompoundCritic.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/cognitive/CompoundCritic.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/cognitive/CompoundCritic.java 2008-07-21 04:08:02-0700
@@ -25,10 +25,15 @@
package org.argouml.cognitive;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import java.util.Vector;
+
import javax.swing.Icon;
+import org.argouml.uml.cognitive.critics.CrUML;
+
/**
* A CompoundCritic acts like a regular critic in that it checks the
* design and produces design feedback. However, a CompoundCritic is
@@ -295,4 +300,17 @@
throw new UnsupportedOperationException();
}
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ for (Critic cr : this.critics) {
+ if (cr instanceof CrUML) {
+ ret.addAll(((CrUML)cr).getCriticizedMetatypes());
+ }
+ }
+ return ret;
+ }
+
}
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/ui/explorer/ExplorerPopup.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/ui/explorer/ExplorerPopup.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/ui/explorer/ExplorerPopup.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/ui/explorer/ExplorerPopup.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/ui/explorer/ExplorerPopup.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/ui/explorer/ExplorerPopup.java 2008-07-21 04:08:02-0700
@@ -189,9 +189,14 @@
initMenuCreateDiagrams();
this.add(createDiagrams);
}
-
- if (!multiSelect && selectedItem instanceof Profile) {
- this.add(new ActionExportProfileXMI((Profile) selectedItem));
+
+ try {
+ if (!multiSelect && selectedItem instanceof Profile
+ && !((Profile) selectedItem).getProfilePackages().isEmpty()) {
+ this.add(new ActionExportProfileXMI((Profile) selectedItem));
+ }
+ } catch (Exception e) {
+
}
if (!multiSelect && selectedItem instanceof ProfileConfiguration) {
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAlreadyRealizes.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAlreadyRealizes.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAlreadyRealizes.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAlreadyRealizes.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAlreadyRealizes.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAlreadyRealizes.java 2008-07-21 04:08:02-0700
@@ -71,6 +71,15 @@
}
/**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getUMLClass());
+ return ret;
+ }
+
+ /**
* The UID.
*/
private static final long serialVersionUID = -8264991005828634274L;
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAssocNameConflict.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAssocNameConflict.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAssocNameConflict.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAssocNameConflict.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAssocNameConflict.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrAssocNameConflict.java 2008-07-21 04:08:02-0700
@@ -147,4 +147,14 @@
}
return list;
}
+
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getNamespace());
+ return ret;
+ }
+
}
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCircularAssocClass.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCircularAssocClass.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCircularAssocClass.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCircularAssocClass.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCircularAssocClass.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCircularAssocClass.java 2008-07-21 04:08:02-0700
@@ -25,7 +25,9 @@
package org.argouml.uml.cognitive.critics;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
+import java.util.Set;
import org.argouml.cognitive.Critic;
import org.argouml.cognitive.Designer;
@@ -76,7 +78,15 @@
return NO_PROBLEM;
}
-
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getAssociationClass());
+ return ret;
+ }
+
/**
* The UID.
*/
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCircularComposition.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCircularComposition.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCircularComposition.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCircularComposition.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCircularComposition.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCircularComposition.java 2008-07-21 04:08:02-0700
@@ -24,6 +24,9 @@
package org.argouml.uml.cognitive.critics;
+import java.util.HashSet;
+import java.util.Set;
+
import org.apache.log4j.Logger;
import org.argouml.cognitive.Critic;
import org.argouml.cognitive.Designer;
@@ -119,4 +122,13 @@
return WizBreakCircularComp.class;
}
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getUMLClass());
+ return ret;
+ }
+
}
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCircularInheritance.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCircularInheritance.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCircularInheritance.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCircularInheritance.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCircularInheritance.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCircularInheritance.java 2008-07-21 04:08:02-0700
@@ -24,6 +24,9 @@
package org.argouml.uml.cognitive.critics;
+import java.util.HashSet;
+import java.util.Set;
+
import org.apache.log4j.Logger;
import org.argouml.cognitive.Critic;
import org.argouml.cognitive.Designer;
@@ -73,5 +76,14 @@
return problem;
}
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getGeneralizableElement());
+ return ret;
+ }
+
} /* end class CrCircularInheritance */
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrClassMustBeAbstract.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrClassMustBeAbstract.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrClassMustBeAbstract.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrClassMustBeAbstract.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrClassMustBeAbstract.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrClassMustBeAbstract.java 2008-07-21 04:08:02-0700
@@ -24,7 +24,9 @@
package org.argouml.uml.cognitive.critics;
+import java.util.HashSet;
import java.util.Iterator;
+import java.util.Set;
import org.argouml.cognitive.Critic;
import org.argouml.cognitive.Designer;
@@ -71,6 +73,16 @@
return NO_PROBLEM;
}
+
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getUMLClass());
+ return ret;
+ }
+
/**
* The UID.
*/
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCrossNamespaceAssoc.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCrossNamespaceAssoc.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCrossNamespaceAssoc.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCrossNamespaceAssoc.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCrossNamespaceAssoc.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrCrossNamespaceAssoc.java 2008-07-21 04:08:02-0700
@@ -24,7 +24,9 @@
package org.argouml.uml.cognitive.critics;
+import java.util.HashSet;
import java.util.Iterator;
+import java.util.Set;
import org.argouml.cognitive.Critic;
import org.argouml.cognitive.Designer;
@@ -100,4 +102,14 @@
// If we drop out there is no problem
return NO_PROBLEM;
}
+
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getAssociationClass());
+ return ret;
+ }
+
} /* end class CrCrossNamespaceAssoc */
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDisambigStateName.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDisambigStateName.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDisambigStateName.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDisambigStateName.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDisambigStateName.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDisambigStateName.java 2008-07-21 04:08:02-0700
@@ -25,7 +25,9 @@
package org.argouml.uml.cognitive.critics;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
+import java.util.Set;
import javax.swing.Icon;
@@ -113,6 +115,15 @@
}
/**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getState());
+ return ret;
+ }
+
+ /**
* The UID.
*/
private static final long serialVersionUID = 5027208502429769593L;
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDupParamName.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDupParamName.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDupParamName.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDupParamName.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDupParamName.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDupParamName.java 2008-07-21 04:08:02-0700
@@ -26,7 +26,9 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
+import java.util.Set;
import org.argouml.cognitive.Critic;
import org.argouml.cognitive.Designer;
@@ -82,4 +84,13 @@
return NO_PROBLEM;
}
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getOperation());
+ return ret;
+ }
+
}
\ No newline at end of file
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDupRoleNames.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDupRoleNames.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDupRoleNames.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDupRoleNames.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDupRoleNames.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrDupRoleNames.java 2008-07-21 04:08:02-0700
@@ -26,7 +26,9 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
+import java.util.Set;
import org.argouml.cognitive.Designer;
import org.argouml.model.Model;
@@ -143,5 +145,13 @@
return NO_PROBLEM;
}
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getAssociationClass());
+ return ret;
+ }
}
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrEmptyPackage.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrEmptyPackage.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrEmptyPackage.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrEmptyPackage.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrEmptyPackage.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrEmptyPackage.java 2008-07-21 04:08:02-0700
@@ -25,6 +25,8 @@
package org.argouml.uml.cognitive.critics;
import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
import org.apache.log4j.Logger;
import org.argouml.cognitive.Designer;
@@ -69,5 +71,14 @@
return NO_PROBLEM;
}
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getPackage());
+ return ret;
+ }
+
}
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrFinalSubclassed.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrFinalSubclassed.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrFinalSubclassed.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrFinalSubclassed.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrFinalSubclassed.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrFinalSubclassed.java 2008-07-21 04:08:02-0700
@@ -24,7 +24,9 @@
package org.argouml.uml.cognitive.critics;
+import java.util.HashSet;
import java.util.Iterator;
+import java.util.Set;
import org.argouml.cognitive.Critic;
import org.argouml.cognitive.Designer;
@@ -69,5 +71,15 @@
return specs.hasNext() ? PROBLEM_FOUND : NO_PROBLEM;
}
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getClassifier());
+ ret.add(Model.getMetaTypes().getInterface());
+ return ret;
+ }
+
} /* end class CrFinalSubclassed */
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrIllegalGeneralization.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrIllegalGeneralization.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrIllegalGeneralization.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrIllegalGeneralization.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrIllegalGeneralization.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrIllegalGeneralization.java 2008-07-21 04:08:02-0700
@@ -24,6 +24,9 @@
package org.argouml.uml.cognitive.critics;
+import java.util.HashSet;
+import java.util.Set;
+
import org.argouml.cognitive.Designer;
import org.argouml.model.Model;
import org.argouml.uml.cognitive.UMLDecision;
@@ -71,4 +74,13 @@
return NO_PROBLEM;
}
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getGeneralizableElement());
+ return ret;
+ }
+
}
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrIllegalName.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrIllegalName.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrIllegalName.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrIllegalName.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrIllegalName.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrIllegalName.java 2008-07-21 04:08:02-0700
@@ -24,6 +24,9 @@
package org.argouml.uml.cognitive.critics;
+import java.util.HashSet;
+import java.util.Set;
+
import javax.swing.Icon;
import org.argouml.cognitive.Designer;
@@ -81,4 +84,18 @@
return ClClassName.getTheInstance();
}
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getUMLClass());
+ ret.add(Model.getMetaTypes().getInterface());
+ ret.add(Model.getMetaTypes().getAssociationClass());
+ ret.add(Model.getMetaTypes().getOperation());
+ ret.add(Model.getMetaTypes().getParameter());
+ ret.add(Model.getMetaTypes().getState());
+ return ret;
+ }
+
} /* end class CrIllegalName */
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrInterfaceAllPublic.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrInterfaceAllPublic.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrInterfaceAllPublic.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrInterfaceAllPublic.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrInterfaceAllPublic.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrInterfaceAllPublic.java 2008-07-21 04:08:02-0700
@@ -25,7 +25,9 @@
package org.argouml.uml.cognitive.critics;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
+import java.util.Set;
import org.argouml.cognitive.Critic;
import org.argouml.cognitive.Designer;
@@ -77,4 +79,13 @@
return NO_PROBLEM;
}
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getInterface());
+ return ret;
+ }
+
} /* end class CrInterfaceAllPublic */
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrInterfaceOperOnly.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrInterfaceOperOnly.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrInterfaceOperOnly.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrInterfaceOperOnly.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrInterfaceOperOnly.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrInterfaceOperOnly.java 2008-07-21 04:08:02-0700
@@ -25,7 +25,9 @@
package org.argouml.uml.cognitive.critics;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
+import java.util.Set;
import org.argouml.cognitive.Critic;
import org.argouml.cognitive.Designer;
@@ -66,4 +68,13 @@
return NO_PROBLEM;
}
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getInterface());
+ return ret;
+ }
+
} /* end class CrInterfaceOperOnly */
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMergeClasses.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMergeClasses.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMergeClasses.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMergeClasses.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMergeClasses.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMergeClasses.java 2008-07-21 04:08:02-0700
@@ -26,7 +26,9 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import org.argouml.cognitive.Designer;
import org.argouml.cognitive.ToDoItem;
@@ -91,4 +93,13 @@
return NO_PROBLEM;
}
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getUMLClass());
+ return ret;
+ }
+
} /* end class CrMergeClasses */
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMissingAttrName.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMissingAttrName.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMissingAttrName.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMissingAttrName.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMissingAttrName.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMissingAttrName.java 2008-07-21 04:08:02-0700
@@ -24,6 +24,9 @@
package org.argouml.uml.cognitive.critics;
+import java.util.HashSet;
+import java.util.Set;
+
import javax.swing.Icon;
import org.argouml.cognitive.Critic;
@@ -97,4 +100,13 @@
*/
public Class getWizardClass(ToDoItem item) { return WizMEName.class; }
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getAttribute());
+ return ret;
+ }
+
}
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMissingClassName.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMissingClassName.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMissingClassName.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMissingClassName.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMissingClassName.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMissingClassName.java 2008-07-21 04:08:02-0700
@@ -24,6 +24,9 @@
package org.argouml.uml.cognitive.critics;
+import java.util.HashSet;
+import java.util.Set;
+
import javax.swing.Icon;
import org.argouml.cognitive.Critic;
@@ -98,4 +101,13 @@
*/
public Class getWizardClass(ToDoItem item) { return WizMEName.class; }
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getModel());
+ return ret;
+ }
+
}
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMissingOperName.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMissingOperName.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMissingOperName.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMissingOperName.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMissingOperName.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMissingOperName.java 2008-07-21 04:08:02-0700
@@ -24,6 +24,9 @@
package org.argouml.uml.cognitive.critics;
+import java.util.HashSet;
+import java.util.Set;
+
import org.argouml.cognitive.Critic;
import org.argouml.cognitive.Designer;
import org.argouml.cognitive.ToDoItem;
@@ -92,4 +95,13 @@
return WizMEName.class;
}
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getOperation());
+ return ret;
+ }
+
}
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMissingStateName.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMissingStateName.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMissingStateName.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMissingStateName.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMissingStateName.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMissingStateName.java 2008-07-21 04:08:02-0700
@@ -24,6 +24,9 @@
package org.argouml.uml.cognitive.critics;
+import java.util.HashSet;
+import java.util.Set;
+
import javax.swing.Icon;
import org.argouml.cognitive.Critic;
@@ -127,6 +130,15 @@
}
/**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getStateVertex());
+ return ret;
+ }
+
+ /**
* The UID.
*/
private static final long serialVersionUID = 1181623952639408440L;
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMultipleAgg.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMultipleAgg.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMultipleAgg.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMultipleAgg.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMultipleAgg.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrMultipleAgg.java 2008-07-21 04:08:02-0700
@@ -25,7 +25,9 @@
package org.argouml.uml.cognitive.critics;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
+import java.util.Set;
import org.argouml.cognitive.Critic;
import org.argouml.cognitive.Designer;
@@ -156,4 +158,13 @@
return WizAssocComposite.class;
}
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getAssociationClass());
+ return ret;
+ }
+
} /* end class CrMultipleAgg */
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNWayAgg.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNWayAgg.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNWayAgg.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNWayAgg.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNWayAgg.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNWayAgg.java 2008-07-21 04:08:02-0700
@@ -25,7 +25,9 @@
package org.argouml.uml.cognitive.critics;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
+import java.util.Set;
import org.argouml.cognitive.Critic;
import org.argouml.cognitive.Designer;
@@ -141,6 +143,16 @@
return NO_PROBLEM;
}
+
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getAssociationClass());
+ return ret;
+ }
+
/**
* The UID.
*/
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNameConflictAC.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNameConflictAC.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNameConflictAC.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNameConflictAC.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNameConflictAC.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNameConflictAC.java 2008-07-21 04:08:02-0700
@@ -24,8 +24,12 @@
package org.argouml.uml.cognitive.critics;
+import java.util.HashSet;
+import java.util.Set;
+
import org.argouml.cognitive.Critic;
import org.argouml.cognitive.Designer;
+import org.argouml.model.Model;
import org.argouml.uml.cognitive.UMLDecision;
/**
@@ -54,5 +58,14 @@
return NO_PROBLEM;
}
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getAssociationClass());
+ return ret;
+ }
+
} /* end class CrNameConflictAC */
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNameConfusion.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNameConfusion.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNameConfusion.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNameConfusion.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNameConfusion.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNameConfusion.java 2008-07-21 04:08:02-0700
@@ -25,7 +25,9 @@
package org.argouml.uml.cognitive.critics;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
+import java.util.Set;
import javax.swing.Icon;
@@ -229,4 +231,14 @@
return WizManyNames.class;
}
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getClassifier());
+ ret.add(Model.getMetaTypes().getState());
+ return ret;
+ }
+
}
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNavFromInterface.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNavFromInterface.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNavFromInterface.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNavFromInterface.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNavFromInterface.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNavFromInterface.java 2008-07-21 04:08:02-0700
@@ -24,7 +24,9 @@
package org.argouml.uml.cognitive.critics;
+import java.util.HashSet;
import java.util.Iterator;
+import java.util.Set;
import org.argouml.cognitive.Critic;
import org.argouml.cognitive.Designer;
@@ -147,6 +149,15 @@
}
/**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getAssociationClass());
+ return ret;
+ }
+
+ /**
* The UID.
*/
private static final long serialVersionUID = 2660051106458704056L;
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNoAssociations.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNoAssociations.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNoAssociations.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNoAssociations.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNoAssociations.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNoAssociations.java 2008-07-21 04:08:02-0700
@@ -25,7 +25,9 @@
package org.argouml.uml.cognitive.critics;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
+import java.util.Set;
import org.argouml.cognitive.Critic;
import org.argouml.cognitive.Designer;
@@ -178,4 +180,15 @@
return false;
}
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getUMLClass());
+ ret.add(Model.getMetaTypes().getActor());
+ ret.add(Model.getMetaTypes().getUseCase());
+ return ret;
+ }
+
}
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java 2008-07-21 04:08:02-0700
@@ -24,7 +24,9 @@
package org.argouml.uml.cognitive.critics;
+import java.util.HashSet;
import java.util.Iterator;
+import java.util.Set;
import javax.swing.Icon;
@@ -172,5 +174,16 @@
public Class getWizardClass(ToDoItem item) {
return WizAddInstanceVariable.class;
}
+
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getUMLClass());
+ return ret;
+ }
+
}
+
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNoOperations.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNoOperations.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNoOperations.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNoOperations.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNoOperations.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNoOperations.java 2008-07-21 04:08:02-0700
@@ -24,7 +24,9 @@
package org.argouml.uml.cognitive.critics;
+import java.util.HashSet;
import java.util.Iterator;
+import java.util.Set;
import javax.swing.Icon;
@@ -154,5 +156,16 @@
public Class getWizardClass(ToDoItem item) {
return WizAddOperation.class;
}
+
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getUMLClass());
+ ret.add(Model.getMetaTypes().getInterface());
+ return ret;
+ }
+
}
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNonAggDataType.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNonAggDataType.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNonAggDataType.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNonAggDataType.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNonAggDataType.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrNonAggDataType.java 2008-07-21 04:08:02-0700
@@ -24,8 +24,12 @@
package org.argouml.uml.cognitive.critics;
+import java.util.HashSet;
+import java.util.Set;
+
import org.argouml.cognitive.Critic;
import org.argouml.cognitive.Designer;
+import org.argouml.model.Model;
import org.argouml.uml.cognitive.UMLDecision;
/**
@@ -56,5 +60,14 @@
return NO_PROBLEM;
}
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getDataType());
+ return ret;
+ }
+
} /* end class CrNonAggDataType */
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrOperNameConflict.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrOperNameConflict.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrOperNameConflict.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrOperNameConflict.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrOperNameConflict.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrOperNameConflict.java 2008-07-21 04:08:02-0700
@@ -26,7 +26,9 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
+import java.util.Set;
import javax.swing.Icon;
@@ -267,4 +269,13 @@
return false;
}
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getClassifier());
+ return ret;
+ }
+
}
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrReservedName.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrReservedName.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrReservedName.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrReservedName.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrReservedName.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrReservedName.java 2008-07-21 04:08:02-0700
@@ -25,7 +25,9 @@
package org.argouml.uml.cognitive.critics;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import javax.swing.Icon;
@@ -220,6 +222,18 @@
}
/**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getClassifier());
+ ret.add(Model.getMetaTypes().getOperation());
+ ret.add(Model.getMetaTypes().getState());
+ ret.add(Model.getMetaTypes().getAssociation());
+ return ret;
+ }
+
+ /**
* The UID.
*/
private static final long serialVersionUID = -5839267391209851505L;
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrSubclassReference.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrSubclassReference.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrSubclassReference.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrSubclassReference.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrSubclassReference.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrSubclassReference.java 2008-07-21 04:08:02-0700
@@ -27,7 +27,9 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Enumeration;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import org.argouml.cognitive.Critic;
import org.argouml.cognitive.Designer;
@@ -147,4 +149,13 @@
return offs;
}
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getUMLClass());
+ return ret;
+ }
+
}
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyAssoc.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyAssoc.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyAssoc.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyAssoc.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyAssoc.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyAssoc.java 2008-07-21 04:08:02-0700
@@ -25,6 +25,8 @@
package org.argouml.uml.cognitive.critics;
import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
import org.argouml.cognitive.Designer;
import org.argouml.model.Model;
@@ -64,4 +66,13 @@
return PROBLEM_FOUND;
}
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getUMLClass());
+ return ret;
+ }
+
} /* end class CrTooManyAssoc */
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyAttr.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyAttr.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyAttr.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyAttr.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyAttr.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyAttr.java 2008-07-21 04:08:02-0700
@@ -25,7 +25,9 @@
package org.argouml.uml.cognitive.critics;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
+import java.util.Set;
import org.argouml.cognitive.Designer;
import org.argouml.model.Model;
@@ -79,6 +81,15 @@
}
/**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getUMLClass());
+ return ret;
+ }
+
+ /**
* The UID.
*/
private static final long serialVersionUID = 1281218975903539324L;
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyClasses.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyClasses.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyClasses.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyClasses.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyClasses.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyClasses.java 2008-07-21 04:08:02-0700
@@ -26,6 +26,8 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
import org.argouml.cognitive.Designer;
import org.argouml.model.Model;
@@ -74,6 +76,15 @@
}
/**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getNamespace());
+ return ret;
+ }
+
+ /**
* The UID.
*/
private static final long serialVersionUID = -3270186791825482658L;
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyOper.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyOper.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyOper.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyOper.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyOper.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyOper.java 2008-07-21 04:08:02-0700
@@ -25,7 +25,9 @@
package org.argouml.uml.cognitive.critics;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
+import java.util.Set;
import org.argouml.cognitive.Designer;
import org.argouml.model.Model;
@@ -80,6 +82,15 @@
}
/**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getUMLClass());
+ return ret;
+ }
+
+ /**
* The UID.
*/
private static final long serialVersionUID = 3221965323817473947L;
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyStates.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyStates.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyStates.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyStates.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyStates.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyStates.java 2008-07-21 04:08:02-0700
@@ -25,6 +25,8 @@
package org.argouml.uml.cognitive.critics;
import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
import org.argouml.cognitive.Designer;
import org.argouml.model.Model;
@@ -68,6 +70,15 @@
}
/**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getCompositeState());
+ return ret;
+ }
+
+ /**
* The UID.
*/
private static final long serialVersionUID = -7320341818814870066L;
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyTransitions.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyTransitions.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyTransitions.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyTransitions.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyTransitions.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrTooManyTransitions.java 2008-07-21 04:08:02-0700
@@ -25,6 +25,8 @@
package org.argouml.uml.cognitive.critics;
import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
import org.argouml.cognitive.Designer;
import org.argouml.model.Model;
@@ -72,6 +74,15 @@
}
/**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getStateVertex());
+ return ret;
+ }
+
+ /**
* The UID.
*/
private static final long serialVersionUID = -5732942378849267065L;
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrUnnavigableAssoc.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrUnnavigableAssoc.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrUnnavigableAssoc.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrUnnavigableAssoc.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrUnnavigableAssoc.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrUnnavigableAssoc.java 2008-07-21 04:08:02-0700
@@ -25,7 +25,9 @@
package org.argouml.uml.cognitive.critics;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
+import java.util.Set;
import org.argouml.cognitive.Designer;
import org.argouml.cognitive.ToDoItem;
@@ -69,4 +71,13 @@
*/
public Class getWizardClass(ToDoItem item) { return WizNavigable.class; }
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getAssociationClass());
+ return ret;
+ }
+
} /* end class CrUnnavigableAssoc */
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrUselessAbstract.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrUselessAbstract.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrUselessAbstract.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrUselessAbstract.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrUselessAbstract.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrUselessAbstract.java 2008-07-21 04:08:02-0700
@@ -28,7 +28,9 @@
import java.util.Collection;
import java.util.Collections;
import java.util.Enumeration;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import org.argouml.cognitive.Designer;
import org.argouml.cognitive.Goal;
@@ -78,6 +80,15 @@
return true; // no concrete subclasses defined, this class is "useless"
}
+ /**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getUMLClass());
+ return ret;
+ }
+
} /* end class CrUselessAbstract */
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrUselessInterface.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrUselessInterface.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrUselessInterface.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrUselessInterface.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrUselessInterface.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/CrUselessInterface.java 2008-07-21 04:08:02-0700
@@ -24,7 +24,9 @@
package org.argouml.uml.cognitive.critics;
+import java.util.HashSet;
import java.util.Iterator;
+import java.util.Set;
import org.argouml.cognitive.Critic;
import org.argouml.cognitive.Designer;
@@ -78,6 +80,15 @@
}
/**
+ * @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
+ */
+ public Set<Object> getCriticizedMetatypes() {
+ Set<Object> ret = new HashSet<Object>();
+ ret.add(Model.getMetaTypes().getInterface());
+ return ret;
+ }
+
+ /**
* The UID.
*/
private static final long serialVersionUID = -6586457111453473553L;
Modified: branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java?view=diff&rev=15324&p1=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java&p2=branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java&r1=15323&r2=15324
==============================================================================
--- branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java (original)
+++ branches/gsoc2008/work_midterm_maurelio1234/src/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java 2008-07-21 04:08:02-0700
@@ -269,7 +269,7 @@
* static initializer, register all appropriate critics.
*/
public void init() {
- /*Object modelCls = Model.getMetaTypes().getModel();
+ Object modelCls = Model.getMetaTypes().getModel();
Object packageCls = Model.getMetaTypes().getPackage();
Object classCls = Model.getMetaTypes().getUMLClass();
Object classifierCls = Model.getMetaTypes().getClassifier();
@@ -289,79 +289,23 @@
Object stateVertexCls = Model.getMetaTypes().getStateVertex();
Object stateCls = Model.getMetaTypes().getState();
Object compositieStateCls = Model.getMetaTypes().getCompositeState();
- Object synchStateCls = Model.getMetaTypes().getSynchState();*/
+ Object synchStateCls = Model.getMetaTypes().getSynchState();
// Class stateDiagramCls = UMLStateDiagram.class;
// Class useCaseDiagramCls = UMLUseCaseDiagram.class;
// Class classDiagramCls = UMLClassDiagram.class;
// TODO: Agency should allow registration by interface
// useful for MAssociation.
- /*Agency.register(crAssocNameConflict, namespaceCls);
- Agency.register(crAttrNameConflict, classifierCls);
- Agency.register(crOperNameConflict, classifierCls);
- Agency.register(crCircularAssocClass, assocClassCls);
- 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(crAlreadyRealizes, classCls);
- Agency.register(crInterfaceAllPublic, interfaceCls);
- Agency.register(crInterfaceOperOnly, interfaceCls);
- Agency.register(crMultipleAgg, assocCls);
- Agency.register(crUnnavigableAssoc, assocCls);
- Agency.register(crNWayAgg, assocCls);
- Agency.register(crNavFromInterface, assocCls);
- Agency.register(crNameConflictAC, assocClassCls);
- Agency.register(clsNaming, classCls);
- Agency.register(clsNaming, interfaceCls);
- Agency.register(clsNaming, actorCls);
- Agency.register(clsNaming, useCaseCls);*/
+
+ Agency.register(clsNaming);
+ Agency.register(clsNaming);
+ Agency.register(clsNaming);
+ Agency.register(clsNaming);
// TODO: should be just CrMissingName with a
// customized description
- /*Agency.register(crMissingClassName, modelCls);
- Agency.register(crMissingAttrName, attrCls);
- Agency.register(crMissingOperName, operCls);
- Agency.register(crMissingStateName, stateVertexCls);
- Agency.register(crNoInstanceVariables, classCls);
- Agency.register(crNoAssociations, classCls);
- Agency.register(crNoAssociations, actorCls);
- Agency.register(crNoAssociations, useCaseCls);
- Agency.register(crNoOperations, classCls);
- Agency.register(crNoOperations, interfaceCls);
+ /*
Agency.register(crCompoundConstructorNeeded, classCls);
- Agency.register(crEmptyPackage, packageCls);
- Agency.register(crNonAggDataType, datatypeCls);
- Agency.register(crUselessAbstract, classCls);
- Agency.register(crUselessInterface, interfaceCls);
- Agency.register(crDisambigStateName, stateCls);
- Agency.register(crNameConfusion, classifierCls);
- Agency.register(crNameConfusion, stateCls);
- Agency.register(crMergeClasses, classCls);
- Agency.register(crSubclassReference, classCls);
- Agency.register(crIllegalName, classCls);
- Agency.register(crIllegalName, interfaceCls);
- Agency.register(crIllegalName, assocCls);
- Agency.register(crIllegalName, operCls);
- Agency.register(crIllegalName, attrCls);
- Agency.register(crIllegalName, paramCls);
- Agency.register(crIllegalName, stateCls);
- Agency.register(crReservedName, classifierCls);
- Agency.register(crReservedName, operCls);
- Agency.register(crReservedName, attrCls);
- Agency.register(crReservedName, stateCls);
- Agency.register(crReservedName, assocCls);
- Agency.register(crTooManyAssoc, classCls);
- Agency.register(crTooManyAttr, classCls);
- Agency.register(crTooManyOper, classCls);
- Agency.register(crTooManyTransitions, stateVertexCls);
- Agency.register(crTooManyStates, compositieStateCls);
- Agency.register(crTooManyClasses, namespaceCls);
Object pseudostateCls = Model.getMetaTypes().getPseudostate();
Object transitionCls = Model.getMetaTypes().getTransition();
Agency.register(noTrans1, stateVertexCls);