Login | Register
My pages Projects Community openCollabNet

Discussions > Commits > svn commit: r121 - trunk/src: argouml-app/src/org/argouml/application argouml-app/src/org/argouml/cognitive argouml-app/src/org/argouml/cognitive/checklist/ui argouml-app/src/org/argouml/cognitive/critics argouml-app/src/org/argouml/cognitive/critics/ui argouml-app/src/org/argouml/cognitive/ui argouml-app/src/org/argouml/notation/providers/uml argouml-app/src/org/argouml/persistence argouml-app/src/org/argouml/ui/explorer argouml-app/src/org/argouml/ui/explorer/rules argouml-app/src/org/argouml/uml/cognitive/checklist argouml-app/src/org/argouml/uml/cognitive/critics argouml-app/src/org/argouml/uml/diagram argouml-app/src/org/argouml/uml/diagram/activity/ui argouml-app/src/org/argouml/uml/diagram/collaboration argouml-app/src/org/argouml/uml/diagram/collaboration/ui argouml-app/src/org/argouml/uml/diagram/sequence argouml-app/src/org/argouml/uml/diagram/sequence/ui argouml-app/src/org/argouml/uml/diagram/state argouml-app/src/org/argouml/uml/diagram/state/ui argouml- app/src/org/argouml/uml/diagram/ui argouml-app/src/org/argouml/uml/diagram/use_case argouml-app/src/org/argouml/uml/diagram/use_case/ui argouml-app/src/org/argouml/uml/ui argouml-app/src/org/argouml/uml/ui/behavior/collaborations argouml-app/src/org/argouml/uml/ui/behavior/common_behavior argouml-app/src/org/argouml/uml/ui/behavior/state_machines argouml-core-diagrams-sequence2/src/org/argouml/sequence2 argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram

argouml-spl
Discussion topic

Back to topic list

svn commit: r121 - trunk/src: argouml-app/src/org/argouml/application argouml-app/src/org/argouml/cognitive argouml-app/src/org/argouml/cognitive/checklist/ui argouml-app/src/org/argouml/cognitive/critics argouml-app/src/org/argouml/cognitive/critics/ui argouml-app/src/org/argouml/cognitive/ui argouml-app/src/org/argouml/notation/providers/uml argouml-app/src/org/argouml/persistence argouml-app/src/org/argouml/ui/explorer argouml-app/src/org/argouml/ui/explorer/rules argouml-app/src/org/argouml/uml/cognitive/checklist argouml-app/src/org/argouml/uml/cognitive/critics argouml-app/src/org/argouml/uml/diagram argouml-app/src/org/argouml/uml/diagram/activity/ui argouml-app/src/org/argouml/uml/diagram/collaboration argouml-app/src/org/argouml/uml/diagram/collaboration/ui argouml-app/src/org/argouml/uml/diagram/sequence argouml-app/src/org/argouml/uml/diagram/sequence/ui argouml-app/src/org/argouml/uml/diagram/state argouml-app/src/org/argouml/uml/diagram/state/ui argouml- app/src/org/argouml/uml/diagram/ui argouml-app/src/org/argouml/uml/diagram/use_case argouml-app/src/org/argouml/uml/diagram/use_case/ui argouml-app/src/org/argouml/uml/ui argouml-app/src/org/argouml/uml/ui/behavior/collaborations argouml-app/src/org/argouml/uml/ui/behavior/common_behavior argouml-app/src/org/argouml/uml/ui/behavior/state_machines argouml-core-diagrams-sequence2/src/org/argouml/sequence2 argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram

Author marcusvnac
Full name Marcus Vinícius de Ávila Couto
Date 2010-09-23 17:46:02 PDT
Message Author: marcusvnac
Date: 2010-09-23 17:46:00-0700
New Revision: 121

Modified:
   trunk/src/argouml-ap​p/src/org/argouml/ap​plication/StartCriti​cs.java
   trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/Critic.java
   trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ResolvedCrit​ic.java
   trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ToDoList.jav​a
   trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/checklist/ui​/TabChecklist.java
   trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/critics/Snoo​zeOrder.java
   trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/critics/ui/C​riticBrowserDialog.j​ava
   trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/critics/ui/T​ableModelCritics.jav​a
   trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/DismissTo​DoItemDialog.java
   trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoByDec​ision.java
   trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoByGoa​l.java
   trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoByOff​ender.java
   trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoByPos​ter.java
   trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoByPri​ority.java
   trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoByTyp​e.java
   trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoPane.​java
   trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoPersp​ective.java
   trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/WizDescri​ption.java
   trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/StateBodyNotationUm​l.java
   trunk/src/argouml-ap​p/src/org/argouml/pe​rsistence/TodoListMe​mberFilePersister.ja​va
   trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/ExplorerPo​pup.java
   trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoCo​llaborationToDiagram​.java
   trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoNa​mespaceToDiagram.jav​a
   trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoSt​atemachineToDiagram.​java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/cognitive/checklis​t/UMLCheckItem.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/cognitive/critics/​ChildGenUML.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/cognitive/critics/​ClAttributeCompartme​nt.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/cognitive/critics/​CrCircularCompositio​n.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/cognitive/critics/​CrCircularInheritanc​e.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/cognitive/critics/​CrEmptyPackage.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/cognitive/critics/​CrMultipleDeepHistor​yStates.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/cognitive/critics/​CrMultipleInitialSta​tes.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/cognitive/critics/​CrMultipleShallowHis​toryStates.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/cognitive/critics/​CrNodesOverlap.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/cognitive/critics/​CrUML.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/cognitive/critics/​ProfileGoodPractices​.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/cognitive/critics/​WizAssocComposite.ja​va
   trunk/src/argouml-ap​p/src/org/argouml/um​l/cognitive/critics/​WizBreakCircularComp​.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/cognitive/critics/​WizMEName.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/cognitive/critics/​WizManyNames.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/cognitive/critics/​WizNavigable.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/cognitive/critics/​WizOperName.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/DiagramFac​tory.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/activity/u​i/UMLActivityDiagram​.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/collaborat​ion/CollabDiagramGra​phModel.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/collaborat​ion/ui/CollabDiagram​Renderer.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/collaborat​ion/ui/UMLCollaborat​ionDiagram.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/S​equenceDiagramGraphM​odel.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigClassifierRole.​java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigLifeLine.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/FigMessagePort.jav​a
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/ModeCreateMessage.​java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/SequenceDiagramLay​er.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/sequence/u​i/SequenceDiagramRen​derer.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/state/Stat​eDiagramGraphModel.j​ava
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/state/ui/F​igFinalState.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/state/ui/F​igState.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/state/ui/F​igStateVertex.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/state/ui/F​igStubState.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/state/ui/S​tateDiagramRenderer.​java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/state/ui/U​MLStateDiagram.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/ui/ActionA​ddConcurrentRegion.j​ava
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/ui/ActionA​ddMessage.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/U​seCaseDiagramGraphMo​del.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/UMLUseCaseDiagram.​java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/use_case/u​i/UseCaseDiagramRend​erer.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/ActionDeleteMod​elElements.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/ActionSequenceD​iagram.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/ActionUseCaseDi​agram.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/ElementPropPane​lFactory.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/UMLTimeExpressi​onModel.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/collab​orations/UMLClassifi​erRoleAvailableConte​ntsListModel.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/common​_behavior/PropPanelS​timulus.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/ui/behavior/state_​machines/ActionAddEv​entAsDeferrableEvent​.java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/SequenceDiag​ramModule.java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/Acti​onAddClassifierRole.​java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/FigC​lassifierRole.java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/FigM​essage.java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/Mode​CreateMessage.java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/Sele​ctionMessage.java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/Sequ​enceDiagramFactory.j​ava
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/Sequ​enceDiagramGraphMode​l.java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/Sequ​enceDiagramRenderer.​java
   trunk/src/argouml-co​re-diagrams-sequence​2/src/org/argouml/se​quence2/diagram/UMLS​equenceDiagram.java

Log:
Fix metrics annotations.

Modified: trunk/src/argouml-ap​p/src/org/argouml/ap​plication/StartCriti​cs.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/applic​ation/StartCritics.j​ava?view=diff&pa​threv=121&r1=120​&r2=121
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/ap​plication/StartCriti​cs.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/ap​plication/StartCriti​cs.java 2010-09-23 17:46:00-0700
@@ -29,6 +29,7 @@
 
 //#if defined(LOGGING)
 //@#$LPS-LOGGING:Gr​anularityType:Import​
+//@#$LPS-LOGGING:L​ocalization:NestedIf​def-COGNITIVE
 import org.apache.log4j.Logger;
 //#endif
 import org.argouml.applicat​ion.api.Argo;
@@ -49,6 +50,7 @@
 public class StartCritics implements Runnable {
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Field
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     /**
      * Logger.
      */
@@ -74,6 +76,7 @@
         }
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
         LOG.info("spawned critiquing thread");
         //#endif
         dsgr.getDecisionMode​l().startConsidering​(UMLDecision.CLASS_S​ELECTION);

Modified: trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/Critic.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/cognit​ive/Critic.java?view​=diff&pathrev=12​1&r1=120&r2=​121
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/Critic.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/Critic.java 2010-09-23 17:46:00-0700
@@ -39,6 +39,7 @@
 
 //#if defined(LOGGING)
 //@#$LPS-LOGGING:Gr​anularityType:Import​
+//@#$LPS-LOGGING:L​ocalization:NestedIf​def-COGNITIVE
 import org.apache.log4j.Logger;
 //#endif
 import org.argouml.applicat​ion.helpers.Applicat​ionVersion;
