X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2Fbits%2FMnemonicString.java;h=9f7d178693c700d8edebc803da2a677ff4b8f3e7;hb=e16dda65585466c8987bd1efd718431450a96605;hp=0567c99def9872045535d721e524667c612add2f;hpb=df8de03f80590dde35f26616db91ad6163007b7e;p=nikiroo-utils.git

diff --git a/src/jexer/bits/MnemonicString.java b/src/jexer/bits/MnemonicString.java
index 0567c99..9f7d178 100644
--- a/src/jexer/bits/MnemonicString.java
+++ b/src/jexer/bits/MnemonicString.java
@@ -1,34 +1,30 @@
-/**
+/*
  * Jexer - Java Text User Interface
  *
- * Version: $Id$
- *
- * Author: Kevin Lamonte, <a href="mailto:kevin.lamonte@gmail.com">kevin.lamonte@gmail.com</a>
- *
- * License: LGPLv3 or later
+ * The MIT License (MIT)
  *
- * Copyright: This module is licensed under the GNU Lesser General
- * Public License Version 3.  Please see the file "COPYING" in this
- * directory for more information about the GNU Lesser General Public
- * License Version 3.
+ * Copyright (C) 2016 Kevin Lamonte
  *
- *     Copyright (C) 2015  Kevin Lamonte
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 3 of
- * the License, or (at your option) any later version.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, see
- * http://www.gnu.org/licenses/, or write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * @author Kevin Lamonte [kevin.lamonte@gmail.com]
+ * @version 1
  */
 package jexer.bits;
 
@@ -38,60 +34,86 @@ package jexer.bits;
  * characters, e.g. "&File && Stuff" would be "File & Stuff" with the first
  * 'F' highlighted.
  */
-public class MnemonicString {
+public final class MnemonicString {
 
     /**
-     * Keyboard shortcut to activate this item
+     * Keyboard shortcut to activate this item.
      */
-    public char shortcut;
+    private char shortcut;
 
     /**
-     * Location of the highlighted character
+     * Get the keyboard shortcut character.
+     *
+     * @return the highlighted character
      */
-    public int shortcutIdx = -1;
+    public char getShortcut() {
+        return shortcut;
+    }
 
     /**
-     * The raw (uncolored) string
+     * Location of the highlighted character.
      */
-    public String rawLabel;
+    private int shortcutIdx = -1;
 
     /**
-     * Public constructor
+     * Get location of the highlighted character.
+     *
+     * @return location of the highlighted character
+     */
+    public int getShortcutIdx() {
+        return shortcutIdx;
+    }
+
+    /**
+     * The raw (uncolored) string.
+     */
+    private String rawLabel;
+
+    /**
+     * Get the raw (uncolored) string.
+     *
+     * @return the raw (uncolored) string
+     */
+    public String getRawLabel() {
+        return rawLabel;
+    }
+
+    /**
+     * Public constructor.
      *
      * @param label widget label or title.  Label must contain a keyboard
      * shortcut, denoted by prefixing a letter with "&", e.g. "&File"
      */
-    public MnemonicString(String label) {
+    public MnemonicString(final String label) {
 
-	// Setup the menu shortcut
-	String newLabel = "";
-	boolean foundAmp = false;
-	boolean foundShortcut = false;
-	int shortcutIdx = 0;
-	for (int i = 0; i < label.length(); i++) {
-	    char c = label.charAt(i);
-	    if (c == '&') {
-		if (foundAmp == true) {
-		    newLabel += '&';
-		    shortcutIdx++;
-		} else {
-		    foundAmp = true;
-		}
-	    } else {
-		newLabel += c;
-		if (foundAmp == true) {
-		    if (foundShortcut == false) {
-			shortcut = c;
-			foundAmp = false;
-			foundShortcut = true;
-			this.shortcutIdx = shortcutIdx;
-		    }
-		} else {
-		    shortcutIdx++;
-		}
-	    }
-	}
-	this.rawLabel = newLabel;
+        // Setup the menu shortcut
+        String newLabel = "";
+        boolean foundAmp = false;
+        boolean foundShortcut = false;
+        int scanShortcutIdx = 0;
+        for (int i = 0; i < label.length(); i++) {
+            char c = label.charAt(i);
+            if (c == '&') {
+                if (foundAmp) {
+                    newLabel += '&';
+                    scanShortcutIdx++;
+                } else {
+                    foundAmp = true;
+                }
+            } else {
+                newLabel += c;
+                if (foundAmp) {
+                    if (!foundShortcut) {
+                        shortcut = c;
+                        foundAmp = false;
+                        foundShortcut = true;
+                        shortcutIdx = scanShortcutIdx;
+                    }
+                } else {
+                    scanShortcutIdx++;
+                }
+            }
+        }
+        this.rawLabel = newLabel;
     }
 }
-