svn commit: r19577 - trunk/src/argouml-app/src/org/argouml: pattern/cognitive/critics uml/cognitive/critics
[email protected] Wed, 22 Jun 2011 13:37:06 -0700 (PDT)
Newsgroups
gmane.comp.lang.uml.argouml.cvs
Message-ID
<[email protected] >
Author: linus
Date: 2011-06-22 13:37:05-0700
New Revision: 19577
Modified:
trunk/src/argouml-app/src/org/argouml/pattern/cognitive/critics/CrConsiderFacade.java
trunk/src/argouml-app/src/org/argouml/pattern/cognitive/critics/CrSingletonViolatedMissingStaticAttr.java
trunk/src/argouml-app/src/org/argouml/pattern/cognitive/critics/CrSingletonViolatedOnlyPrivateConstructors.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/AbstractCrTooMany.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrAlreadyRealizes.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrAssocNameConflict.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrAttrNameConflict.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCircularAssocClass.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCircularComposition.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCircularInheritance.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrClassMustBeAbstract.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrClassWithoutComponent.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCompInstanceWithoutNode.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrComponentInstanceWithoutClassifier.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrComponentWithoutNode.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrConflictingComposites.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCrossNamespaceAssoc.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrDisambigClassName.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrDisambigStateName.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrDupParamName.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrDupRoleNames.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrFinalSubclassed.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrForkOutgoingTransition.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrIllegalGeneralization.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrIllegalName.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInstanceWithoutClassifier.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInterfaceAllPublic.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInterfaceOperOnly.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInterfaceWithoutComponent.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidBranch.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidFork.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidForkTriggerOrGuard.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidHistory.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidInitial.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidJoin.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidJoinTriggerOrGuard.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidPseudoStateTrigger.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidSynch.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrJoinIncomingTransition.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMergeClasses.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingAttrName.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingClassName.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingOperName.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingStateName.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMultiComposite.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMultipleAgg.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMultipleDeepHistoryStates.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMultipleInitialStates.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMultipleShallowHistoryStates.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNWayAgg.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNameConflict.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNameConflictAC.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNameConfusion.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNavFromInterface.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoAssociations.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoGuard.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoIncomingTransitions.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoInitialState.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoOperations.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoOutgoingTransitions.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoTransitions.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoTriggerOrGuard.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNodesOverlap.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNonAggDataType.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrObjectWithoutComponent.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrOperNameConflict.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrOppEndConflict.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrOppEndVsAttr.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrReservedName.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrSubclassReference.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyAssoc.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyAttr.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyClasses.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyOper.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyStates.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyTransitions.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUML.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUnconventionalAttrName.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUnconventionalClassName.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUnconventionalOperName.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUnconventionalPackName.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUnnavigableAssoc.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUselessInterface.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUtilityViolated.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrWrongLinkEnds.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrZeroLengthEdge.java
Log:
Added @Override.
Modified: trunk/src/argouml-app/src/org/argouml/pattern/cognitive/critics/CrConsiderFacade.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/pattern/cognitive/critics/CrConsiderFacade.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/pattern/cognitive/critics/CrConsiderFacade.java (original)
+++ trunk/src/argouml-app/src/org/argouml/pattern/cognitive/critics/CrConsiderFacade.java 2011-06-22 13:37:05-0700
@@ -63,6 +63,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
/* TODO: Add implementation. */
return NO_PROBLEM;
Modified: trunk/src/argouml-app/src/org/argouml/pattern/cognitive/critics/CrSingletonViolatedMissingStaticAttr.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/pattern/cognitive/critics/CrSingletonViolatedMissingStaticAttr.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/pattern/cognitive/critics/CrSingletonViolatedMissingStaticAttr.java (original)
+++ trunk/src/argouml-app/src/org/argouml/pattern/cognitive/critics/CrSingletonViolatedMissingStaticAttr.java 2011-06-22 13:37:05-0700
@@ -113,6 +113,7 @@
* @return {@link #PROBLEM_FOUND PROBLEM_FOUND} if the critic is
* triggered, otherwise {@link #NO_PROBLEM NO_PROBLEM}.
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
// Only look at classes
if (!(Model.getFacade().isAClass(dm))) {
Modified: trunk/src/argouml-app/src/org/argouml/pattern/cognitive/critics/CrSingletonViolatedOnlyPrivateConstructors.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/pattern/cognitive/critics/CrSingletonViolatedOnlyPrivateConstructors.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/pattern/cognitive/critics/CrSingletonViolatedOnlyPrivateConstructors.java (original)
+++ trunk/src/argouml-app/src/org/argouml/pattern/cognitive/critics/CrSingletonViolatedOnlyPrivateConstructors.java 2011-06-22 13:37:05-0700
@@ -113,6 +113,7 @@
* @return {@link #PROBLEM_FOUND PROBLEM_FOUND} if the critic is
* triggered, otherwise {@link #NO_PROBLEM NO_PROBLEM}.
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
// Only look at classes
if (!(Model.getFacade().isAClass(dm))) {
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/AbstractCrTooMany.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/AbstractCrTooMany.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/AbstractCrTooMany.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/AbstractCrTooMany.java 2011-06-22 13:37:05-0700
@@ -79,6 +79,7 @@
*
* {@inheritDoc}
*/
+ @Override
public Class getWizardClass(ToDoItem item) {
return WizTooMany.class;
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrAlreadyRealizes.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrAlreadyRealizes.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrAlreadyRealizes.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrAlreadyRealizes.java 2011-06-22 13:37:05-0700
@@ -70,6 +70,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
boolean problem = NO_PROBLEM;
if (Model.getFacade().isAClass(dm)) {
@@ -87,6 +88,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getUMLClass());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrAssocNameConflict.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrAssocNameConflict.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrAssocNameConflict.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrAssocNameConflict.java 2011-06-22 13:37:05-0700
@@ -77,6 +77,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
return computeOffenders(dm).size() > 1;
}
@@ -85,6 +86,7 @@
* @see org.argouml.cognitive.critics.Critic#toDoItem( java.lang.Object,
* org.argouml.cognitive.Designer)
*/
+ @Override
public ToDoItem toDoItem(Object dm, Designer dsgr) {
ListSet offs = computeOffenders(dm);
return new UMLToDoItem(this, offs, dsgr);
@@ -168,6 +170,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getNamespace());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrAttrNameConflict.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrAttrNameConflict.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrAttrNameConflict.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrAttrNameConflict.java 2011-06-22 13:37:05-0700
@@ -124,6 +124,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getClassifier());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCircularAssocClass.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCircularAssocClass.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCircularAssocClass.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCircularAssocClass.java 2011-06-22 13:37:05-0700
@@ -70,6 +70,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
// self.allConnections->forAll(ar|ar.participant <> self)
if (!Model.getFacade().isAAssociationClass(dm)) {
@@ -95,6 +96,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getAssociationClass());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCircularComposition.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCircularComposition.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCircularComposition.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCircularComposition.java 2011-06-22 13:37:05-0700
@@ -73,6 +73,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isAClassifier(dm))) {
return NO_PROBLEM;
@@ -89,6 +90,7 @@
* @see org.argouml.cognitive.critics.Critic#toDoItem(java.lang.Object,
* org.argouml.cognitive.Designer)
*/
+ @Override
public ToDoItem toDoItem(Object dm, Designer dsgr) {
ListSet offs = computeOffenders(dm);
@@ -116,6 +118,7 @@
* @see org.argouml.cognitive.Poster#stillValid(
* org.argouml.cognitive.ToDoItem, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean stillValid(ToDoItem i, Designer dsgr) {
if (!isActive()) return false;
ListSet offs = i.getOffenders();
@@ -132,6 +135,7 @@
/*
* @see org.argouml.cognitive.critics.Critic#getWizardClass(org.argouml.cognitive.ToDoItem)
*/
+ @Override
public Class getWizardClass(ToDoItem item) {
return WizBreakCircularComp.class;
}
@@ -139,6 +143,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getUMLClass());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCircularInheritance.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCircularInheritance.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCircularInheritance.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCircularInheritance.java 2011-06-22 13:37:05-0700
@@ -80,6 +80,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
boolean problem = NO_PROBLEM;
if (Model.getFacade().isAGeneralizableElement(dm)) {
@@ -96,6 +97,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getGeneralizableElement());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrClassMustBeAbstract.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrClassMustBeAbstract.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrClassMustBeAbstract.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrClassMustBeAbstract.java 2011-06-22 13:37:05-0700
@@ -70,6 +70,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isAClass(dm))) {
return NO_PROBLEM;
@@ -91,6 +92,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getUMLClass());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrClassWithoutComponent.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrClassWithoutComponent.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrClassWithoutComponent.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrClassWithoutComponent.java 2011-06-22 13:37:05-0700
@@ -70,6 +70,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(dm instanceof UMLDeploymentDiagram)) return NO_PROBLEM;
UMLDeploymentDiagram dd = (UMLDeploymentDiagram) dm;
@@ -82,6 +83,7 @@
* @see org.argouml.cognitive.critics.Critic#toDoItem( java.lang.Object,
* org.argouml.cognitive.Designer)
*/
+ @Override
public ToDoItem toDoItem(Object dm, Designer dsgr) {
UMLDeploymentDiagram dd = (UMLDeploymentDiagram) dm;
ListSet offs = computeOffenders(dd);
@@ -92,6 +94,7 @@
* @see org.argouml.cognitive.Poster#stillValid(
* org.argouml.cognitive.ToDoItem, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean stillValid(ToDoItem i, Designer dsgr) {
if (!isActive()) return false;
ListSet offs = i.getOffenders();
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCompInstanceWithoutNode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCompInstanceWithoutNode.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCompInstanceWithoutNode.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCompInstanceWithoutNode.java 2011-06-22 13:37:05-0700
@@ -71,6 +71,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(dm instanceof UMLDeploymentDiagram)) return NO_PROBLEM;
UMLDeploymentDiagram dd = (UMLDeploymentDiagram) dm;
@@ -83,6 +84,7 @@
* @see org.argouml.cognitive.critics.Critic#toDoItem(java.lang.Object,
* org.argouml.cognitive.Designer)
*/
+ @Override
public ToDoItem toDoItem(Object dm, Designer dsgr) {
UMLDeploymentDiagram dd = (UMLDeploymentDiagram) dm;
ListSet offs = computeOffenders(dd);
@@ -93,6 +95,7 @@
* @see org.argouml.cognitive.Poster#stillValid(
* org.argouml.cognitive.ToDoItem, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean stillValid(ToDoItem i, Designer dsgr) {
if (!isActive()) return false;
ListSet offs = i.getOffenders();
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrComponentInstanceWithoutClassifier.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrComponentInstanceWithoutClassifier.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrComponentInstanceWithoutClassifier.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrComponentInstanceWithoutClassifier.java 2011-06-22 13:37:05-0700
@@ -70,6 +70,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(dm instanceof UMLDeploymentDiagram)) {
return NO_PROBLEM;
@@ -86,6 +87,7 @@
* @see org.argouml.cognitive.critics.Critic#toDoItem( java.lang.Object,
* org.argouml.cognitive.Designer)
*/
+ @Override
public ToDoItem toDoItem(Object dm, Designer dsgr) {
UMLDeploymentDiagram dd = (UMLDeploymentDiagram) dm;
ListSet offs = computeOffenders(dd);
@@ -96,6 +98,7 @@
* @see org.argouml.cognitive.Poster#stillValid(
* org.argouml.cognitive.ToDoItem, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean stillValid(ToDoItem i, Designer dsgr) {
if (!isActive()) {
return false;
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrComponentWithoutNode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrComponentWithoutNode.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrComponentWithoutNode.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrComponentWithoutNode.java 2011-06-22 13:37:05-0700
@@ -71,6 +71,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(dm instanceof UMLDeploymentDiagram)) return NO_PROBLEM;
UMLDeploymentDiagram dd = (UMLDeploymentDiagram) dm;
@@ -83,6 +84,7 @@
* @see org.argouml.cognitive.critics.Critic#toDoItem( java.lang.Object,
* org.argouml.cognitive.Designer)
*/
+ @Override
public ToDoItem toDoItem(Object dm, Designer dsgr) {
UMLDeploymentDiagram dd = (UMLDeploymentDiagram) dm;
ListSet offs = computeOffenders(dd);
@@ -93,6 +95,7 @@
* @see org.argouml.cognitive.Poster#stillValid(
* org.argouml.cognitive.ToDoItem, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean stillValid(ToDoItem i, Designer dsgr) {
if (!isActive()) return false;
ListSet offs = i.getOffenders();
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrConflictingComposites.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrConflictingComposites.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrConflictingComposites.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrConflictingComposites.java 2011-06-22 13:37:05-0700
@@ -73,6 +73,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object classifier, Designer dsgr) {
if (!(Model.getFacade().isAClassifier(classifier))) {
return NO_PROBLEM;
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCrossNamespaceAssoc.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCrossNamespaceAssoc.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCrossNamespaceAssoc.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrCrossNamespaceAssoc.java 2011-06-22 13:37:05-0700
@@ -92,6 +92,7 @@
* @return {@link #PROBLEM_FOUND PROBLEM_FOUND} if the critic is
* triggered, otherwise {@link #NO_PROBLEM NO_PROBLEM}.
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
// Only look at associations
if (!Model.getFacade().isAAssociation(dm)) {
@@ -123,6 +124,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getAssociationClass());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrDisambigClassName.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrDisambigClassName.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrDisambigClassName.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrDisambigClassName.java 2011-06-22 13:37:05-0700
@@ -78,6 +78,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
// TODO: The WFR doesn't restrict this to Classifiers - tfm
if (!(Model.getFacade().isAClassifier(dm))) {
@@ -136,6 +137,7 @@
/*
* @see org.argouml.cognitive.Poster#getClarifier()
*/
+ @Override
public Icon getClarifier() {
return ClClassName.getTheInstance();
}
@@ -144,6 +146,7 @@
* @see org.argouml.cognitive.critics.Critic#initWizard(
* org.argouml.cognitive.ui.Wizard)
*/
+ @Override
public void initWizard(Wizard w) {
if (w instanceof WizMEName) {
ToDoItem item = (ToDoItem) w.getToDoItem();
@@ -159,6 +162,7 @@
/*
* @see org.argouml.cognitive.critics.Critic#getWizardClass(org.argouml.cognitive.ToDoItem)
*/
+ @Override
public Class getWizardClass(ToDoItem item) { return WizMEName.class; }
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrDisambigStateName.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrDisambigStateName.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrDisambigStateName.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrDisambigStateName.java 2011-06-22 13:37:05-0700
@@ -72,6 +72,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isAState(dm))) {
return NO_PROBLEM;
@@ -124,6 +125,7 @@
/*
* @see org.argouml.cognitive.Poster#getClarifier()
*/
+ @Override
public Icon getClarifier() {
return ClClassName.getTheInstance();
}
@@ -131,6 +133,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getState());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrDupParamName.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrDupParamName.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrDupParamName.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrDupParamName.java 2011-06-22 13:37:05-0700
@@ -104,6 +104,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getOperation());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrDupRoleNames.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrDupRoleNames.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrDupRoleNames.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrDupRoleNames.java 2011-06-22 13:37:05-0700
@@ -116,7 +116,7 @@
* @return {@link #PROBLEM_FOUND PROBLEM_FOUND} if the critic is
* triggered, otherwise {@link #NO_PROBLEM NO_PROBLEM}.
*/
-
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
// Only work for associations
@@ -165,6 +165,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getAssociationClass());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrFinalSubclassed.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrFinalSubclassed.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrFinalSubclassed.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrFinalSubclassed.java 2011-06-22 13:37:05-0700
@@ -76,6 +76,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!Model.getFacade().isAGeneralizableElement(dm)) {
return NO_PROBLEM;
@@ -92,6 +93,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getClassifier());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrForkOutgoingTransition.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrForkOutgoingTransition.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrForkOutgoingTransition.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrForkOutgoingTransition.java 2011-06-22 13:37:05-0700
@@ -68,23 +68,32 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(java.lang.Object,
* org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
- if (!(Model.getFacade().isATransition(dm))) return NO_PROBLEM;
+ if (!(Model.getFacade().isATransition(dm))) {
+ return NO_PROBLEM;
+ }
Object tr = dm;
Object target = Model.getFacade().getTarget(tr);
Object source = Model.getFacade().getSource(tr);
- if (!(Model.getFacade().isAPseudostate(source))) return NO_PROBLEM;
+ if (!(Model.getFacade().isAPseudostate(source))) {
+ return NO_PROBLEM;
+ }
if (!Model.getFacade().equalsPseudostateKind(
Model.getFacade().getKind(source),
- Model.getPseudostateKind().getFork()))
+ Model.getPseudostateKind().getFork())) {
+ return NO_PROBLEM;
+ }
+ if (Model.getFacade().isAState(target)) {
return NO_PROBLEM;
- if (Model.getFacade().isAState(target)) return NO_PROBLEM;
+ }
return PROBLEM_FOUND;
}
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getTransition());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrIllegalGeneralization.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrIllegalGeneralization.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrIllegalGeneralization.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrIllegalGeneralization.java 2011-06-22 13:37:05-0700
@@ -95,6 +95,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getGeneralizableElement());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrIllegalName.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrIllegalName.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrIllegalName.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrIllegalName.java 2011-06-22 13:37:05-0700
@@ -67,6 +67,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isAModelElement(dm))) {
return NO_PROBLEM;
@@ -94,6 +95,7 @@
/*
* @see org.argouml.cognitive.Poster#getClarifier()
*/
+ @Override
public Icon getClarifier() {
return ClClassName.getTheInstance();
}
@@ -101,6 +103,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getUMLClass());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInstanceWithoutClassifier.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInstanceWithoutClassifier.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInstanceWithoutClassifier.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInstanceWithoutClassifier.java 2011-06-22 13:37:05-0700
@@ -70,6 +70,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(dm instanceof UMLDeploymentDiagram)) return NO_PROBLEM;
UMLDeploymentDiagram dd = (UMLDeploymentDiagram) dm;
@@ -82,6 +83,7 @@
* @see org.argouml.cognitive.critics.Critic#toDoItem( java.lang.Object,
* org.argouml.cognitive.Designer)
*/
+ @Override
public ToDoItem toDoItem(Object dm, Designer dsgr) {
UMLDeploymentDiagram dd = (UMLDeploymentDiagram) dm;
ListSet offs = computeOffenders(dd);
@@ -92,6 +94,7 @@
* @see org.argouml.cognitive.Poster#stillValid(
* org.argouml.cognitive.ToDoItem, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean stillValid(ToDoItem i, Designer dsgr) {
if (!isActive()) return false;
ListSet offs = i.getOffenders();
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInterfaceAllPublic.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInterfaceAllPublic.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInterfaceAllPublic.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInterfaceAllPublic.java 2011-06-22 13:37:05-0700
@@ -73,6 +73,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isAInterface(dm))) {
return NO_PROBLEM;
@@ -99,6 +100,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getInterface());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInterfaceOperOnly.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInterfaceOperOnly.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInterfaceOperOnly.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInterfaceOperOnly.java 2011-06-22 13:37:05-0700
@@ -73,6 +73,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isAInterface(dm))) return NO_PROBLEM;
Object inf = dm;
@@ -88,6 +89,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getInterface());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInterfaceWithoutComponent.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInterfaceWithoutComponent.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInterfaceWithoutComponent.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInterfaceWithoutComponent.java 2011-06-22 13:37:05-0700
@@ -71,11 +71,16 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
- if (!(dm instanceof UMLDeploymentDiagram)) return NO_PROBLEM;
+ if (!(dm instanceof UMLDeploymentDiagram)) {
+ return NO_PROBLEM;
+ }
UMLDeploymentDiagram dd = (UMLDeploymentDiagram) dm;
ListSet offs = computeOffenders(dd);
- if (offs == null) return NO_PROBLEM;
+ if (offs == null) {
+ return NO_PROBLEM;
+ }
return PROBLEM_FOUND;
}
@@ -83,6 +88,7 @@
* @see org.argouml.cognitive.critics.Critic#toDoItem( java.lang.Object,
* org.argouml.cognitive.Designer)
*/
+ @Override
public ToDoItem toDoItem(Object dm, Designer dsgr) {
UMLDeploymentDiagram dd = (UMLDeploymentDiagram) dm;
ListSet offs = computeOffenders(dd);
@@ -93,8 +99,11 @@
* @see org.argouml.cognitive.Poster#stillValid(
* org.argouml.cognitive.ToDoItem, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean stillValid(ToDoItem i, Designer dsgr) {
- if (!isActive()) return false;
+ if (!isActive()) {
+ return false;
+ }
ListSet offs = i.getOffenders();
UMLDeploymentDiagram dd = (UMLDeploymentDiagram) offs.get(0);
//if (!predicate(dm, dsgr)) return false;
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidBranch.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidBranch.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidBranch.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidBranch.java 2011-06-22 13:37:05-0700
@@ -82,6 +82,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isAPseudostate(dm))) {
return NO_PROBLEM;
@@ -109,6 +110,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getPseudostate());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidFork.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidFork.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidFork.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidFork.java 2011-06-22 13:37:05-0700
@@ -71,6 +71,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isAPseudostate(dm))) {
return NO_PROBLEM;
@@ -97,6 +98,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getPseudostate());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidForkTriggerOrGuard.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidForkTriggerOrGuard.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidForkTriggerOrGuard.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidForkTriggerOrGuard.java 2011-06-22 13:37:05-0700
@@ -70,6 +70,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(java.lang.Object,
* org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isATransition(dm))) {
return NO_PROBLEM;
@@ -108,6 +109,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getTransition());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidHistory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidHistory.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidHistory.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidHistory.java 2011-06-22 13:37:05-0700
@@ -70,23 +70,30 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(java.lang.Object,
* org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
- if (!(Model.getFacade().isAPseudostate(dm))) return NO_PROBLEM;
+ if (!(Model.getFacade().isAPseudostate(dm))) {
+ return NO_PROBLEM;
+ }
Object k = Model.getFacade().getKind(dm);
if (!Model.getFacade().equalsPseudostateKind(k,
Model.getPseudostateKind().getDeepHistory())
&& !Model.getFacade().equalsPseudostateKind(k,
- Model.getPseudostateKind().getShallowHistory()))
+ Model.getPseudostateKind().getShallowHistory())) {
return NO_PROBLEM;
+ }
Collection outgoing = Model.getFacade().getOutgoings(dm);
int nOutgoing = outgoing == null ? 0 : outgoing.size();
- if (nOutgoing > 1) return PROBLEM_FOUND;
+ if (nOutgoing > 1) {
+ return PROBLEM_FOUND;
+ }
return NO_PROBLEM;
}
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getPseudostate());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidInitial.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidInitial.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidInitial.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidInitial.java 2011-06-22 13:37:05-0700
@@ -71,6 +71,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isAPseudostate(dm))) {
return NO_PROBLEM;
@@ -92,6 +93,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getPseudostate());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidJoin.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidJoin.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidJoin.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidJoin.java 2011-06-22 13:37:05-0700
@@ -72,6 +72,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isAPseudostate(dm))) {
return NO_PROBLEM;
@@ -97,6 +98,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getPseudostate());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidJoinTriggerOrGuard.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidJoinTriggerOrGuard.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidJoinTriggerOrGuard.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidJoinTriggerOrGuard.java 2011-06-22 13:37:05-0700
@@ -69,6 +69,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(java.lang.Object,
* org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isATransition(dm))) {
return NO_PROBLEM;
@@ -111,6 +112,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getTransition());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidPseudoStateTrigger.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidPseudoStateTrigger.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidPseudoStateTrigger.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidPseudoStateTrigger.java 2011-06-22 13:37:05-0700
@@ -68,28 +68,37 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(java.lang.Object,
* org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
- if (!(Model.getFacade().isATransition(dm))) return NO_PROBLEM;
+ if (!(Model.getFacade().isATransition(dm))) {
+ return NO_PROBLEM;
+ }
Object tr = dm;
Object t = Model.getFacade().getTrigger(tr);
Object sv = Model.getFacade().getSource(tr);
- if (!(Model.getFacade().isAPseudostate(sv))) return NO_PROBLEM;
+ if (!(Model.getFacade().isAPseudostate(sv))) {
+ return NO_PROBLEM;
+ }
Object k = Model.getFacade().getKind(sv);
//Forks have their own outgoing transitions critic
if (Model.getFacade().
equalsPseudostateKind(k,
- Model.getPseudostateKind().getFork()))
+ Model.getPseudostateKind().getFork())) {
return NO_PROBLEM;
+ }
boolean hasTrigger =
(t != null && Model.getFacade().getName(t) != null
&& Model.getFacade().getName(t).length() > 0);
- if (hasTrigger) return PROBLEM_FOUND;
+ if (hasTrigger) {
+ return PROBLEM_FOUND;
+ }
return NO_PROBLEM;
}
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getTransition());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidSynch.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidSynch.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidSynch.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrInvalidSynch.java 2011-06-22 13:37:05-0700
@@ -70,43 +70,49 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(java.lang.Object,
* org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
Object destinationRegion = null;
Object sourceRegion = null;
Object aux = null;
Object tr = null;
- if (!Model.getFacade().isASynchState(dm))
+ if (!Model.getFacade().isASynchState(dm)) {
return NO_PROBLEM;
+ }
Iterator outgoing = Model.getFacade().getOutgoings(dm).iterator();
while (outgoing.hasNext()) {
tr = outgoing.next();
aux = Model.getFacade().getContainer(Model.getFacade().
getTarget(tr));
- if (destinationRegion == null)
+ if (destinationRegion == null) {
destinationRegion = aux;
- else if (!aux.equals(destinationRegion))
+ } else if (!aux.equals(destinationRegion)) {
return PROBLEM_FOUND;
+ }
}
Iterator incoming = Model.getFacade().getIncomings(dm).iterator();
while (incoming.hasNext()) {
tr = incoming.next();
aux = Model.getFacade().getContainer(Model.getFacade().
getSource(tr));
- if (sourceRegion == null)
+ if (sourceRegion == null) {
sourceRegion = aux;
- else if (!aux.equals(sourceRegion))
+ } else if (!aux.equals(sourceRegion)) {
return PROBLEM_FOUND;
+ }
}
if (destinationRegion != null
&& !Model.getFacade().isAConcurrentRegion(destinationRegion)
- )
+ ) {
return PROBLEM_FOUND;
+ }
if (sourceRegion != null
&& !Model.getFacade().isAConcurrentRegion(sourceRegion)
- )
+ ) {
return PROBLEM_FOUND;
+ }
return NO_PROBLEM;
}
@@ -114,6 +120,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getSynchState());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrJoinIncomingTransition.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrJoinIncomingTransition.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrJoinIncomingTransition.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrJoinIncomingTransition.java 2011-06-22 13:37:05-0700
@@ -68,23 +68,32 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(java.lang.Object,
* org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
- if (!(Model.getFacade().isATransition(dm))) return NO_PROBLEM;
+ if (!(Model.getFacade().isATransition(dm))) {
+ return NO_PROBLEM;
+ }
Object tr = dm;
Object target = Model.getFacade().getTarget(tr);
Object source = Model.getFacade().getSource(tr);
- if (!(Model.getFacade().isAPseudostate(target))) return NO_PROBLEM;
+ if (!(Model.getFacade().isAPseudostate(target))) {
+ return NO_PROBLEM;
+ }
if (!Model.getFacade().equalsPseudostateKind(
Model.getFacade().getKind(target),
- Model.getPseudostateKind().getJoin()))
+ Model.getPseudostateKind().getJoin())) {
+ return NO_PROBLEM;
+ }
+ if (Model.getFacade().isAState(source)) {
return NO_PROBLEM;
- if (Model.getFacade().isAState(source)) return NO_PROBLEM;
+ }
return PROBLEM_FOUND;
}
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getTransition());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMergeClasses.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMergeClasses.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMergeClasses.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMergeClasses.java 2011-06-22 13:37:05-0700
@@ -70,6 +70,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isAClass(dm))) {
return NO_PROBLEM;
@@ -110,6 +111,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getUMLClass());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingAttrName.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingAttrName.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingAttrName.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingAttrName.java 2011-06-22 13:37:05-0700
@@ -69,19 +69,27 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
- if (!(Model.getFacade().isAAttribute(dm))) return NO_PROBLEM;
+ if (!(Model.getFacade().isAAttribute(dm))) {
+ return NO_PROBLEM;
+ }
Object attr = dm;
String myName = Model.getFacade().getName(attr);
if (myName == null
- || "".equals(myName)) return PROBLEM_FOUND;
- if (myName.length() == 0) return PROBLEM_FOUND;
+ || "".equals(myName)) {
+ return PROBLEM_FOUND;
+ }
+ if (myName.length() == 0) {
+ return PROBLEM_FOUND;
+ }
return NO_PROBLEM;
}
/*
* @see org.argouml.cognitive.Poster#getClarifier()
*/
+ @Override
public Icon getClarifier() {
return ClAttributeCompartment.getTheInstance();
}
@@ -90,6 +98,7 @@
* @see org.argouml.cognitive.critics.Critic#initWizard(
* org.argouml.cognitive.ui.Wizard)
*/
+ @Override
public void initWizard(Wizard w) {
if (w instanceof WizMEName) {
ToDoItem item = (ToDoItem) w.getToDoItem();
@@ -112,11 +121,13 @@
/*
* @see org.argouml.cognitive.critics.Critic#getWizardClass(org.argouml.cognitive.ToDoItem)
*/
+ @Override
public Class getWizardClass(ToDoItem item) { return WizMEName.class; }
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getAttribute());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingClassName.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingClassName.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingClassName.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingClassName.java 2011-06-22 13:37:05-0700
@@ -69,6 +69,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isAModelElement(dm))) {
return NO_PROBLEM;
@@ -84,6 +85,7 @@
/*
* @see org.argouml.cognitive.Poster#getClarifier()
*/
+ @Override
public Icon getClarifier() {
return ClClassName.getTheInstance();
}
@@ -92,6 +94,7 @@
* @see org.argouml.cognitive.critics.Critic#initWizard(
* org.argouml.cognitive.ui.Wizard)
*/
+ @Override
public void initWizard(Wizard w) {
if (w instanceof WizMEName) {
ToDoItem item = (ToDoItem) w.getToDoItem();
@@ -113,11 +116,13 @@
/*
* @see org.argouml.cognitive.critics.Critic#getWizardClass(org.argouml.cognitive.ToDoItem)
*/
+ @Override
public Class getWizardClass(ToDoItem item) { return WizMEName.class; }
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getUMLClass());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingOperName.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingOperName.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingOperName.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingOperName.java 2011-06-22 13:37:05-0700
@@ -69,11 +69,17 @@
*/
@Override
public boolean predicate2(Object dm, Designer dsgr) {
- if (!(Model.getFacade().isAOperation(dm))) return NO_PROBLEM;
+ if (!(Model.getFacade().isAOperation(dm))) {
+ return NO_PROBLEM;
+ }
Object oper = dm;
String myName = Model.getFacade().getName(oper);
- if (myName == null || myName.equals("")) return PROBLEM_FOUND;
- if (myName.length() == 0) return PROBLEM_FOUND;
+ if (myName == null || myName.equals("")) {
+ return PROBLEM_FOUND;
+ }
+ if (myName.length() == 0) {
+ return PROBLEM_FOUND;
+ }
return NO_PROBLEM;
}
@@ -112,6 +118,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getOperation());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingStateName.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingStateName.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingStateName.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingStateName.java 2011-06-22 13:37:05-0700
@@ -146,6 +146,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getStateVertex());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMultiComposite.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMultiComposite.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMultiComposite.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMultiComposite.java 2011-06-22 13:37:05-0700
@@ -73,6 +73,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
boolean problem = NO_PROBLEM;
if (Model.getFacade().isAAssociationEnd(dm)) {
@@ -88,6 +89,7 @@
/*
* @see org.argouml.cognitive.critics.Critic#getWizardClass(org.argouml.cognitive.ToDoItem)
*/
+ @Override
public Class getWizardClass(ToDoItem item) {
return WizAssocComposite.class;
}
@@ -95,6 +97,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getAssociationEnd());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMultipleAgg.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMultipleAgg.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMultipleAgg.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMultipleAgg.java 2011-06-22 13:37:05-0700
@@ -118,6 +118,7 @@
* @return {@link #PROBLEM_FOUND PROBLEM_FOUND} if the critic is
* triggered, otherwise {@link #NO_PROBLEM NO_PROBLEM}.
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
// Only for associations
@@ -170,7 +171,7 @@
*
* @return {@link Class} of the wizard.
*/
-
+ @Override
public Class getWizardClass(ToDoItem item) {
return WizAssocComposite.class;
}
@@ -178,6 +179,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getAssociationClass());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMultipleDeepHistoryStates.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMultipleDeepHistoryStates.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMultipleDeepHistoryStates.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMultipleDeepHistoryStates.java 2011-06-22 13:37:05-0700
@@ -80,6 +80,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(java.lang.Object,
* org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isAPseudostate(dm))) {
return NO_PROBLEM;
@@ -117,6 +118,7 @@
* @see org.argouml.cognitive.critics.Critic#toDoItem(java.lang.Object,
* org.argouml.cognitive.Designer)
*/
+ @Override
public ToDoItem toDoItem(Object dm, Designer dsgr) {
ListSet offs = computeOffenders(dm);
return new UMLToDoItem(this, offs, dsgr);
@@ -150,6 +152,7 @@
* @see org.argouml.cognitive.Poster#stillValid(
* org.argouml.cognitive.ToDoItem, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean stillValid(ToDoItem i, Designer dsgr) {
if (!isActive()) {
return false;
@@ -164,6 +167,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getPseudostate());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMultipleInitialStates.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMultipleInitialStates.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMultipleInitialStates.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMultipleInitialStates.java 2011-06-22 13:37:05-0700
@@ -166,6 +166,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getPseudostate());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMultipleShallowHistoryStates.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMultipleShallowHistoryStates.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMultipleShallowHistoryStates.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMultipleShallowHistoryStates.java 2011-06-22 13:37:05-0700
@@ -166,6 +166,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getPseudostate());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNWayAgg.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNWayAgg.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNWayAgg.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNWayAgg.java 2011-06-22 13:37:05-0700
@@ -120,7 +120,7 @@
* @return {@link #PROBLEM_FOUND PROBLEM_FOUND} if the critic is
* triggered, otherwise {@link #NO_PROBLEM NO_PROBLEM}.
*/
-
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
// Only work for associatins
@@ -164,6 +164,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getAssociationClass());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNameConflict.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNameConflict.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNameConflict.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNameConflict.java 2011-06-22 13:37:05-0700
@@ -153,6 +153,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getNamespace());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNameConflictAC.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNameConflictAC.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNameConflictAC.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNameConflictAC.java 2011-06-22 13:37:05-0700
@@ -70,6 +70,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
// TODO: not implemented
return NO_PROBLEM;
@@ -78,6 +79,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getAssociationClass());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNameConfusion.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNameConfusion.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNameConfusion.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNameConfusion.java 2011-06-22 13:37:05-0700
@@ -80,6 +80,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isAModelElement(dm))
|| Model.getFacade().isAAssociation(dm)
@@ -244,6 +245,7 @@
/*
* @see org.argouml.cognitive.critics.Critic#getWizardClass(org.argouml.cognitive.ToDoItem)
*/
+ @Override
public Class getWizardClass(ToDoItem item) {
return WizManyNames.class;
}
@@ -251,6 +253,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getClassifier());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNavFromInterface.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNavFromInterface.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNavFromInterface.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNavFromInterface.java 2011-06-22 13:37:05-0700
@@ -109,6 +109,7 @@
* @return {@link #PROBLEM_FOUND PROBLEM_FOUND} if the critic is
* triggered, otherwise {@link #NO_PROBLEM NO_PROBLEM}.
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
// Only look at Associations
@@ -165,6 +166,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getAssociationClass());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoAssociations.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoAssociations.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoAssociations.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoAssociations.java 2011-06-22 13:37:05-0700
@@ -79,10 +79,12 @@
*/
@Override
public boolean predicate2(Object dm, Designer dsgr) {
- if (!(Model.getFacade().isAClassifier(dm)))
+ if (!(Model.getFacade().isAClassifier(dm))) {
return NO_PROBLEM;
- if (!(Model.getFacade().isPrimaryObject(dm)))
+ }
+ if (!(Model.getFacade().isPrimaryObject(dm))) {
return NO_PROBLEM;
+ }
// If the classifier does not have a name,
// then no problem - the model is not finished anyhow.
@@ -197,6 +199,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getUMLClass());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoGuard.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoGuard.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoGuard.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoGuard.java 2011-06-22 13:37:05-0700
@@ -69,6 +69,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isATransition(dm))) {
return NO_PROBLEM;
@@ -103,6 +104,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getTransition());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoIncomingTransitions.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoIncomingTransitions.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoIncomingTransitions.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoIncomingTransitions.java 2011-06-22 13:37:05-0700
@@ -74,6 +74,7 @@
*
* @return boolean problem found
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isAStateVertex(dm))) {
return NO_PROBLEM;
@@ -149,6 +150,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getStateVertex());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoInitialState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoInitialState.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoInitialState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoInitialState.java 2011-06-22 13:37:05-0700
@@ -69,6 +69,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isACompositeState(dm))) {
return NO_PROBLEM;
@@ -102,6 +103,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getCompositeState());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java 2011-06-22 13:37:05-0700
@@ -192,6 +192,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getUMLClass());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoOperations.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoOperations.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoOperations.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoOperations.java 2011-06-22 13:37:05-0700
@@ -174,6 +174,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getUMLClass());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoOutgoingTransitions.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoOutgoingTransitions.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoOutgoingTransitions.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoOutgoingTransitions.java 2011-06-22 13:37:05-0700
@@ -68,6 +68,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isAStateVertex(dm))) {
return NO_PROBLEM;
@@ -148,6 +149,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getStateVertex());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoTransitions.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoTransitions.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoTransitions.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoTransitions.java 2011-06-22 13:37:05-0700
@@ -69,6 +69,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isAStateVertex(dm))) {
return NO_PROBLEM;
@@ -109,6 +110,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedMetatypes()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getStateVertex());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoTriggerOrGuard.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoTriggerOrGuard.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoTriggerOrGuard.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNoTriggerOrGuard.java 2011-06-22 13:37:05-0700
@@ -69,6 +69,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isATransition(dm))) {
return NO_PROBLEM;
@@ -123,6 +124,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getTransition());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNodesOverlap.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNodesOverlap.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNodesOverlap.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNodesOverlap.java 2011-06-22 13:37:05-0700
@@ -195,6 +195,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
return ret;
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNonAggDataType.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNonAggDataType.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNonAggDataType.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNonAggDataType.java 2011-06-22 13:37:05-0700
@@ -69,6 +69,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
// TODO: not implemented
return NO_PROBLEM;
@@ -77,6 +78,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getDataType());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrObjectWithoutComponent.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrObjectWithoutComponent.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrObjectWithoutComponent.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrObjectWithoutComponent.java 2011-06-22 13:37:05-0700
@@ -72,10 +72,14 @@
*/
@Override
public boolean predicate2(Object dm, Designer dsgr) {
- if (!(dm instanceof UMLDeploymentDiagram)) return NO_PROBLEM;
+ if (!(dm instanceof UMLDeploymentDiagram)) {
+ return NO_PROBLEM;
+ }
UMLDeploymentDiagram dd = (UMLDeploymentDiagram) dm;
ListSet offs = computeOffenders(dd);
- if (offs == null) return NO_PROBLEM;
+ if (offs == null) {
+ return NO_PROBLEM;
+ }
return PROBLEM_FOUND;
}
@@ -96,7 +100,9 @@
*/
@Override
public boolean stillValid(ToDoItem i, Designer dsgr) {
- if (!isActive()) return false;
+ if (!isActive()) {
+ return false;
+ }
ListSet offs = i.getOffenders();
UMLDeploymentDiagram dd = (UMLDeploymentDiagram) offs.get(0);
//if (!predicate(dm, dsgr)) return false;
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrOperNameConflict.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrOperNameConflict.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrOperNameConflict.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrOperNameConflict.java 2011-06-22 13:37:05-0700
@@ -286,6 +286,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getClassifier());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrOppEndConflict.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrOppEndConflict.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrOppEndConflict.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrOppEndConflict.java 2011-06-22 13:37:05-0700
@@ -78,6 +78,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
boolean problem = NO_PROBLEM;
if (Model.getFacade().isAClassifier(dm)) {
@@ -102,6 +103,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getAssociationEnd());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrOppEndVsAttr.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrOppEndVsAttr.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrOppEndVsAttr.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrOppEndVsAttr.java 2011-06-22 13:37:05-0700
@@ -158,6 +158,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getClassifier());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrReservedName.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrReservedName.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrReservedName.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrReservedName.java 2011-06-22 13:37:05-0700
@@ -240,6 +240,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getClassifier());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrSubclassReference.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrSubclassReference.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrSubclassReference.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrSubclassReference.java 2011-06-22 13:37:05-0700
@@ -166,6 +166,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getUMLClass());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyAssoc.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyAssoc.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyAssoc.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyAssoc.java 2011-06-22 13:37:05-0700
@@ -69,6 +69,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isAClassifier(dm))) return NO_PROBLEM;
@@ -83,6 +84,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getUMLClass());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyAttr.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyAttr.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyAttr.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyAttr.java 2011-06-22 13:37:05-0700
@@ -73,6 +73,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isAClassifier(dm))) {
return NO_PROBLEM;
@@ -97,6 +98,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getUMLClass());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyClasses.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyClasses.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyClasses.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyClasses.java 2011-06-22 13:37:05-0700
@@ -71,6 +71,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isANamespace(dm))) {
return NO_PROBLEM;
@@ -92,6 +93,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getNamespace());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyOper.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyOper.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyOper.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyOper.java 2011-06-22 13:37:05-0700
@@ -73,6 +73,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isAClassifier(dm))) {
return NO_PROBLEM;
@@ -98,6 +99,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getUMLClass());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyStates.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyStates.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyStates.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyStates.java 2011-06-22 13:37:05-0700
@@ -71,6 +71,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isACompositeState(dm))) {
return NO_PROBLEM;
@@ -86,6 +87,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getCompositeState());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyTransitions.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyTransitions.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyTransitions.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrTooManyTransitions.java 2011-06-22 13:37:05-0700
@@ -72,6 +72,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isAStateVertex(dm))) {
return NO_PROBLEM;
@@ -90,6 +91,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getStateVertex());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUML.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUML.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUML.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUML.java 2011-06-22 13:37:05-0700
@@ -207,6 +207,7 @@
* @param res is the text to expand.
* @param offs is the elements to replace
*/
+ @Override
public String expand(String res, ListSet offs) {
if (offs.size() == 0) {
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUnconventionalAttrName.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUnconventionalAttrName.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUnconventionalAttrName.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUnconventionalAttrName.java 2011-06-22 13:37:05-0700
@@ -80,6 +80,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!Model.getFacade().isAAttribute(dm)) {
return NO_PROBLEM;
@@ -133,6 +134,7 @@
* @see org.argouml.cognitive.critics.Critic#toDoItem( java.lang.Object,
* org.argouml.cognitive.Designer)
*/
+ @Override
public ToDoItem toDoItem(Object dm, Designer dsgr) {
Object f = dm;
ListSet offs = computeOffenders(f);
@@ -186,6 +188,7 @@
/*
* @see org.argouml.cognitive.Poster#getClarifier()
*/
+ @Override
public Icon getClarifier() {
return ClAttributeCompartment.getTheInstance();
}
@@ -194,6 +197,7 @@
* @see org.argouml.cognitive.Poster#stillValid(
* org.argouml.cognitive.ToDoItem, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean stillValid(ToDoItem i, Designer dsgr) {
if (!isActive()) {
return false;
@@ -213,6 +217,7 @@
* @see org.argouml.cognitive.critics.Critic#initWizard(
* org.argouml.cognitive.ui.Wizard)
*/
+ @Override
public void initWizard(Wizard w) {
if (w instanceof WizMEName) {
ToDoItem item = (ToDoItem) w.getToDoItem();
@@ -235,6 +240,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getAttribute());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUnconventionalClassName.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUnconventionalClassName.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUnconventionalClassName.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUnconventionalClassName.java 2011-06-22 13:37:05-0700
@@ -145,6 +145,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getUMLClass());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUnconventionalOperName.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUnconventionalOperName.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUnconventionalOperName.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUnconventionalOperName.java 2011-06-22 13:37:05-0700
@@ -213,6 +213,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getOperation());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUnconventionalPackName.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUnconventionalPackName.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUnconventionalPackName.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUnconventionalPackName.java 2011-06-22 13:37:05-0700
@@ -97,6 +97,7 @@
/*
* @see org.argouml.cognitive.Poster#getClarifier()
*/
+ @Override
public Icon getClarifier() {
return ClClassName.getTheInstance();
}
@@ -144,6 +145,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getPackage());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUnnavigableAssoc.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUnnavigableAssoc.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUnnavigableAssoc.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUnnavigableAssoc.java 2011-06-22 13:37:05-0700
@@ -67,15 +67,21 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
- if (!(Model.getFacade().isAAssociation(dm))) return NO_PROBLEM;
+ if (!(Model.getFacade().isAAssociation(dm))) {
+ return NO_PROBLEM;
+ }
Object asc = /*(MAssociation)*/ dm;
Collection conn = Model.getFacade().getConnections(asc);
- if (Model.getFacade().isAAssociationRole(asc))
+ if (Model.getFacade().isAAssociationRole(asc)) {
conn = Model.getFacade().getConnections(asc);
+ }
for (Iterator iter = conn.iterator(); iter.hasNext();) {
Object ae = /*(MAssociationEnd)*/ iter.next();
- if (Model.getFacade().isNavigable(ae)) return NO_PROBLEM;
+ if (Model.getFacade().isNavigable(ae)) {
+ return NO_PROBLEM;
+ }
}
return PROBLEM_FOUND;
}
@@ -83,11 +89,13 @@
/*
* @see org.argouml.cognitive.critics.Critic#getWizardClass(org.argouml.cognitive.ToDoItem)
*/
+ @Override
public Class getWizardClass(ToDoItem item) { return WizNavigable.class; }
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getAssociationClass());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUselessInterface.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUselessInterface.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUselessInterface.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUselessInterface.java 2011-06-22 13:37:05-0700
@@ -71,6 +71,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!Model.getFacade().isAInterface(dm)) {
return NO_PROBLEM;
@@ -96,6 +97,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getInterface());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUtilityViolated.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUtilityViolated.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUtilityViolated.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrUtilityViolated.java 2011-06-22 13:37:05-0700
@@ -114,6 +114,7 @@
/*
* @see org.argouml.uml.cognitive.critics.CrUML#getCriticizedDesignMaterials()
*/
+ @Override
public Set<Object> getCriticizedDesignMaterials() {
Set<Object> ret = new HashSet<Object>();
ret.add(Model.getMetaTypes().getClassifier());
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrWrongLinkEnds.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrWrongLinkEnds.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrWrongLinkEnds.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrWrongLinkEnds.java 2011-06-22 13:37:05-0700
@@ -72,10 +72,14 @@
*/
@Override
public boolean predicate2(Object dm, Designer dsgr) {
- if (!(dm instanceof UMLDeploymentDiagram)) return NO_PROBLEM;
+ if (!(dm instanceof UMLDeploymentDiagram)) {
+ return NO_PROBLEM;
+ }
UMLDeploymentDiagram dd = (UMLDeploymentDiagram) dm;
ListSet offs = computeOffenders(dd);
- if (offs == null) return NO_PROBLEM;
+ if (offs == null) {
+ return NO_PROBLEM;
+ }
return PROBLEM_FOUND;
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrZeroLengthEdge.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrZeroLengthEdge.java?view=diff&pathrev=19577&r1=19576&r2=19577
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrZeroLengthEdge.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrZeroLengthEdge.java 2011-06-22 13:37:05-0700
@@ -73,11 +73,16 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
- if (!(dm instanceof FigEdge)) return NO_PROBLEM;
+ if (!(dm instanceof FigEdge)) {
+ return NO_PROBLEM;
+ }
FigEdge fe = (FigEdge) dm;
int length = fe.getPerimeterLength();
- if (length > THRESHOLD) return NO_PROBLEM;
+ if (length > THRESHOLD) {
+ return NO_PROBLEM;
+ }
return PROBLEM_FOUND;
}
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2772373
To unsubscribe from this discussion, e-mail: [[email protected] ].