Login | Register
My pages Projects Community openCollabNet

Discussions > Commits > svn commit: r148 - trunk/src/argouml-app/src/org/argouml: application/helpers kernel persistence ui/cmd ui/explorer ui/explorer/rules uml/diagram uml/diagram/sequence uml/diagram/ui

argouml-spl
Discussion topic

Hide all messages in topic

All messages in topic

svn commit: r148 - trunk/src/argouml-app/src/org/argouml: application/helpers kernel persistence ui/cmd ui/explorer ui/explorer/rules uml/diagram uml/diagram/sequence uml/diagram/ui

Author benjamin_klatt
Full name Benjamin Klatt
Date 2014-06-08 00:02:30 PDT
Message Author: benjamin_klatt
Date: 2014-06-08 00:00:05-0700
New Revision: 148

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/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
   trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/ExplorerPo​pup.java
   trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoBe​havioralFeatureToSta​teDiagram.java
   trunk/src/argouml-ap​p/src/org/argouml/ui​/explorer/rules/GoSt​atemachineToDiagram.​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/sequence/S​equenceDiagramGraphM​odel.java
   trunk/src/argouml-ap​p/src/org/argouml/um​l/diagram/ui/ActionA​ddConcurrentRegion.j​ava

Log:
Fixed pre-processor statement documenting comments

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=​148&r1=147&r​2=148
====================​====================​====================​==================
--- 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 2014-06-08 00:00:05-0700
@@ -46,10 +46,10 @@
         return version;
     }
 
- //#if defined(COGNITIVE)
- //@#$LPS-LOGGING:Gr​anularityType:Method​
+ //#if defined(COGNITIVE)
+ //@#$LPS-COGNITIVE:​GranularityType:Meth​od
     /**
- * Retrieve the online HTML manual of ArgoUML for a critic.
+ * Retrieve the online HTML manual of ArgoUML for a critic.
      * You need to append the critic class-name.
      * This syntax is synchronized with:
      * <ol>
@@ -63,15 +63,15 @@
      */
     public static String getManualForCritic() {
         return "http://argouml-stats​.tigris.org/document​ation/"
- + "manual-"
+ + "manual-"
             + stableVersion
             + "-single/argomanual.​html#critics.";
     }
     //#endif
-
+
     /**
      * Retrieve the URL of the online manual of ArgoUML.
- *
+ *
      * @return the URL
      */
     public static String getOnlineManual() {
@@ -81,7 +81,7 @@
 
     /**
      * Retrieve the URL of the location for online support for ArgoUML.
- *
+ *
      * @return the URL
      */
     public static String getOnlineSupport() {

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​48&r1=147&r2​=148
====================​====================​====================​==================
--- 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​ 2014-06-08 00:00:05-0700
@@ -44,34 +44,34 @@
 
 /**
  * List of ProjectMembers. <p>
- *
- * <p>The project members are grouped into 4 categories:
+ *
+ * <p>The project members are grouped into 4 categories:
  * model, diagrams, the todo item list and the profile configuration. <p>
  *
- * <p>The purpose of these categories is to make sure that members are read
- * and written in the correct order.
- *
+ * <p>The purpose of these categories is to make sure that members are read
+ * and written in the correct order.
+ *
  * <p>When reading the todo items it will fail if the diagrams elements or model
  * elements have not yet been read that they refer to. When reading diagrams
  * that will fail if the model elements don't yet exist that they refer to.
  * When loading the model that may fail if the correct profile has not been
  * loaded.
- *
+ *
  * <p>Hence, the save (and therefore load) order is profile, model, diagrams,
  * todo items.
  *
  * <p>This implementation supports only one profile configuration, one model
  * member, multiple diagram members, one todo list member.
- *
+ *
  * <p>Comments by mvw: <p>
- * This class should be reworked to be independent
- * of the org.argouml.uml package. That can be done by extending the
- * ProjectMember interface with functions returning the sorting order,
+ * This class should be reworked to be independent
+ * of the org.argouml.uml package. That can be done by extending the
+ * ProjectMember interface with functions returning the sorting order,
  * and if multiple entries of the same type are allowed. <p>
- *
- * In preparation, this class is made simpler by deprecating
+ *
+ * In preparation, this class is made simpler by deprecating
  * all operations that are not part of the List interface.
- *
+ *
  * @author Bob Tarling
  */
 class MemberList implements List<ProjectMember> {
@@ -84,11 +84,11 @@
     //#endif
     private AbstractProjectMember model;
 
- private List<ProjectMembe​rDiagram> diagramMembers =
+ private List<ProjectMembe​rDiagram> diagramMembers =
         new ArrayList<Project​MemberDiagram>(10​);
-
- //#if defined(COGNITIVE)
- //@#$LPS-LOGGING:Gr​anularityType:Field
+
+ //#if defined(COGNITIVE)
+ //@#$LPS-COGNITIVE:​GranularityType:Fiel​d
     private AbstractProjectMember todoList;
     //#endif
     private AbstractProjectMember profileConfiguration;
@@ -109,15 +109,15 @@
         if (member instanceof ProjectMemberModel) {
             // Always put the model at the top
             model = (AbstractProjectMember) member;
- return true;
- }
+ return true;
+ }
         //#if defined(COGNITIVE)
         //@#$LPS-COGNITIVE:​GranularityType:Stat​ement
         else if (member instanceof ProjectMemberTodoList) {
             // otherwise add the diagram at the start
- setTodoList((Abstrac​tProjectMember) member);
+ setTodoList((Abstrac​tProjectMember) member);
             return true;
- }
+ }
         //#endif
         else if (member instanceof ProfileConfiguration) {
             profileConfiguration = (AbstractProjectMember) member;
@@ -142,7 +142,7 @@
         if (model == member) {
             model = null;
             return true;
- }
+ }
         //#if defined(COGNITIVE)
         //@#$LPS-COGNITIVE:​GranularityType:Stat​ement
         else if (todoList == member) {
@@ -151,9 +151,9 @@
             //@#$LPS-LOGGING:Lo​calization:NestedSta​tement
             LOG.info("Removing todo list");
             //#endif
- setTodoList(null);
+ setTodoList(null);
             return true;
- }
+ }
         //#endif
         else if (profileConfiguration == member) {
             //#if defined(LOGGING)
@@ -190,11 +190,11 @@
     }
 
     /**
- * @return the list of members in the order that they need to be written
+ * @return the list of members in the order that they need to be written
      * out in.
      */
     private List<ProjectMember> buildOrderedMemberList() {
- List<ProjectMember> temp =
+ List<ProjectMember> temp =
             new ArrayList<Project​Member>(size());
         if (profileConfiguration != null) {
             temp.add(profileConfiguration);
@@ -203,15 +203,15 @@
             temp.add(model);
         }
         temp.addAll(diagramMembers);
- //#if defined(COGNITIVE)
- //@#$LPS-LOGGING:Gr​anularityType:Statem​ent
+ //#if defined(COGNITIVE)
+ //@#$LPS-COGNITIVE:​GranularityType:Stat​ement
         if (todoList != null) {
             temp.add(todoList);
         }
         //#endif
         return temp;
     }
-
+
     private boolean removeDiagram(ArgoDiagram d) {
         for (ProjectMemberDiagram pmd : diagramMembers) {
             if (pmd.getDiagram() == d) {
@@ -246,8 +246,8 @@
     }
 
     public synchronized boolean contains(Object member) {
- //#if defined(COGNITIVE)
- //@#$LPS-LOGGING:Gr​anularityType:Statem​ent
+ //#if defined(COGNITIVE)
+ //@#$LPS-COGNITIVE:​GranularityType:Stat​ement
         if (todoList == member) {
             return true;
         }
@@ -270,8 +270,8 @@
         if (model != null) {
             model.remove();
         }
- //#if defined(COGNITIVE)
- //@#$LPS-LOGGING:Gr​anularityType:Statem​ent
+ //#if defined(COGNITIVE)
+ //@#$LPS-COGNITIVE:​GranularityType:Stat​ement
         if (todoList != null) {
             todoList.remove();
         }
@@ -295,19 +295,19 @@
         }
 
         if (i == diagramMembers.size()) {
- //#if defined(COGNITIVE)
+ //#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
+ //#if defined(COGNITIVE)
+ //@#$LPS-COGNITIVE:​GranularityType:Stat​ement
             }
             //#endif
         }
-
+
         if (i == (diagramMembers.size() + 1)) {
             return profileConfiguration;
         }
@@ -339,9 +339,9 @@
         }
         return temp;
     }
-
- //#if defined(COGNITIVE)
- //@#$LPS-LOGGING:Gr​anularityType:Method​
+
+ //#if defined(COGNITIVE)
+ //@#$LPS-COGNITIVE:​GranularityType:Meth​od
     private void setTodoList(Abstract​ProjectMember member) {
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Statem​ent

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=148&r1​=147&r2=148
====================​====================​====================​==================
--- 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 2014-06-08 00:00:05-0700
@@ -57,9 +57,9 @@
  *
  * @author Bob Tarling
  */
-class XmiFilePersister extends AbstractFilePersister
+class XmiFilePersister extends AbstractFilePersister
     implements XmiExtensionParser {
- //#if defined(LOGGING)
+ //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Field
     /**
      * Logger.
@@ -68,13 +68,13 @@
         Logger.getLogger(Xmi​FilePersister.class)​;
     //#endif
     private List<String> pgmlStrings = new ArrayList<String>();
-
- //#if defined(COGNITIVE)
- //@#$LPS-LOGGING:Gr​anularityType:Field
+
+ //#if defined(COGNITIVE)
+ //@#$LPS-COGNITIVE:​GranularityType:Fiel​d
     private String todoString;
     //#endif
     private String argoString;
-
+
     /**
      * The constructor.
      */
@@ -116,7 +116,7 @@
         ProgressMgr progressMgr = new ProgressMgr();
         progressMgr.setNumbe​rOfPhases(4);
         progressMgr.nextPhase();
-
+
         File lastArchiveFile = new File(file.getAbsolutePath() + "~");
         File tempFile = null;
 
@@ -172,7 +172,7 @@
         }
         progressMgr.nextPhase();
     }
-
+
     /**
      * Write the output for a project on the given stream.
      *
@@ -183,9 +183,9 @@
      * @throws SaveException If something goes wrong.
      * @throws InterruptedException if the thread is interrupted
      */
- void writeProject(Project project,
- OutputStream stream,
- ProgressMgr progressMgr) throws SaveException,
+ void writeProject(Project project,
+ OutputStream stream,
+ ProgressMgr progressMgr) throws SaveException,
             InterruptedException {
 
         int size = project.getMembers().size();
@@ -240,8 +240,8 @@
         //#endif
         try {
             Project p = ProjectFactory.getIn​stance().createProje​ct();
-
-
+
+
             long length = file.length();
             long phaseSpace = 100000;
             int phases = (int) (length / phaseSpace);
@@ -257,15 +257,15 @@
             ProgressMgr progressMgr = new ProgressMgr();
             progressMgr.setNumbe​rOfPhases(phases);
             ThreadUtils.checkIfI​nterrupted();
-
+
             InputSource source = new InputSource(new XmiInputStream(file
                     .toURI().toURL().openStream(), this, phaseSpace,
                     progressMgr));
             source.setSystemId(f​ile.toURI().toURL().​toString());
-
+
             ModelMemberFilePersister modelPersister =
                 new ModelMemberFilePersister();
-
+
             modelPersister.readM​odels(source);
             Object model = modelPersister.getCurModel();
             progressMgr.nextPhase();
@@ -274,11 +274,11 @@
             p.addMember(model);
             parseXmiExtensions(p);
             modelPersister.regis​terDiagrams(p);
-
+
             p.setRoot(model);
             p.setRoots(modelPers​ister.getElementsRea​d());
             File defaultProjectFile = new File(file.getPath() + ".zargo");
- // Make sure the file doesn't exist so the user will
+ // Make sure the file doesn't exist so the user will
             // get prompted to choose a new name
             for (int i = 0; i < 99; i++) {
                 if (!defaultProjectFile.exists()) {
@@ -299,7 +299,7 @@
 
     /**
      * Returns true. All Argo specific files have an icon.
- *
+ *
      * @see org.argouml.persiste​nce.AbstractFilePers​ister#hasAnIcon()
      */
     public boolean hasAnIcon() {
@@ -317,7 +317,7 @@
             pgmlStrings.add(xmiE​xtensionString);
         } else if (label.equals("argo")) {
             argoString = xmiExtensionString;
- }
+ }
         //#if defined(COGNITIVE)
         //@#$LPS-COGNITIVE:​GranularityType:Stat​ement
         //@#$LPS-COGNITIVE:​Localization:EndMeth​od
@@ -329,12 +329,12 @@
 
     /**
      * Parse all the extensions that were found when reading XMI
- *
+ *
      * @param project
      * @exception OpenException
      */
     public void parseXmiExtensions(Project project) throws OpenException {
-
+
         if (argoString != null) {
             //#if defined(LOGGING)
             //@#$LPS-LOGGING:Gr​anularityType:Statem​ent
@@ -347,7 +347,7 @@
             } catch (Exception e) {
                 throw new OpenException("Exception caught", e);
             }
- }
+ }
         //#if defined(COGNITIVE)
         //@#$LPS-COGNITIVE:​GranularityType:Stat​ement
         else {
@@ -360,7 +360,7 @@
             LOG.info("Parsing pgml " + pgml.length());
             //#endif
             InputStream inputStream = new ByteArrayInputStream​(pgml.getBytes());
- MemberFilePersister persister =
+ MemberFilePersister persister =
             // TODO: Cyclic dependency between PersistanceManager and here
                 PersistenceManager.g​etInstance()
                         .getDiagramMemberFil​ePersister();
@@ -377,7 +377,7 @@
             //@#$LPS-LOGGING:Lo​calization:NestedSta​tement
             LOG.info("Parsing todoString " + todoString.length());
             //#endif
- InputStream inputStream =
+ InputStream inputStream =
                 new ByteArrayInputStream​(todoString.getBytes​());
             MemberFilePersister persister = null;
             persister = new TodoListMemberFilePersister();

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=148&r1=14​7&r2=148
====================​====================​====================​==================
--- 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 2014-06-08 00:00:05-0700
@@ -111,47 +111,47 @@
 import org.tigris.toolbar.T​oolBarFactory;
 
 /**
- * GenericArgoMenuBar defines the menu bar for all operating systems which do
+ * GenericArgoMenuBar defines the menu bar for all operating systems which do
  * not explicitly ask for a different kind of menu bar, such as Mac OS X.
  * <p>
- *
+ *
  * Menu's and the mnemonics of menu's and the menuitems are separated in the
  * PropertyResourceBundle <em>menu.prope​rties</em>.
  * <p>
- *
+ *
  * menu items are separated in the PropertyResourceBundle
  * <em>action.pro​perties</em>.
  * <p>
- *
+ *
  * The key's in menu.properties have the following structure:
- *
+ *
  * <pre>
  * menu: [file].[name of menu]
  * e.g: menu.file
- *
+ *
  * mnemonics of menu's: [file].[name of menu].mnemonic
  * e.g: menu.file.mnemonic
- *
+ *
  * mnemonics of menuitems: [file].[flag for item].[name of menuitem].mnemonic
  * e.g: menu.item.new.mnemonic
  * </pre>
- *
+ *
  * TODO: Add registration for new menu items.
  */
 public class GenericArgoMenuBar extends JMenuBar implements
         TargetListener {
     //#if defined(LOGGING)
     //@#$LPS-LOGGING:Gr​anularityType:Field
- private static final Logger LOG =
+ private static final Logger LOG =
         Logger.getLogger(Gen​ericArgoMenuBar.clas​s);
     //#endif
     private static List<JMenu> moduleMenus = new ArrayList<JMenu>();
 
- private static List<Action> moduleCreateDiagramActions =
+ private static List<Action> moduleCreateDiagramActions =
         new ArrayList<Action>();
-
+
     private Collection<Action> disableableActions = new ArrayList<Action>();
-
+
     /**
      * The zoom factor - defaults to 90%/110%
      */
@@ -219,8 +219,8 @@
      * This should be invoked automatically when importing sources.
      */
     private ArgoJMenu arrange;
- //#if defined(COGNITIVE)
- //@#$LPS-LOGGING:Gr​anularityType:Field
+ //#if defined(COGNITIVE)
+ //@#$LPS-COGNITIVE:​GranularityType:Fiel​d
     /**
      * The critique menu.
      */
@@ -236,7 +236,7 @@
     private Action navigateTargetForwardAction;
 
     private Action navigateTargetBackAction;
-
+
     // References to actions that we need for Mac hack
     private ActionSettings settingsAction;
     private ActionAboutArgoUML aboutAction;
@@ -258,7 +258,7 @@
         disableableActions.a​dd(navigateTargetFor​wardAction);
         navigateTargetBackAction = new NavigateTargetBackAction();
         disableableActions.a​dd(navigateTargetBac​kAction);
-
+
         TargetManager.getIns​tance().addTargetLis​tener(this);
     }
 
@@ -266,7 +266,7 @@
      * This should be a user specified option. New laws for handicapped people
      * who cannot use the mouse require software developers in US to make all
      * components of User interface accessible through keyboard
- *
+ *
      * @param item
      * is the JMenuItem to do this for.
      * @param key
@@ -296,7 +296,7 @@
     protected static final String menuLocalize(String key) {
         return Translator.localize(MENU + prepareKey(key));
     }
-
+
     /**
      * @param key the key to localize
      * @return the localized string
@@ -322,7 +322,7 @@
         initMenuTools();
         initMenuHelp();
     }
-
+
     private void initModulesUI () {
         initModulesMenus();
         initModulesActions();
@@ -411,14 +411,14 @@
         // add last recently used list _before_ exit menu
         mruList = new LastRecentlyUsedMenuList(file);
 
- // and exit menu entry starting with separator.
+ // and exit menu entry starting with separator.
         exitAction = new ActionExit();
         if (!OsUtil.isMacOSX()) {
             file.addSeparator();
             JMenuItem exitItem = file.add(exitAction);
             setMnemonic(exitItem, "Exit");
- /* The "Close window" shortcut (ALT+F4) actually can't
- * be registered as a shortcut,
+ /* The "Close window" shortcut (ALT+F4) actually can't
+ * be registered as a shortcut,
              * because it closes the configuration dialog! */
             exitItem.setAccelera​tor(KeyStroke.getKey​Stroke(KeyEvent.VK_F​4,
                     InputEvent.ALT_MASK));
@@ -437,7 +437,7 @@
         edit = add(new JMenu(menuLocalize("Edit")));
         setMnemonic(edit, "Edit");
 
-// Comment out when we are ready to release undo/redo
+// Comment out when we are ready to release undo/redo
 // JMenuItem undoItem = edit.add(
 // ProjectActions.getIn​stance().getUndoActi​on());
 // setMnemonic(undoItem, "Undo");
@@ -550,17 +550,17 @@
         setMnemonic(zoomReset, "Zoom Reset");
         ShortcutMgr.assignAc​celerator(zoomReset,​ ShortcutMgr.ACTION_ZOOM_RESET);
 
- ZoomActionProxy zoomInAction =
+ ZoomActionProxy zoomInAction =
             new ZoomActionProxy((1.0) / (ZOOM_FACTOR));
         JMenuItem zoomIn = zoom.add(zoomInAction);
         setMnemonic(zoomIn, "Zoom In");
         ShortcutMgr.assignAc​celerator(zoomIn, ShortcutMgr.ACTION_ZOOM_IN);
 
         view.addSeparator();
-
+
         JMenu grid = (JMenu) view.add(new JMenu(menuLocalize("Adjust Grid")));
         setMnemonic(grid, "Grid");
- List<Action> gridActions =
+ List<Action> gridActions =
             ActionAdjustGrid.cre​ateAdjustGridActions​(false);
         ButtonGroup groupGrid = new ButtonGroup();
         ActionAdjustGrid.set​Group(groupGrid);
@@ -611,7 +611,7 @@
      * build together to guarantee that the same items are present in both, and
      * in the same sequence.
      * <p>
- *
+ *
      * The sequence of these items was determined by issue 1821.
      */
     private void initMenuCreate() {
@@ -678,7 +678,7 @@
         ShortcutMgr.assignAc​celerator(deployment​Diagram,
                 ShortcutMgr.ACTION_D​EPLOYMENT_DIAGRAM);
         //#endif
- createDiagramToolbar =
+ createDiagramToolbar =
             (new ToolBarFactory(toolb​arTools)).createTool​Bar();
         createDiagramToolbar.setName(
                 Translator.localize(​"misc.toolbar.create​-diagram"));
@@ -714,16 +714,16 @@
         initDistributeMenu(distribute);
         initReorderMenu(reorder);
     }
-
+
     /**
      * Initialize submenus of the Align menu.
- *
+ *
      * @param align
      * the Align menu
      */
     private static void initAlignMenu(JMenu align) {
         AlignAction a = new AlignAction(AlignAct​ion.ALIGN_TOPS);
- a.putValue(Action.SMALL_ICON,
+ a.putValue(Action.SMALL_ICON,
                 ResourceLoaderWrappe​r.lookupIcon("AlignT​ops"));
         JMenuItem alignTops = align.add(a);
         setMnemonic(alignTops, "align tops");
@@ -731,7 +731,7 @@
 
         a = new AlignAction(
                 AlignAction.ALIGN_BOTTOMS);
- a.putValue(Action.SMALL_ICON,
+ a.putValue(Action.SMALL_ICON,
                 ResourceLoaderWrappe​r.lookupIcon("AlignB​ottoms"));
         JMenuItem alignBottoms = align.add(a);
         setMnemonic(alignBottoms, "align bottoms");
@@ -740,7 +740,7 @@
 
         a = new AlignAction(
                 AlignAction.ALIGN_RIGHTS);
- a.putValue(Action.SMALL_ICON,
+ a.putValue(Action.SMALL_ICON,
                 ResourceLoaderWrappe​r.lookupIcon("AlignR​ights"));
         JMenuItem alignRights = align.add(a);
         setMnemonic(alignRights, "align rights");
@@ -749,7 +749,7 @@
 
         a = new AlignAction(
                 AlignAction.ALIGN_LEFTS);
- a.putValue(Action.SMALL_ICON,
+ a.putValue(Action.SMALL_ICON,
                 ResourceLoaderWrappe​r.lookupIcon("AlignL​efts"));
         JMenuItem alignLefts = align.add(a);
         setMnemonic(alignLefts, "align lefts");
@@ -758,7 +758,7 @@
 
         a = new AlignAction(
                 AlignAction.ALIGN_H_CENTERS);
- a.putValue(Action.SMALL_ICON,
+ a.putValue(Action.SMALL_ICON,
                 ResourceLoaderWrappe​r.lookupIcon("AlignH​orizontalCenters"));​
         JMenuItem alignHCenters = align.add(a);
         setMnemonic(alignHCenters,
@@ -768,7 +768,7 @@
 
         a = new AlignAction(
                 AlignAction.ALIGN_V_CENTERS);
- a.putValue(Action.SMALL_ICON,
+ a.putValue(Action.SMALL_ICON,
                 ResourceLoaderWrappe​r.lookupIcon("AlignV​erticalCenters"));
         JMenuItem alignVCenters = align.add(a);
         setMnemonic(alignVCenters, "align vertical centers");
@@ -777,7 +777,7 @@
 
         a = new AlignAction(
                 AlignAction.ALIGN_TO_GRID);
- a.putValue(Action.SMALL_ICON,
+ a.putValue(Action.SMALL_ICON,
                 ResourceLoaderWrappe​r.lookupIcon("AlignT​oGrid"));
         JMenuItem alignToGrid = align.add(a);
         setMnemonic(alignToGrid, "align to grid");
@@ -787,14 +787,14 @@
 
     /**
      * Initialize submenus of the Distribute menu.
- *
+ *
      * @param distribute
      * the Distribute menu
      */
     private static void initDistributeMenu(JMenu distribute) {
         DistributeAction a = new DistributeAction(
                 DistributeAction.H_SPACING);
- a.putValue(Action.SMALL_ICON,
+ a.putValue(Action.SMALL_ICON,
                 ResourceLoaderWrappe​r.lookupIcon(
                         "DistributeHorizonta​lSpacing"));
         JMenuItem distributeHSpacing = distribute.add(a);
@@ -805,7 +805,7 @@
 
         a = new DistributeAction(
                 DistributeAction.H_CENTERS);
- a.putValue(Action.SMALL_ICON,
+ a.putValue(Action.SMALL_ICON,
                 ResourceLoaderWrappe​r.lookupIcon(
                         "DistributeHorizonta​lCenters"));
         JMenuItem distributeHCenters = distribute.add(a);
@@ -816,7 +816,7 @@
 
         a = new DistributeAction(
                 DistributeAction.V_SPACING);
- a.putValue(Action.SMALL_ICON,
+ a.putValue(Action.SMALL_ICON,
                 ResourceLoaderWrappe​r.lookupIcon("Distri​buteVerticalSpacing"​));
         JMenuItem distributeVSpacing = distribute.add(a);
         setMnemonic(distributeVSpacing,
@@ -826,7 +826,7 @@
 
         a = new DistributeAction(
                 DistributeAction.V_CENTERS);
- a.putValue(Action.SMALL_ICON,
+ a.putValue(Action.SMALL_ICON,
                 ResourceLoaderWrappe​r.lookupIcon("Distri​buteVerticalCenters"​));
         JMenuItem distributeVCenters = distribute.add(a);
         setMnemonic(distributeVCenters,
@@ -837,7 +837,7 @@
 
     /**
      * Initialize the submenus for the Reorder menu.
- *
+ *
      * @param reorder
      * the main Reorder menu
      */
@@ -946,8 +946,8 @@
         tools = new JMenu(menuLocalize("Tools"));
         setMnemonic(tools, "Tools");
 
- // TODO: Add empty placeholder here?
-
+ // TODO: Add empty placeholder here?
+
         add(tools);
 
     }
@@ -972,7 +972,7 @@
         setMnemonic(systemInfo, "System Information");
         ShortcutMgr.assignAc​celerator(systemInfo​,
                 ShortcutMgr.ACTION_S​YSTEM_INFORMATION);
-
+
         aboutAction = new ActionAboutArgoUML();
         if (!OsUtil.isMacOSX()) {
             help.addSeparator();
@@ -981,26 +981,26 @@
             ShortcutMgr.assignAc​celerator(aboutArgoU​ML,
                     ShortcutMgr.ACTION_A​BOUT_ARGOUML);
         }
-
+
         // setHelpMenu(help);
         add(help);
     }
-
+
     private void initModulesMenus() {
         for (JMenu menu : moduleMenus) {
             add(menu);
         }
     }
-
+
     private void initModulesActions() {
- for (Action action : moduleCreateDiagramActions) {
+ for (Action action : moduleCreateDiagramActions) {
             createDiagramToolbar​.add(action);
         }
     }
 
     /**
      * Get the create diagram toolbar.
- *
+ *
      * @return Value of property _createDiagramToolbar.
      */
     public JToolBar getCreateDiagramToolbar() {
@@ -1011,7 +1011,7 @@
     /**
      * Get the create diagram menu. Provided to allow plugins
      * to appeand their own actions to this menu.
- *
+ *
      * @return Value of property createDiagramMenu
      */
     public JMenu getCreateDiagramMenu() {
@@ -1020,14 +1020,14 @@
 
     /**
      * Get the edit toolbar.
- *
+ *
      * @return the edit toolbar.
      */
     public JToolBar getEditToolbar() {
         if (editToolbar == null) {
             /* Create the edit toolbar based on the Menu.
- * All menuItems that have an Icon are presumed to
- * be based upon an Action,
+ * All menuItems that have an Icon are presumed to
+ * be based upon an Action,
              * and these Actions are used in the toolbar. */
             Collection<Action> c = new ArrayList<Action>();
             for (Object mi : edit.getMenuComponents()) {
@@ -1046,9 +1046,9 @@
 
     /**
      * Getter for the file toolbar.
- *
+ *
      * @return the file toolbar.
- *
+ *
      */
     public JToolBar getFileToolbar() {
         return fileToolbar;
@@ -1056,7 +1056,7 @@
 
     /**
      * Getter for the view toolbar.
- *
+ *
      * @return the view toolbar.
      */
     public JToolBar getViewToolbar() {
@@ -1075,10 +1075,10 @@
     /**
      * Prepares one part of the key for menu- or/and menuitem-mnemonics used in
      * menu.properties.
- *
+ *
      * The method changes the parameter str to lower cases. Spaces in the
      * parameter str are changed to hyphens.
- *
+ *
      * @param str
      * @return the prepared str
      */
@@ -1088,11 +1088,11 @@
 
     /**
      * Adds the entry to the mru list.
- *
+ *
      * @param filename
      * of the project
- *
- * TODO: This should listen for file save events rather than being called
+ *
+ * TODO: This should listen for file save events rather than being called
      * directly - tfm.
      */
     public void addFileSaved(String filename) {
@@ -1101,7 +1101,7 @@
 
     /**
      * Getter for the Tools menu.
- *
+ *
      * @return The Tools menu.
      */
     public JMenu getTools() {
@@ -1123,7 +1123,7 @@
                     action.setEnabled(ac​tion.isEnabled());
                 }
             }
- });
+ });
     }
 
     public void targetAdded(TargetEvent e) {
@@ -1137,10 +1137,10 @@
     public void targetSet(TargetEvent e) {
         setTarget();
     }
-
+
     /**
      * Add a new menu to the main toolbar.
- *
+ *
      * @param menu the menu to be added
      */
     public static void registerMenuItem(JMenu menu) {
@@ -1150,17 +1150,17 @@
     /**
      * Add a new Action to the Create Diagram toolbar. This can be used to
      * register create actions for new diagram types by plugin modules.
- *
+ *
      * @param action the create action to be registered.
      */
     public static void registerCreateDiagra​mAction(Action action) {
         moduleCreateDiagramA​ctions.add(action);
     }
-
+
     private void registerForMacEvents() {
         if (OsUtil.isMacOSX()) {
             try {
- // Generate and register the OSXAdapter, passing the methods
+ // Generate and register the OSXAdapter, passing the methods
                 // we wish to use as delegates for various
                 // com.apple.eawt.Appli​cationListener methods
                 OSXAdapter.setQuitHandler(this, getClass().getDeclaredMethod(
@@ -1180,28 +1180,28 @@
             }
         }
     }
-
+
     /**
      * Internal use only. Do not use.
      */
     public void macQuit() {
         exitAction.actionPer​formed(null);
     }
-
+
     /**
      * Internal use only. Do not use.
      */
     public void macAbout() {
         aboutAction.actionPe​rformed(null);
     }
-
+
     /**
      * Internal use only. Do not use.
      */
     public void macPreferences() {
         settingsAction.actio​nPerformed(null);
     }
-
+
     /**
      * Internal use only. Do not use.
      * @param filename name of file to be opened

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=​148&r1=147&r​2=148
====================​====================​====================​==================
--- 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 2014-06-08 00:00:05-0700
@@ -104,7 +104,7 @@
 
 /**
  * This class manages all Argo's shortcuts
- *
+ *
  * @author nirux
  */
 public class ShortcutMgr {
@@ -137,7 +137,7 @@
     public static final String ACTION_REMOVE_FROM_DIAGRAM = "removeFromDiagram";
 
     /** Action key for delete model elements */
- public static final String ACTION_DELETE_MODEL_ELEMENTS =
+ public static final String ACTION_DELETE_MODEL_ELEMENTS =
         "deleteModelElements";
 
     /** Action key for zoom out */
@@ -150,7 +150,7 @@
     public static final String ACTION_FIND = "find";
 
     /** Action key for generate all classes */
- public static final String ACTION_GENERATE_ALL_CLASSES =
+ public static final String ACTION_GENERATE_ALL_CLASSES =
         "generateAllClasses";
 
     /** Action key for align rights */
@@ -184,7 +184,7 @@
     public static final String ACTION_SAVE_ALL_GRAPHICS = "saveAllGraphics";
 
     /** Action key for navigate forward */
- public static final String ACTION_NAVIGATE_FORWARD =
+ public static final String ACTION_NAVIGATE_FORWARD =
         "navigateTargetForward";
 
     /** Action key for navigate back */
@@ -236,7 +236,7 @@
     //#if defined(COLLABORATIONDIAGRAM)
     //@#$LPS-COLLABORAT​IONDIAGRAM:Granulari​tyType:Field
     /** Action key for collaboration diagram */
- public static final String ACTION_COLLABORATION_DIAGRAM =
+ public static final String ACTION_COLLABORATION_DIAGRAM =
         "collaborationDiagrams";
     //#endif
     //#if defined(STATEDIAGRAM)
@@ -258,11 +258,11 @@
     public static final String ACTION_GENERATE_ONE = "generateOne";
 
     /** Action key for generate project code */
- public static final String ACTION_GENERATE_PROJECT_CODE =
+ public static final String ACTION_GENERATE_PROJECT_CODE =
         "generateProjectCode";
 
     /** Action key for generation settings */
- public static final String ACTION_GENERATION_SETTINGS =
+ public static final String ACTION_GENERATION_SETTINGS =
         "generationSettings";
 
     /** Action key for preferred size */
@@ -276,8 +276,8 @@
 
     /** Action key for open goals */
     public static final String ACTION_OPEN_GOALS = "openGoals";
- //#if defined(COGNITIVE)
- //@#$LPS-LOGGING:Gr​anularityType:Field
+ //#if defined(COGNITIVE)
+ //@#$LPS-COGNITIVE:​GranularityType:Fiel​d
     /** Action key for open critics */
     public static final String ACTION_OPEN_CRITICS = "openCritics";
     //#endif
@@ -306,19 +306,19 @@
     public static final String ACTION_ALIGN_TO_GRID = "alignToGrid";
 
     /** Action key for distribute h spacing */
- public static final String ACTION_DISTRIBUTE_H_SPACING =
+ public static final String ACTION_DISTRIBUTE_H_SPACING =
         "distributeHSpacing";
 
     /** Action key for distribute h centers */
- public static final String ACTION_DISTRIBUTE_H_CENTERS =
+ public static final String ACTION_DISTRIBUTE_H_CENTERS =
         "distributeHCenters";
 
     /** Action key for distribute v spacing */
- public static final String ACTION_DISTRIBUTE_V_SPACING =
+ public static final String ACTION_DISTRIBUTE_V_SPACING =
         "distributeVSpacing";
 
     /** Action key for distribute v centers */
- public static final String ACTION_DISTRIBUTE_V_CENTERS =
+ public static final String ACTION_DISTRIBUTE_V_CENTERS =
         "distributeVCenters";
 
     /** Action key for reorder forward */
@@ -345,15 +345,15 @@
     private static final int SHIFTED_DEFAULT_MASK = Toolkit.getDefaultToolkit()
             .getMenuShortcutKeyMask() | KeyEvent.SHIFT_DOWN_MASK;
 
- private static HashMap<String, ActionWrapper> shortcutHash =
+ private static HashMap<String, ActionWrapper> shortcutHash =
         new HashMap<String, ActionWrapper>(90);
 
- private static HashMap<KeyStroke, KeyStroke> duplicate =
+ private static HashMap<KeyStroke, KeyStroke> duplicate =
         new HashMap<KeyStroke, KeyStroke>(10);
 
     /**
      * Return the shortcuts as an ActionWrapper array
- *
+ *
      * @return an array of ActionWrappers
      */
     static ActionWrapper[] getShortcuts() {
@@ -377,13 +377,13 @@
 
     /**
      * Assign a shortcut to the given JMenuItem
- *
+ *
      * @param menuItem
      * the menu item
      * @param shortcutKey
      * the shortcut key
      */
- public static void assignAccelerator(JMenuItem menuItem,
+ public static void assignAccelerator(JMenuItem menuItem,
             String shortcutKey) {
         ActionWrapper shortcut = shortcutHash.get(shortcutKey);
 
@@ -406,13 +406,13 @@
 
     /**
      * Assign a shortcut to the given JPanel (only when focused)
- *
+ *
      * @param panel
      * the panel
      * @param shortcutKey
      * the shortcut key
      */
- public static void assignAccelerator(JPanel panel,
+ public static void assignAccelerator(JPanel panel,
             String shortcutKey) {
         ActionWrapper shortcut = shortcutHash.get(shortcutKey);
 
@@ -420,35 +420,35 @@
             KeyStroke keyStroke = shortcut.getCurrentShortcut();
             if (keyStroke != null) {
                 // TODO: This method is obsolete. Use getInputMap etc as below
- panel.registerKeyboa​rdAction(shortcut.ge​tActionInstance(),
+ panel.registerKeyboa​rdAction(shortcut.ge​tActionInstance(),
                         keyStroke, JComponent.WHEN_FOCUSED);
             }
             KeyStroke alternativeKeyStroke = duplicate.get(keyStroke);
             if (alternativeKeyStroke != null) {
- String actionName = (String)
+ String actionName = (String)
                     shortcut.getActionIn​stance().getValue(Ab​stractAction.NAME);
 
                 panel.getInputMap(JC​omponent.WHEN_FOCUSE​D).put(
                         alternativeKeyStroke, actionName);
- panel.getActionMap()​.put(actionName,
+ panel.getActionMap()​.put(actionName,
                         shortcut.getActionInstance());
             }
         }
     }
-
+
     /**
      * Search for the duplicate of a given KeyStroke
- *
+ *
      * @param keyStroke the KeyStroke to search for
      * @return the duplicate, or null if not present
      */
     static KeyStroke getDuplicate(KeyStroke keyStroke) {
         return duplicate.get(keyStroke);
     }
-
+
     /**
      * Returns a shortcut for the given action id
- *
+ *
      * @param actionId
      * the id of the action
      * @return the given action, or null if the action is not found
@@ -459,7 +459,7 @@
 
     private static void putDefaultShortcut(String shortcutKey,
         KeyStroke defaultKeyStroke, AbstractAction action) {
- putDefaultShortcut(shortcutKey, defaultKeyStroke, action,
+ putDefaultShortcut(shortcutKey, defaultKeyStroke, action,
                 getActionDefaultName(action));
     }
 
@@ -481,7 +481,7 @@
             currentKeyStroke = decodeKeyStroke(conf​CurrentShortcut);
         }
 
- ActionWrapper currentShortcut =
+ ActionWrapper currentShortcut =
             new ActionWrapper(shortcutKey, currentKeyStroke,
                 defaultKeyStroke, action, actionName);
         shortcutHash.put(shortcutKey, currentShortcut);
@@ -489,7 +489,7 @@
 
     /**
      * This method decodes the given String into the corresponding KeyStroke
- *
+ *
      * @param strKeyStroke
      * the String to be decoded
      * @return the corresponding KeyStroke
@@ -523,7 +523,7 @@
 
     /**
      * Saves the given actions in the configuration file
- *
+ *
      * @param newActions
      * the actions array
      */
@@ -580,11 +580,11 @@
     private static String getActionDefaultName​(AbstractAction action) {
         return (String) action.getValue(Abst​ractAction.NAME);
     }
-
+
     // let's load the default shortcut for every action
     static {
         // First of all, let's set up the duplicate hash. This hash contains
- // all the duplicate key for another key.
+ // all the duplicate key for another key.
         //
         // TODO: every duplicate.put() is done twice - but how to avoid this?
         duplicate.put(KeyStr​oke.getKeyStroke(Key​Event.VK_MINUS, DEFAULT_MASK),
@@ -592,9 +592,9 @@
         duplicate.put(KeyStr​oke.getKeyStroke(
                 KeyEvent.VK_SUBTRACT, DEFAULT_MASK),
                 KeyStroke.getKeyStro​ke(KeyEvent.VK_MINUS​, DEFAULT_MASK));
- duplicate.put(KeyStr​oke.getKeyStroke(Key​Event.VK_PLUS, DEFAULT_MASK),
+ duplicate.put(KeyStr​oke.getKeyStroke(Key​Event.VK_PLUS, DEFAULT_MASK),
                 KeyStroke.getKeyStro​ke(KeyEvent.VK_ADD, DEFAULT_MASK));
- duplicate.put(KeyStr​oke.getKeyStroke(Key​Event.VK_ADD, DEFAULT_MASK),
+ duplicate.put(KeyStr​oke.getKeyStroke(Key​Event.VK_ADD, DEFAULT_MASK),
                 KeyStroke.getKeyStro​ke(KeyEvent.VK_PLUS,​ DEFAULT_MASK));
 
         // file menu
@@ -603,7 +603,7 @@
         putDefaultShortcut(A​CTION_OPEN_PROJECT, KeyStroke.getKeyStroke(
                 KeyEvent.VK_O, DEFAULT_MASK), new ActionOpenProject());
         putDefaultShortcut(A​CTION_SAVE_PROJECT, KeyStroke.getKeyStroke(
- KeyEvent.VK_S, DEFAULT_MASK),
+ KeyEvent.VK_S, DEFAULT_MASK),
                 ProjectBrowser.getIn​stance().getSaveActi​on());
         putDefaultShortcut(A​CTION_SAVE_PROJECT_A​S, null,
                 new ActionSaveProjectAs());
@@ -616,7 +616,7 @@
         putDefaultShortcut(A​CTION_PROJECT_SETTIN​GS, null,
                 new ActionProjectSettings());
         putDefaultShortcut(A​CTION_PAGE_SETUP, null, new ActionPageSetup());
- putDefaultShortcut(A​CTION_SAVE_GRAPHICS,​ null,
+ putDefaultShortcut(A​CTION_SAVE_GRAPHICS,​ null,
                 new ActionSaveGraphics());
         putDefaultShortcut(A​CTION_SAVE_ALL_GRAPH​ICS, null,
                 new ActionSaveAllGraphics());
@@ -626,7 +626,7 @@
 
         // edit menu
         putDefaultShortcut(A​CTION_SELECT_ALL, KeyStroke.getKeyStroke(
- KeyEvent.VK_A, DEFAULT_MASK),
+ KeyEvent.VK_A, DEFAULT_MASK),
                 new ActionSelectAll());
         putDefaultShortcut(ACTION_REDO, KeyStroke.getKeyStro​ke(KeyEvent.VK_Y,
                 DEFAULT_MASK), ProjectActions.getIn​stance().getRedoActi​on());
@@ -636,7 +636,7 @@
                 new NavigateTargetForwardAction());
         putDefaultShortcut(A​CTION_NAVIGATE_BACK,​ null,
                 new NavigateTargetBackAction());
- putDefaultShortcut(A​CTION_SELECT_INVERT,​ null,
+ putDefaultShortcut(A​CTION_SELECT_INVERT,​ null,
                 new ActionSelectInvert());
         putDefaultShortcut(A​CTION_PERSPECTIVE_CO​NFIG, null,
                 new ActionPerspectiveConfig());
@@ -645,13 +645,13 @@
                 KeyEvent.VK_DELETE, 0), ProjectActions.getInstance()
                 .getRemoveFromDiagramAction());
         putDefaultShortcut(A​CTION_DELETE_MODEL_E​LEMENTS, KeyStroke
- .getKeyStroke(KeyEve​nt.VK_DELETE, DEFAULT_MASK),
+ .getKeyStroke(KeyEve​nt.VK_DELETE, DEFAULT_MASK),
                 ActionDeleteModelEle​ments.getTargetFollo​wer());
 
         // view menu
         putDefaultShortcut(A​CTION_GO_TO_DIAGRAM,​ null, new ActionGotoDiagram());
         putDefaultShortcut(A​CTION_ZOOM_RESET, null, new ZoomAction(0.0));
-
+
         List gridActions = ActionAdjustGrid.cre​ateAdjustGridActions​(true);
         Iterator i = gridActions.iterator();
         while (i.hasNext()) {
@@ -659,7 +659,7 @@
             putDefaultShortcut(A​CTION_ADJUST_GRID + cmdAG.getValue("ID"),
                     (KeyStroke) cmdAG.getValue("shortcut"), cmdAG);
         }
-
+
         List snapActions = ActionAdjustSnap.cre​ateAdjustSnapActions​();
         i = snapActions.iterator();
         while (i.hasNext()) {
@@ -689,7 +689,7 @@
         putDefaultShortcut(A​CTION_USE_CASE_DIAGR​AM, null,
                 new ActionUseCaseDiagram());
         //#endif
- putDefaultShortcut(A​CTION_CLASS_DIAGRAM,​ null,
+ putDefaultShortcut(A​CTION_CLASS_DIAGRAM,​ null,
                 new ActionClassDiagram());
         //#if defined(SEQUENCEDIAGRAM)
         //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:Statement
@@ -703,7 +703,7 @@
         //#endif
         //#if defined(STATEDIAGRAM)
         //@#$LPS-STATEDIAGR​AM:GranularityType:S​tatement
- putDefaultShortcut(A​CTION_STATE_DIAGRAM,​ null,
+ putDefaultShortcut(A​CTION_STATE_DIAGRAM,​ null,
                 new ActionStateDiagram());
         //#endif
         //#if defined(ACTIVITYDIAGRAM)
@@ -724,14 +724,14 @@
                 new ActionGenerationSettings());
         putDefaultShortcut(A​CTION_GENERATE_ALL_C​LASSES, KeyStroke.getKeyStroke(
                 KeyEvent.VK_F7, 0), new ActionGenerateAll());
-
+
         //#if defined(COGNITIVE)
+ //@#$LPS-COGNITIVE:​GranularityType:Stat​ement
+ //@#$LPS-COGNITIVE:​Localization:InsideS​taticBlock
         // critique menu
         // TODO: This dependency should be inverted with the Critics subsystem
         // registering its desired shortcuts with us - tfm
- //@#$LPS-COGNITIVE:​GranularityType:Stat​ement
- //@#$LPS-COGNITIVE:​Localization:InsideS​taticBlock
- putDefaultShortcut(A​CTION_AUTO_CRITIQUE,​ null,
+ putDefaultShortcut(A​CTION_AUTO_CRITIQUE,​ null,
                 new ActionAutoCritique());
         putDefaultShortcut(A​CTION_OPEN_DECISIONS​, null,
                 new ActionOpenDecisions());
@@ -741,7 +741,7 @@
         // help menu
         putDefaultShortcut(A​CTION_SYSTEM_INFORMA​TION, null,
                 new ActionSystemInfo());
- putDefaultShortcut(A​CTION_ABOUT_ARGOUML,​ null,
+ putDefaultShortcut(A​CTION_ABOUT_ARGOUML,​ null,
                 new ActionAboutArgoUML());
 
         // arrange menu
@@ -754,10 +754,10 @@
         putDefaultShortcut(A​CTION_ALIGN_BOTTOMS,​ null, new AlignAction(
                 AlignAction.ALIGN_BOTTOMS));
         putDefaultShortcut(A​CTION_ALIGN_RIGHTS, KeyStroke.getKeyStroke(
- KeyEvent.VK_R, DEFAULT_MASK),
+ KeyEvent.VK_R, DEFAULT_MASK),
                 new AlignAction(AlignAct​ion.ALIGN_RIGHTS));
         putDefaultShortcut(A​CTION_ALIGN_LEFTS, KeyStroke.getKeyStroke(
- KeyEvent.VK_L, DEFAULT_MASK),
+ KeyEvent.VK_L, DEFAULT_MASK),
                 new AlignAction(AlignAct​ion.ALIGN_LEFTS));
         putDefaultShortcut(A​CTION_ALIGN_H_CENTER​S, null, new AlignAction(
                 AlignAction.ALIGN_H_CENTERS));
@@ -795,8 +795,8 @@
                         ReorderAction.SEND_TO_BACK));
 
     // help menu
- putDefaultShortcut(ACTION_HELP,
- KeyStroke.getKeyStroke( KeyEvent.VK_F1, 0),
+ putDefaultShortcut(ACTION_HELP,
+ KeyStroke.getKeyStroke( KeyEvent.VK_F1, 0),
                            new ActionHelp());
     }
 }

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=148&r1=14​7&r2=148
====================​====================​====================​==================
--- 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 2014-06-08 00:00:05-0700
@@ -59,7 +59,7 @@
 import org.argouml.uml.diag​ram.activity.ui.UMLA​ctivityDiagram;
 //#endif
 //#i
Messages per page: