renamed class name Alias to AliasMap (and some refactorings)

diff --git a/src/net/argius/stew/Alias.java b/src/net/argius/stew/AliasMap.java
similarity index 97%
rename from src/net/argius/stew/Alias.java
rename to src/net/argius/stew/AliasMap.java
index 74fbde1..8a88b8b 100644 (file)
--- a/src/net/argius/stew/Alias.java
+++ b/src/net/argius/stew/AliasMap.java
@@ -5,16 +5,16 @@ import java.util.*;
 import java.util.Map.Entry;
 
 /**
- * Alias.
+ * Alias Map.
  */
-final class Alias {
+final class AliasMap {
 
     private final Properties properties;
     private final File file;
 
     private long timestamp;
 
-    Alias(File file) {
+    AliasMap(File file) {
         this.properties = new Properties();
         this.file = file;
         this.timestamp = 0L;
@@ -61,6 +61,18 @@ final class Alias {
         return properties.isEmpty();
     }
 
+    Set<String> keys() {
+        Set<String> set = new LinkedHashSet<String>();
+        for (final Object o : Collections.list(properties.propertyNames())) {
+            set.add((String)o);
+        }
+        return set;
+    }
+
+    Set<Entry<Object, Object>> entrySet() {
+        return properties.entrySet();
+    }
+
     void load() throws IOException {
         InputStream is = new FileInputStream(file);
         try {
@@ -104,16 +116,5 @@ final class Alias {
         return file.lastModified() > timestamp;
     }
 
-    Set<String> keys() {
-        Set<String> set = new LinkedHashSet<String>();
-        for (final Object o : Collections.list(properties.propertyNames())) {
-            set.add((String)o);
-        }
-        return set;
-    }
-
-    Set<Entry<Object, Object>> entrySet() {
-        return properties.entrySet();
-    }
 
 }

diff --git a/src/net/argius/stew/CommandProcessor.java b/src/net/argius/stew/CommandProcessor.java
index 02925b9..f359814 100644 (file)
--- a/src/net/argius/stew/CommandProcessor.java
+++ b/src/net/argius/stew/CommandProcessor.java
@@ -154,9 +154,9 @@ final class CommandProcessor {
             return true;
         }
         // alias
-        Alias alias = env.getAlias();
+        AliasMap aliasMap = env.getAliasMap();
         if (commandName.equalsIgnoreCase("alias") || commandName.equalsIgnoreCase("unalias")) {
-            alias.reload();
+            aliasMap.reload();
             if (commandName.equalsIgnoreCase("alias")) {
                 if (p.has(2)) {
                     final String keyword = p.at(1);
@@ -164,37 +164,37 @@ final class CommandProcessor {
                         outputMessage("w.unusable-keyword-for-alias", keyword);
                         return true;
                     }
-                    alias.setValue(keyword, p.after(2));
-                    alias.save();
+                    aliasMap.setValue(keyword, p.after(2));
+                    aliasMap.save();
                 } else if (p.has(1)) {
                     final String keyword = p.at(1);
                     if (isUsableKeywordForAlias(keyword)) {
                         outputMessage("w.unusable-keyword-for-alias", keyword);
                         return true;
                     }
-                    if (alias.containsKey(keyword)) {
-                        outputMessage("i.dump-alias", keyword, alias.getValue(keyword));
+                    if (aliasMap.containsKey(keyword)) {
+                        outputMessage("i.dump-alias", keyword, aliasMap.getValue(keyword));
                     }
                 } else {
-                    if (alias.isEmpty()) {
+                    if (aliasMap.isEmpty()) {
                         outputMessage("i.noalias");
                     } else {
-                        for (final String key : new TreeSet<String>(alias.keys())) {
-                            outputMessage("i.dump-alias", key, alias.getValue(key));
+                        for (final String key : new TreeSet<String>(aliasMap.keys())) {
+                            outputMessage("i.dump-alias", key, aliasMap.getValue(key));
                         }
                     }
                 }
             } else if (commandName.equalsIgnoreCase("unalias")) {
                 if (p.has(1)) {
-                    alias.remove(p.at(1));
-                    alias.save();
+                    aliasMap.remove(p.at(1));
+                    aliasMap.save();
                 } else {
                     throw new UsageException(res.get("usage.unalias"));
                 }
             }
             return true;
-        } else if (alias.containsKey(commandName)) {
-            final String command = alias.expand(commandName, p);
+        } else if (aliasMap.containsKey(commandName)) {
+            final String command = aliasMap.expand(commandName, p);
             op.output(" >> " + command);
             invoke(command);
             return true;

diff --git a/src/net/argius/stew/Environment.java b/src/net/argius/stew/Environment.java
index 217942e..6c57655 100644 (file)
--- a/src/net/argius/stew/Environment.java
+++ b/src/net/argius/stew/Environment.java
@@ -27,7 +27,7 @@ public final class Environment {
     private File systemDirectory;
     private File currentDirectory;
     private long connectorTimestamp;
-    private Alias alias;
+    private AliasMap aliasMap;
 
     /**
      * A constructor.
@@ -42,10 +42,10 @@ public final class Environment {
         this.currentDirectory = getInitialCurrentDirectory();
         // init alias
         final File aliasPropFile = new File(this.systemDirectory, ALIAS_PROPERTIES_NAME);
-        this.alias = new Alias(aliasPropFile);
+        this.aliasMap = new AliasMap(aliasPropFile);
         if (aliasPropFile.exists()) {
             try {
-                alias.load();
+                aliasMap.load();
             } catch (IOException ex) {
                 log.warn(ex);
             }
@@ -260,8 +260,8 @@ public final class Environment {
         return systemDirectory;
     }
 
-    public Alias getAlias() {
-        return alias;
+    public AliasMap getAliasMap() {
+        return aliasMap;
     }
 
 }