@@ -67,6 +68,7 @@
     implements Poster, Serializable {
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Field
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     /**
      * Logger.
      */
@@ -450,6 +452,7 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         //@#$LPS-LOGGING:Lo​calization:NestedCom​mand
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
         LOG.warn("got to stillvalid while not active");
         //#endif
         return false;
@@ -801,12 +804,14 @@
                 //#if defined(LOGGING)
                 //@#$LPS-LOGGING:Gr​anularityType:Comman​d
                 //@#$LPS-LOGGING:Lo​calization:NestedCom​mand
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
                 LOG.error("Could not access wizard: ", illEx);
                 //#endif
             } catch (InstantiationException instEx) {
                 //#if defined(LOGGING)
                 //@#$LPS-LOGGING:Gr​anularityType:Comman​d
                 //@#$LPS-LOGGING:Lo​calization:NestedCom​mand
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
                 LOG.error("Could not instantiate wizard: ", instEx);
                 //#endif
             }

Modified: trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ResolvedCrit​ic.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/cognit​ive/ResolvedCritic.j​ava?view=diff&pa​threv=121&r1=120​&r2=121
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ResolvedCrit​ic.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ResolvedCrit​ic.java 2010-09-23 17:46:00-0700
@@ -32,6 +32,7 @@
 
 //#if defined(LOGGING)
 //@#$LPS-LOGGING:Gr​anularityType:Import​
+//@#$LPS-LOGGING:L​ocalization:NestedIf​def-COGNITIVE
 import org.apache.log4j.Logger;
 //#endif
 import org.argouml.util.ItemUID;
@@ -47,6 +48,7 @@
 public class ResolvedCritic {
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Field
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     /**
      * The logger.
      */
@@ -260,6 +262,7 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         //@#$LPS-LOGGING:Lo​calization:NestedCom​mand
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
         LOG.warn("Offender " + obj.getClass() + " unresolvable");
         //#endif
         // Use this for fast fail instead.

Modified: trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ToDoList.jav​a
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/cognit​ive/ToDoList.java?vi​ew=diff&pathrev=​121&r1=120&r​2=121
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ToDoList.jav​a (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ToDoList.jav​a 2010-09-23 17:46:00-0700
@@ -40,6 +40,7 @@
 
 //#if defined(LOGGING)
 //@#$LPS-LOGGING:Gr​anularityType:Import​
+//@#$LPS-LOGGING:L​ocalization:NestedIf​def-COGNITIVE
 import org.apache.log4j.Logger;
 //#endif
 import org.argouml.i18n.Translator;
@@ -76,6 +77,7 @@
 public class ToDoList extends Observable implements Runnable {
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Field
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     /**
      * Logger.
      */
@@ -182,6 +184,7 @@
                         //#if defined(LOGGING)
                         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
                         //@#$LPS-LOGGING:Lo​calization:NestedCom​mand
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
                         LOG.error("Interrupt​edException!!!", ignore);
                         //#endif
                     }
@@ -195,6 +198,7 @@
             } catch (InterruptedException ignore) {
                 //#if defined(LOGGING)
                 //@#$LPS-LOGGING:Gr​anularityType:Comman​d
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
                 LOG.error("Interrupt​edException!!!", ignore);
                 //#endif
             }
@@ -247,6 +251,7 @@
                     //#if defined(LOGGING)
                     //@#$LPS-LOGGING:Gr​anularityType:Comman​d
                     //@#$LPS-LOGGING:Lo​calization:NestedCom​mand
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
                     LOG.error(buf.toString(), ex);
                     //#endif
                 }
@@ -470,6 +475,7 @@
                         //#if defined(LOGGING)
                         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
                         //@#$LPS-LOGGING:Lo​calization:NestedCom​mand
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
                         LOG.debug("ToDoItem not added because it was resolved");
                         //#endif
                         return;
@@ -598,6 +604,7 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         //@#$LPS-LOGGING:Lo​calization:StartMeth​od
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
         LOG.debug("removing all todo items");
         //#endif
         List<ToDoItem> oldItems = new ArrayList<ToDoIte​m>(items);

Modified: trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/checklist/ui​/TabChecklist.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/cognit​ive/checklist/ui/Tab​Checklist.java?view=​diff&pathrev=121​&r1=120&r2=1​21
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/checklist/ui​/TabChecklist.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/checklist/ui​/TabChecklist.java 2010-09-23 17:46:00-0700
@@ -49,6 +49,7 @@
 
 //#if defined(LOGGING)
 //@#$LPS-LOGGING:Gr​anularityType:Import​
+//@#$LPS-LOGGING:L​ocalization:NestedIf​def-COGNITIVE
 import org.apache.log4j.Logger;
 //#endif
 import org.argouml.applicat​ion.api.AbstractArgo​JPanel;
@@ -297,6 +298,7 @@
     implements VetoableChangeListener, PropertyChangeListener {
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Field
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     /**
      * Logger.
      */
@@ -428,6 +430,7 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         //@#$LPS-LOGGING:Lo​calization:StartMeth​od
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     LOG.debug("setting table value " + rowIndex + ", " + columnIndex);
     //#endif
     if (columnIndex != 0) {

Modified: trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/critics/Snoo​zeOrder.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/cognit​ive/critics/SnoozeOr​der.java?view=diff​&pathrev=121&r​1=120&r2=121
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/critics/Snoo​zeOrder.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/critics/Snoo​zeOrder.java 2010-09-23 17:46:00-0700
@@ -32,6 +32,7 @@
 
 //#if defined(LOGGING)
 //@#$LPS-LOGGING:Gr​anularityType:Import​
+//@#$LPS-LOGGING:L​ocalization:NestedIf​def-COGNITIVE
 import org.apache.log4j.Logger;
 //#endif
 
@@ -50,6 +51,7 @@
 public class SnoozeOrder implements Serializable {
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Field
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     /**
      * Logger.
      */
@@ -138,6 +140,7 @@
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Comman​d
     //@#$LPS-LOGGING:Lo​calization:EndMethod​
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     LOG.info("Setting snooze order to: " + snoozeUntil.toString());
     //#endif
     }

Modified: trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/critics/ui/C​riticBrowserDialog.j​ava
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/cognit​ive/critics/ui/Criti​cBrowserDialog.java?​view=diff&pathre​v=121&r1=120​&r2=121
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/critics/ui/C​riticBrowserDialog.j​ava (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/critics/ui/C​riticBrowserDialog.j​ava 2010-09-23 17:46:00-0700
@@ -58,6 +58,7 @@
 
 //#if defined(LOGGING)
 //@#$LPS-LOGGING:Gr​anularityType:Import​
+//@#$LPS-LOGGING:L​ocalization:NestedIf​def-COGNITIVE
 import org.apache.log4j.Logger;
 //#endif
 import org.argouml.cognitive.Critic;
@@ -82,6 +83,7 @@
                Observer {
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Field
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     private static final Logger LOG =
     Logger.getLogger(Cri​ticBrowserDialog.cla​ss);
     //#endif
@@ -392,6 +394,7 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Method​Body
     //@#$LPS-LOGGING:Lo​calization:NestedCom​mand
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     LOG.debug("setting clarifier usage rule");
     //#endif
     }
@@ -412,6 +415,7 @@
     if (e.getSource() == networkButton) {
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
         LOG.debug("TODO: network!");
         //#endif
         return;
@@ -419,6 +423,7 @@
     if (e.getSource() == configButton) {
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
         LOG.debug("TODO: config!");
         //#endif
         return;
@@ -436,6 +441,7 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         //@#$LPS-LOGGING:Lo​calization:EndMethod​
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     LOG.debug("unknown src in CriticBrowserDialog: " + e.getSource());
     //#endif
     }
@@ -449,12 +455,14 @@
     if (src != table.getSelectionModel()) {
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
         LOG.debug("src = " + src);
         //#endif
         return;
     }
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Comman​d
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     LOG.debug("got valueChanged from " + src);
     //#endif
     int row = table.getSelectedRow();
@@ -484,6 +492,7 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         //@#$LPS-LOGGING:Lo​calization:StartMeth​od
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     LOG.debug(getClass().getName() + " insert");
     //#endif
     Document hDoc = headline.getDocument();
@@ -506,6 +515,7 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Method​Body
         //@#$LPS-LOGGING:Lo​calization:EntireMet​hod
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     LOG.debug(getClass().getName() + " changed");
     //#endif
     // Apparently, this method is never called.
@@ -523,8 +533,9 @@
         setTargetUseClarifiers();
     }
     //#if defined(LOGGING)
+ //@#$LPS-LOGGING:Gr​anularityType:Comman​d
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     else {
- //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         LOG.debug("unknown itemStateChanged src: " + src);
     }
     //#endif

Modified: trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/critics/ui/T​ableModelCritics.jav​a
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/cognit​ive/critics/ui/Table​ModelCritics.java?vi​ew=diff&pathrev=​121&r1=120&r​2=121
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/critics/ui/T​ableModelCritics.jav​a (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/critics/ui/T​ableModelCritics.jav​a 2010-09-23 17:46:00-0700
@@ -40,6 +40,7 @@
 
 //#if defined(LOGGING)
 //@#$LPS-LOGGING:Gr​anularityType:Import​
+//@#$LPS-LOGGING:L​ocalization:NestedIf​def-COGNITIVE
 import org.apache.log4j.Logger;
 //#endif
 import org.argouml.cognitive.Agency;
@@ -58,6 +59,7 @@
     implements VetoableChangeListener {
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Field
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     private static final Logger LOG =
         Logger.getLogger(Tab​leModelCritics.class​);
     //#endif
@@ -192,6 +194,7 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         //@#$LPS-LOGGING:Lo​calization:StartMeth​od
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
         LOG.debug("setting table value " + rowIndex + ", " + columnIndex);
         //#endif
         if (columnIndex != 0) return;

Modified: trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/DismissTo​DoItemDialog.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/cognit​ive/ui/DismissToDoIt​emDialog.java?view=d​iff&pathrev=121​&r1=120&r2=12​1
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/DismissTo​DoItemDialog.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/DismissTo​DoItemDialog.java 2010-09-23 17:46:00-0700
@@ -43,6 +43,7 @@
 
 //#if defined(LOGGING)
 //@#$LPS-LOGGING:Gr​anularityType:Import​
+//@#$LPS-LOGGING:L​ocalization:NestedIf​def-COGNITIVE
 import org.apache.log4j.Logger;
 //#endif
 import org.argouml.cognitive.Designer;
@@ -60,6 +61,7 @@
 public class DismissToDoItemDialog extends ArgoDialog {
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Field
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     private static final Logger LOG =
         Logger.getLogger(Dis​missToDoItemDialog.c​lass);
     //#endif
@@ -165,8 +167,9 @@
                     explain(e);
                 }
                 //#if defined(LOGGING)
+ //@#$LPS-LOGGING:Gr​anularityType:Comman​d
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
                 else {
- //@#$LPS-LOGGING:Gr​anularityType:Comman​d
                     LOG.warn("DissmissTo​DoItemDialog: Unknown action: " + e);
                 }
                 //#endif
@@ -247,6 +250,7 @@
         catch (UnresolvableException ure) {
             //#if defined(LOGGING)
             //@#$LPS-LOGGING:Gr​anularityType:Comman​d
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
             LOG.error("Resolve failed (ure): ", ure);
             //#endif
             JOptionPane.showMessageDialog(

Modified: trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoByDec​ision.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/cognit​ive/ui/ToDoByDecisio​n.java?view=diff​&pathrev=121&r1=​120&r2=121
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoByDec​ision.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoByDec​ision.java 2010-09-23 17:46:00-0700
@@ -31,6 +31,7 @@
 
 //#if defined(LOGGING)
 //@#$LPS-LOGGING:Gr​anularityType:Import​
+//@#$LPS-LOGGING:L​ocalization:NestedIf​def-COGNITIVE
 import org.apache.log4j.Logger;
 //#endif
 import org.argouml.cognitive.Decision;
@@ -46,6 +47,7 @@
     implements ToDoListListener {
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Field
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     private static final Logger LOG =
         Logger.getLogger(ToD​oByDecision.class);
     //#endif
@@ -69,6 +71,7 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         //@#$LPS-LOGGING:Lo​calization:StartMeth​od
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     LOG.debug("toDoItemChanged");
     //#endif
         List<ToDoItem> items = tde.getToDoItemList();
@@ -110,6 +113,7 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         //@#$LPS-LOGGING:Lo​calization:StartMeth​od
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     LOG.debug("toDoItemAdded");
     //#endif
     List<ToDoItem> items = tde.getToDoItemList();
@@ -151,6 +155,7 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         //@#$LPS-LOGGING:Lo​calization:StartMeth​od
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     LOG.debug("toDoItemRemoved");
     //#endif
     List<ToDoItem> items = tde.getToDoItemList();
@@ -161,6 +166,7 @@
                 .getDecisionList()) {
             //#if defined(LOGGING)
             //@#$LPS-LOGGING:Gr​anularityType:Comman​d
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
         LOG.debug("toDoItemRemoved updating decision node!");
         //#endif
         boolean anyInDec = false;

Modified: trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoByGoa​l.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/cognit​ive/ui/ToDoByGoal.ja​va?view=diff&pat​hrev=121&r1=120​&r2=121
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoByGoa​l.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoByGoa​l.java 2010-09-23 17:46:00-0700
@@ -29,6 +29,7 @@
 
 //#if defined(LOGGING)
 //@#$LPS-LOGGING:Gr​anularityType:Import​
+//@#$LPS-LOGGING:L​ocalization:NestedIf​def-COGNITIVE
 import org.apache.log4j.Logger;
 //#endif
 import org.argouml.cognitive.Designer;
@@ -45,6 +46,7 @@
     implements ToDoListListener {
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Field
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     private static final Logger LOG =
         Logger.getLogger(ToD​oByGoal.class);
     //#endif
@@ -67,7 +69,8 @@
     public void toDoItemsChanged(ToDoListEvent tde) {
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
- //@#$LPS-LOGGING:Lo​calization:StartMeth​od
+ //@#$LPS-LOGGING:Lo​calization:StartMeth​od
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     LOG.debug("toDoItemsChanged");
     //#endif
     Object[] path = new Object[2];
@@ -105,6 +108,7 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         //@#$LPS-LOGGING:Lo​calization:StartMeth​od
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     LOG.debug("toDoItemAdded");
     //#endif
     Object[] path = new Object[2];
@@ -145,6 +149,7 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         //@#$LPS-LOGGING:Lo​calization:StartMeth​od
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     LOG.debug("toDoItemAdded");
     //#endif
     Object[] path = new Object[2];
@@ -153,6 +158,7 @@
         for (Goal g : Designer.theDesigner​().getGoalList()) {
             //#if defined(LOGGING)
             //@#$LPS-LOGGING:Gr​anularityType:Comman​d
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
         LOG.debug("toDoItemRemoved updating decision node!");
         //#endif
         boolean anyInGoal = false;

Modified: trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoByOff​ender.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/cognit​ive/ui/ToDoByOffende​r.java?view=diff​&pathrev=121&r1=​120&r2=121
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoByOff​ender.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoByOff​ender.java 2010-09-23 17:46:00-0700
@@ -31,6 +31,7 @@
 
 //#if defined(LOGGING)
 //@#$LPS-LOGGING:Gr​anularityType:Import​
+//@#$LPS-LOGGING:L​ocalization:NestedIf​def-COGNITIVE
 import org.apache.log4j.Logger;
 //#endif
 import org.argouml.cognitive.Designer;
@@ -47,6 +48,7 @@
         implements ToDoListListener {
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Field
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     private static final Logger LOG = Logger.getLogger(ToD​oByOffender.class);
     //#endif
     /**
@@ -68,6 +70,7 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         //@#$LPS-LOGGING:Lo​calization:StartMeth​od
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
         LOG.debug("toDoItemsChanged");
         //#endif
         List<ToDoItem> items = tde.getToDoItemList();
@@ -119,6 +122,7 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         //@#$LPS-LOGGING:Lo​calization:StartMeth​od
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
         LOG.debug("toDoItemAdded");
         //#endif
         List<ToDoItem> items = tde.getToDoItemList();
@@ -172,6 +176,7 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         //@#$LPS-LOGGING:Lo​calization:StartMeth​od
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
         LOG.debug("toDoItemRemoved");
         //#endif
         List<ToDoItem> items = tde.getToDoItemList();
@@ -198,6 +203,7 @@
                 }
                 //#if defined(LOGGING)
                 //@#$LPS-LOGGING:Gr​anularityType:Comman​d
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
                 LOG.debug("toDoItemRemoved updating PriorityNode");
                 //#endif
                 path[1] = off;

Modified: trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoByPos​ter.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/cognit​ive/ui/ToDoByPoster.​java?view=diff&p​athrev=121&r1=12​0&r2=121
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoByPos​ter.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoByPos​ter.java 2010-09-23 17:46:00-0700
@@ -31,6 +31,7 @@
 
 //#if defined(LOGGING)
 //@#$LPS-LOGGING:Gr​anularityType:Import​
+//@#$LPS-LOGGING:L​ocalization:NestedIf​def-COGNITIVE
 import org.apache.log4j.Logger;
 //#endif
 import org.argouml.cognitive.Designer;
@@ -48,6 +49,7 @@
     implements ToDoListListener {
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Field
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     private static final Logger LOG =
         Logger.getLogger(ToD​oByPoster.class);
     //#endif
@@ -70,6 +72,7 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         //@#$LPS-LOGGING:Lo​calization:StartMeth​od
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     LOG.debug("toDoItemsChanged");
     //#endif
         List<ToDoItem> items = tde.getToDoItemList();
@@ -116,6 +119,7 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         //@#$LPS-LOGGING:Lo​calization:StartMeth​od
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     LOG.debug("toDoItemAdded");
     //#endif
     List<ToDoItem> items = tde.getToDoItemList();
@@ -162,6 +166,7 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         //@#$LPS-LOGGING:Lo​calization:StartMeth​od
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     LOG.debug("toDoItemRemoved");
     //#endif
         List<ToDoItem> items = tde.getToDoItemList();

Modified: trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoByPri​ority.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/cognit​ive/ui/ToDoByPriorit​y.java?view=diff​&pathrev=121&r1=​120&r2=121
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoByPri​ority.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoByPri​ority.java 2010-09-23 17:46:00-0700
@@ -31,6 +31,7 @@
 
 //#if defined(LOGGING)
 //@#$LPS-LOGGING:Gr​anularityType:Import​
+//@#$LPS-LOGGING:L​ocalization:NestedIf​def-COGNITIVE
 import org.apache.log4j.Logger;
 //#endif
 import org.argouml.cognitive.Designer;
@@ -46,6 +47,7 @@
     implements ToDoListListener {
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Field
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     private static final Logger LOG =
         Logger.getLogger(ToD​oByPriority.class);
     //#endif
@@ -68,6 +70,7 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         //@#$LPS-LOGGING:Lo​calization:StartMeth​od
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     LOG.debug("toDoItemChanged");
     //#endif
         List<ToDoItem> items = tde.getToDoItemList();
@@ -112,6 +115,7 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         //@#$LPS-LOGGING:Lo​calization:StartMeth​od
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     LOG.debug("toDoItemAdded");
     //#endif
     List<ToDoItem> items = tde.getToDoItemList();
@@ -156,6 +160,7 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         //@#$LPS-LOGGING:Lo​calization:StartMeth​od
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     LOG.debug("toDoItemRemoved");
     //#endif
         List<ToDoItem> items = tde.getToDoItemList();
@@ -178,6 +183,7 @@
             }
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
         LOG.debug("toDoItemRemoved updating PriorityNode");
         //#endif
         path[1] = pn;

Modified: trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoByTyp​e.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/cognit​ive/ui/ToDoByType.ja​va?view=diff&pat​hrev=121&r1=120​&r2=121
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoByTyp​e.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoByTyp​e.java 2010-09-23 17:46:00-0700
@@ -31,6 +31,7 @@
 
 //#if defined(LOGGING)
 //@#$LPS-LOGGING:Gr​anularityType:Import​
+//@#$LPS-LOGGING:L​ocalization:NestedIf​def-COGNITIVE
 import org.apache.log4j.Logger;
 //#endif
 import org.argouml.cognitive.Designer;
@@ -46,6 +47,7 @@
     implements ToDoListListener {
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Field
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     private static final Logger LOG =
         Logger.getLogger(ToD​oByType.class);
     //#endif
@@ -69,6 +71,7 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         //@#$LPS-LOGGING:Lo​calization:StartMeth​od
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     LOG.debug("toDoItemsChanged");
     //#endif
         List<ToDoItem> items = tde.getToDoItemList();
@@ -110,6 +113,7 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         //@#$LPS-LOGGING:Lo​calization:StartMeth​od
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     LOG.debug("toDoItemAdded");
     //#endif
         List<ToDoItem> items = tde.getToDoItemList();
@@ -151,6 +155,7 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         //@#$LPS-LOGGING:Lo​calization:StartMeth​od
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     LOG.debug("toDoItemRemoved");
     //#endif
         List<ToDoItem> items = tde.getToDoItemList();
@@ -170,6 +175,7 @@
             }
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
         LOG.debug("toDoItemRemoved updating PriorityNode");
         //#endif
         path[1] = ktn;

Modified: trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoPane.​java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/cognit​ive/ui/ToDoPane.java​?view=diff&pathr​ev=121&r1=120​&r2=121
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoPane.​java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoPane.​java 2010-09-23 17:46:00-0700
@@ -52,6 +52,7 @@
 
 //#if defined(LOGGING)
 //@#$LPS-LOGGING:Gr​anularityType:Import​
+//@#$LPS-LOGGING:L​ocalization:NestedIf​def-COGNITIVE
 import org.apache.log4j.Logger;
 //#endif
 import org.argouml.cognitive.Designer;
@@ -95,6 +96,7 @@
         ToDoListListener {
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Field
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     /**
      * Logger.
      */
@@ -297,6 +299,7 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
         //@#$LPS-LOGGING:Lo​calization:StartMeth​od
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
         LOG.debug("ToDoPane valueChanged");
         //#endif
         //TODO: should fire its own event and ProjectBrowser
@@ -305,6 +308,7 @@
         ProjectBrowser.getIn​stance().setToDoItem​(sel);
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
         LOG.debug("lastselection: " + lastSel);
     LOG.debug("sel: " + sel);
     //#endif
@@ -494,6 +498,7 @@
     } else {
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
             LOG.debug("ToDoPane setting tree model");
             //#endif
             curPerspective.setRoot(root);
@@ -549,7 +554,8 @@
         //TODO: should register a listener
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
- //@#$LPS-LOGGING:Lo​calization:EndMethod​
+ //@#$LPS-LOGGING:Lo​calization:EndMethod​
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
         LOG.debug("2: " + getSelectedObject().​toString());
         //#endif
     }

Modified: trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoPersp​ective.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/cognit​ive/ui/ToDoPerspecti​ve.java?view=diff​&pathrev=121&r1​=120&r2=121
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoPersp​ective.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/ToDoPersp​ective.java 2010-09-23 17:46:00-0700
@@ -32,6 +32,7 @@
 
 //#if defined(LOGGING)
 //@#$LPS-LOGGING:Gr​anularityType:Import​
+//@#$LPS-LOGGING:L​ocalization:NestedIf​def-COGNITIVE
 import org.apache.log4j.Logger;
 //#endif
 import org.argouml.cognitive.ToDoItem;
@@ -45,6 +46,7 @@
 public abstract class ToDoPerspective extends TreeModelComposite {
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Field
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     /**
      * Logger.
      */
@@ -158,6 +160,7 @@
     }
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Comman​d
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
         LOG.debug("addFlatChildren");
         //#endif
         // hack for to do items only, should check isLeaf(node), but that

Modified: trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/WizDescri​ption.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/cognit​ive/ui/WizDescriptio​n.java?view=diff​&pathrev=121&r1=​120&r2=121
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/WizDescri​ption.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/co​gnitive/ui/WizDescri​ption.java 2010-09-23 17:46:00-0700
@@ -35,6 +35,7 @@
 
 //#if defined(LOGGING)
 //@#$LPS-LOGGING:Gr​anularityType:Field
+//@#$LPS-LOGGING:L​ocalization:NestedIf​def-COGNITIVE
 import org.apache.log4j.Logger;
 //#endif
 import org.argouml.cognitive.Critic;
@@ -56,6 +57,7 @@
 public class WizDescription extends WizStep {
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Field
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     /**
      * Logger.
      */
@@ -75,6 +77,7 @@
     super();
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Comman​d
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     LOG.info("making WizDescription");
     //#endif
     description.setLineWrap(true);

Modified: trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/StateBodyNotationUm​l.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/notati​on/providers/uml/Sta​teBodyNotationUml.ja​va?view=diff&pat​hrev=121&r1=120​&r2=121
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/StateBodyNotationUm​l.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/no​tation/providers/uml​/StateBodyNotationUm​l.java 2010-09-23 17:46:00-0700
@@ -195,7 +195,6 @@
                     parseStateDoAction(st, line);
                     foundDo = true;
                 }
- //#if defined(STATEDIAGRAM) or defined(ACTIVITYDIAGRAM)
                 else {
                     Object t =
                         Model.getStateMachinesFactory()
@@ -215,7 +214,6 @@
                     /* Add this new one, and mark it to be retained: */
                     internalsInfo.add(t, true);
                 }
- //#endif
             }
         }
 

Modified: trunk/src/argouml-ap​p/src/org/argouml/pe​rsistence/TodoListMe​mberFilePersister.ja​va
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/persis​tence/TodoListMember​FilePersister.java?v​iew=diff&pathrev​=121&r1=120&​r2=121
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/pe​rsistence/TodoListMe​mberFilePersister.ja​va (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/pe​rsistence/TodoListMe​mberFilePersister.ja​va 2010-09-23 17:46:00-0700
@@ -57,6 +57,7 @@
 class TodoListMemberFilePersister extends MemberFilePersister {
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Field
+ //@#$LPS-LOGGING:Lo​calization:NestedIfd​ef-COGNITIVE
     private static final Logger LOG =
         Logger.getLogger(Pro​jectMemberTodoList.c​lass);
     //#endif

Modified: trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/ExplorerPo​pup.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/ExplorerPopup.​java?view=diff&p​athrev=121&r1=12​0&r2=121
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/ExplorerPo​pup.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/ExplorerPo​pup.java 2010-09-23 17:46:00-0700
@@ -300,7 +300,11 @@
                         //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Expression
                         || (stateVertexSelected
                                 && activityDiagramActive
- && diagramActivity == selectedStateMachine)
+ //#if defined(STATEDIAGRAM)
+ //@#$LPS-STATEDIAGR​AM:GranularityType:E​xpression
+ && diagramActivity == selectedStateMachine
+ //#endif
+ )
                         //#endif
                         || (stateVertexSelected
                                 //#if defined(STATEDIAGRAM)

Modified: trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoCo​llaborationToDiagram​.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoCollab​orationToDiagram.jav​a?view=diff&path​rev=121&r1=120​&r2=121
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoCo​llaborationToDiagram​.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoCo​llaborationToDiagram​.java 2010-09-23 17:46:00-0700
@@ -40,7 +40,7 @@
 import org.argouml.uml.diag​ram.collaboration.ui​.UMLCollaborationDia​gram;
 //#if defined(SEQUENCEDIAGRAM)
 //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Import
-//@#$LPS-SEQUENCED​IAGRAM:Localization:​NestedIfdef
+//@#$LPS-SEQUENCED​IAGRAM:Localization:​NestedIfdef-COLLABOR​ATIONDIAGRAM
 import org.argouml.uml.diag​ram.sequence.ui.UMLS​equenceDiagram;
 //#endif
 
@@ -78,7 +78,7 @@
             }
             //#if defined(SEQUENCEDIAGRAM)
             //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Command
- //@#$LPS-SEQUENCEDI​AGRAM:Localization:N​estedIfdef
+ //@#$LPS-SEQUENCEDI​AGRAM:Localization:N​estedIfdef-COLLABORA​TIONDIAGRAM
             /* Also show unattached sequence diagrams: */
             if ((d instanceof UMLSequenceDiagram)
                     && (Model.getFacade().g​etRepresentedClassif​ier(parent) == null)

Modified: trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoNa​mespaceToDiagram.jav​a
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoNamesp​aceToDiagram.java?vi​ew=diff&pathrev=​121&r1=120&r​2=121
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoNa​mespaceToDiagram.jav​a (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoNa​mespaceToDiagram.jav​a 2010-09-23 17:46:00-0700
@@ -83,11 +83,12 @@
                 if (diagram instanceof UMLStateDiagram
                         //#if defined(ACTIVITYDIAGRAM)
                         //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Expression
+ //@#$LPS-ACTIVITYDI​AGRAM:Localization:N​estedIfdef-STATEDIAG​RAM
                         || diagram instanceof UMLActivityDiagram
                         //#endif
                         //#if defined(SEQUENCEDIAGRAM)
                         //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Expression
- //@#$LPS-SEQUENCEDI​AGRAM:Localization:N​estedIfdef
+ //@#$LPS-SEQUENCEDI​AGRAM:Localization:N​estedIfdef-STATEDIAG​RAM
                         || diagram instanceof UMLSequenceDiagram
                         //#endif
                         ) {

Modified: trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoSt​atemachineToDiagram.​java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/ui/exp​lorer/rules/GoStatem​achineToDiagram.java​?view=diff&pathr​ev=121&r1=120​&r2=121
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoSt​atemachineToDiagram.​java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoSt​atemachineToDiagram.​java 2010-09-23 17:46:00-0700
@@ -66,6 +66,7 @@
                 //#if defined(ACTIVITYDIAGRAM)
                 //@#$LPS-ACTIVITYDI​AGRAM:GranularityTyp​e:Command
                 //@#$LPS-ACTIVITYDI​AGRAM:Localization:N​estedCommand
+ //@#$LPS-ACTI

View complete message

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

svn commit: r121 - trunk/src: argouml-app/src/org/argouml/application argouml-app/src/org/argouml/cognitive argouml-app/src/org/argouml/cognitive/checklist/ui argouml-app/src/org/argouml/cognitive/cri... marcusvnac Marcus Vinícius de Ávila Couto 2010-09-23 17:46:02 PDT
Messages per page: