Login | Register
My pages Projects Community openCollabNet

Discussions > Commits > svn commit: r143 - trunk/src/argouml-app/src/org/argouml: application/helpers kernel persistence ui/cmd

argouml-spl
Discussion topic

Back to topic list

svn commit: r143 - trunk/src/argouml-app/src/org/argouml: application/helpers kernel persistence ui/cmd

Author marcusvnac
Full name Marcus Vinícius de Ávila Couto
Date 2011-10-06 17:34:02 PDT
Message Author: marcusvnac
Date: 2011-10-06 17:34:01-0700
New Revision: 143

Modified:
   trunk/src/argouml-ap​p/src/org/argouml/ap​plication/helpers/Ap​plicationVersion.jav​a
   trunk/src/argouml-ap​p/src/org/argouml/ke​rnel/MemberList.java​
   trunk/src/argouml-ap​p/src/org/argouml/pe​rsistence/OffenderXM​LHelper.java
   trunk/src/argouml-ap​p/src/org/argouml/pe​rsistence/TodoTokenT​able.java
   trunk/src/argouml-ap​p/src/org/argouml/pe​rsistence/XmiFilePer​sister.java
   trunk/src/argouml-ap​p/src/org/argouml/ui​/cmd/GenericArgoMenu​Bar.java
   trunk/src/argouml-ap​p/src/org/argouml/ui​/cmd/ShortcutMgr.jav​a

Log:
Fix from Christian Kaestner.

Modified: trunk/src/argouml-ap​p/src/org/argouml/ap​plication/helpers/Ap​plicationVersion.jav​a
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/applic​ation/helpers/Applic​ationVersion.java?vi​ew=diff&pathrev=​143&r1=142&r​2=143
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/ap​plication/helpers/Ap​plicationVersion.jav​a (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/ap​plication/helpers/Ap​plicationVersion.jav​a 2011-10-06 17:34:01-0700
@@ -45,7 +45,9 @@
     public static String getVersion() {
         return version;
     }
-
+
+ //#if defined(COGNITIVE)
+ //@#$LPS-LOGGING:Gr​anularityType:Method​
     /**
      * Retrieve the online HTML manual of ArgoUML for a critic.
      * You need to append the critic class-name.
@@ -65,7 +67,8 @@
             + stableVersion
             + "-single/argomanual.​html#critics.";
     }
-
+ //#endif
+
     /**
      * Retrieve the URL of the online manual of ArgoUML.
      *

Modified: trunk/src/argouml-ap​p/src/org/argouml/ke​rnel/MemberList.java​
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/kernel​/MemberList.java?vie​w=diff&pathrev=1​43&r1=142&r2​=143
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/ke​rnel/MemberList.java​ (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/ke​rnel/MemberList.java​ 2011-10-06 17:34:01-0700
@@ -86,8 +86,11 @@
 
     private List<ProjectMembe​rDiagram> diagramMembers =
         new ArrayList<Project​MemberDiagram>(10​);
-
+
+ //#if defined(COGNITIVE)
+ //@#$LPS-LOGGING:Gr​anularityType:Field
     private AbstractProjectMember todoList;
+ //#endif
     private AbstractProjectMember profileConfiguration;
 
     /**
@@ -139,15 +142,20 @@
         if (model == member) {
             model = null;
             return true;
- } else if (todoList == member) {
+ }
+ //#if defined(COGNITIVE)
+ //@#$LPS-COGNITIVE:​GranularityType:Stat​ement
+ else if (todoList == member) {
             //#if defined(LOGGING)
             //@#$LPS-LOGGING:Gr​anularityType:Statem​ent
             //@#$LPS-LOGGING:Lo​calization:NestedSta​tement
             LOG.info("Removing todo list");
             //#endif
- setTodoList(null);
+ setTodoList(null);
             return true;
- } else if (profileConfiguration == member) {
+ }
+ //#endif
+ else if (profileConfiguration == member) {
             //#if defined(LOGGING)
             //@#$LPS-LOGGING:Gr​anularityType:Statem​ent
             //@#$LPS-LOGGING:Lo​calization:NestedSta​tement
@@ -195,9 +203,12 @@
             temp.add(model);
         }
         temp.addAll(diagramMembers);
+ //#if defined(COGNITIVE)
+ //@#$LPS-LOGGING:Gr​anularityType:Statem​ent
         if (todoList != null) {
             temp.add(todoList);
         }
+ //#endif
         return temp;
     }
     
@@ -222,9 +233,12 @@
         if (model != null) {
             ++size;
         }
+ //#if defined(COGNITIVE)
+ //@#$LPS-COGNITIVE:​GranularityType:Stat​ement
         if (todoList != null) {
             ++size;
         }
+ //#endif
         if (profileConfiguration != null) {
             ++size;
         }
@@ -232,9 +246,12 @@
     }
 
     public synchronized boolean contains(Object member) {
+ //#if defined(COGNITIVE)
+ //@#$LPS-LOGGING:Gr​anularityType:Statem​ent
         if (todoList == member) {
             return true;
         }
+ //#endif
         if (model == member) {
             return true;
         }
@@ -253,9 +270,12 @@
         if (model != null) {
             model.remove();
         }
+ //#if defined(COGNITIVE)
+ //@#$LPS-LOGGING:Gr​anularityType:Statem​ent
         if (todoList != null) {
             todoList.remove();
         }
+ //#endif
         if (profileConfiguration != null) {
             profileConfiguration.remove();
         }
@@ -275,11 +295,17 @@
         }
 
         if (i == diagramMembers.size()) {
+ //#if defined(COGNITIVE)
+ //@#$LPS-LOGGING:Gr​anularityType:Statem​ent
             if (todoList != null) {
                 return todoList;
             } else {
+ //#endif
                 return profileConfiguration;
+ //#if defined(COGNITIVE)
+ //@#$LPS-LOGGING:Gr​anularityType:Statem​ent
             }
+ //#endif
         }
         
         if (i == (diagramMembers.size() + 1)) {
@@ -302,15 +328,20 @@
         for (ProjectMemberDiagram d : diagramMembers) {
             temp[pos++] = d;
         }
+ //#if defined(COGNITIVE)
+ //@#$LPS-COGNITIVE:​GranularityType:Stat​ement
         if (todoList != null) {
             temp[pos++] = todoList;
         }
+ //#endif
         if (profileConfiguration != null) {
             temp[pos++] = profileConfiguration;
         }
         return temp;
     }
-
+
+ //#if defined(COGNITIVE)
+ //@#$LPS-LOGGING:Gr​anularityType:Method​
     private void setTodoList(Abstract​ProjectMember member) {
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Statem​ent
@@ -319,6 +350,7 @@
         //#endif
         todoList = member;
     }
+ //#endif
 
     public <T> T[] toArray(T[] a) {
         throw new UnsupportedOperation​Exception();

Modified: trunk/src/argouml-ap​p/src/org/argouml/pe​rsistence/OffenderXM​LHelper.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/persis​tence/OffenderXMLHel​per.java?view=diff​&pathrev=143&r​1=142&r2=143
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/pe​rsistence/OffenderXM​LHelper.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/pe​rsistence/OffenderXM​LHelper.java 2011-10-06 17:34:01-0700
@@ -1,3 +1,6 @@
+//#if defined(COGNITIVE)
+//@#$LPS-COGNITIVE​:GranularityType:Cla​ss
+
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -66,3 +69,4 @@
     }
 }
 
+//#endif
\ No newline at end of file

Modified: trunk/src/argouml-ap​p/src/org/argouml/pe​rsistence/TodoTokenT​able.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/persis​tence/TodoTokenTable​.java?view=diff&​pathrev=143&r1=1​42&r2=143
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/pe​rsistence/TodoTokenT​able.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/pe​rsistence/TodoTokenT​able.java 2011-10-06 17:34:01-0700
@@ -1,3 +1,6 @@
+//#if defined(COGNITIVE)
+//@#$LPS-COGNITIVE​:GranularityType:Cla​ss
+
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -107,3 +110,4 @@
     }
 }
 
+//#endif
\ No newline at end of file

Modified: trunk/src/argouml-ap​p/src/org/argouml/pe​rsistence/XmiFilePer​sister.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/persis​tence/XmiFilePersist​er.java?view=diff​&pathrev=143&r1​=142&r2=143
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/pe​rsistence/XmiFilePer​sister.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/pe​rsistence/XmiFilePer​sister.java 2011-10-06 17:34:01-0700
@@ -69,8 +69,10 @@
     //#endif
     private List<String> pgmlStrings = new ArrayList<String>();
     
+ //#if defined(COGNITIVE)
+ //@#$LPS-LOGGING:Gr​anularityType:Field
     private String todoString;
-
+ //#endif
     private String argoString;
     
     /**

Modified: trunk/src/argouml-ap​p/src/org/argouml/ui​/cmd/GenericArgoMenu​Bar.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/ui/cmd​/GenericArgoMenuBar.​java?view=diff&p​athrev=143&r1=14​2&r2=143
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/ui​/cmd/GenericArgoMenu​Bar.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/ui​/cmd/GenericArgoMenu​Bar.java 2011-10-06 17:34:01-0700
@@ -219,12 +219,13 @@
      * This should be invoked automatically when importing sources.
      */
     private ArgoJMenu arrange;
-
+ //#if defined(COGNITIVE)
+ //@#$LPS-LOGGING:Gr​anularityType:Field
     /**
      * The critique menu.
      */
     private ArgoJMenu critique;
-
+ //#endif
     /**
      * It needs it. Currently there is only system information and an about
      * text. Hyperlinking to online docs at argouml.org is considered to be a

Modified: trunk/src/argouml-ap​p/src/org/argouml/ui​/cmd/ShortcutMgr.jav​a
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/ui/cmd​/ShortcutMgr.java?vi​ew=diff&pathrev=​143&r1=142&r​2=143
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/ui​/cmd/ShortcutMgr.jav​a (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/ui​/cmd/ShortcutMgr.jav​a 2011-10-06 17:34:01-0700
@@ -276,10 +276,11 @@
 
     /** Action key for open goals */
     public static final String ACTION_OPEN_GOALS = "openGoals";
-
+ //#if defined(COGNITIVE)
+ //@#$LPS-LOGGING:Gr​anularityType:Field
     /** Action key for open critics */
     public static final String ACTION_OPEN_CRITICS = "openCritics";
-
+ //#endif
     /** Action key for help */
     public static final String ACTION_HELP = "help";

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

Messages

Show all messages in topic

svn commit: r143 - trunk/src/argouml-app/src/org/argouml: application/helpers kernel persistence ui/cmd marcusvnac Marcus Vinícius de Ávila Couto 2011-10-06 17:34:02 PDT
Messages per page: