Rename ProtocolDB to ProtocolsDB

jnr · Mar 24, 2010 · ae9d4f2 · ae9d4f2
1 parent 263d0a7
commit ae9d4f2
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 2,953 deletions.
diff --git a/src/jnr/netdb/FileProtocolDB.java → src/jnr/netdb/FileProtocolsDB.java b/src/jnr/netdb/FileProtocolDB.java → src/jnr/netdb/FileProtocolsDB.java
@@ -31,20 +31,20 @@
 /**
  *
  */
-class FileProtocolDB implements ProtocolDB {
+class FileProtocolsDB implements ProtocolsDB {
 
-    public static final FileProtocolDB getInstance() {
+    public static final FileProtocolsDB getInstance() {
         return SingletonHolder.INSTANCE;
     }
 
     private static final class SingletonHolder {
-        public static final FileProtocolDB INSTANCE = load();
+        public static final FileProtocolsDB INSTANCE = load();
     }
 
-    FileProtocolDB() {
+    FileProtocolsDB() {
     }
 
-    private static FileProtocolDB load() {
+    private static FileProtocolsDB load() {
         try {
             // Fail unless /etc/protocols can be read and contains at least one valid entry
             NetDBParser parser = parseProtocolsFile();
@@ -54,7 +54,7 @@ private static FileProtocolDB load() {
                 parser.close();
             }
 
-            return new FileProtocolDB();
+            return new FileProtocolsDB();
 
         } catch (Throwable t) {
             return null;

diff --git a/src/jnr/netdb/IANAProtocolDB.java → src/jnr/netdb/IANAProtocolsDB.java b/src/jnr/netdb/IANAProtocolDB.java → src/jnr/netdb/IANAProtocolsDB.java
@@ -29,20 +29,20 @@
 /**
  * Pre-compiled table of IANA protocol numbers
  */
-class IANAProtocolDB implements ProtocolDB {
+class IANAProtocolsDB implements ProtocolsDB {
 
     private final Map<String, Protocol> nameToProto;
     private final Map<Integer, Protocol> numberToProto;
 
-    public static final IANAProtocolDB getInstance() {
+    public static final IANAProtocolsDB getInstance() {
         return SingletonHolder.INSTANCE;
     }
 
     private static final class SingletonHolder {
-        public static final IANAProtocolDB INSTANCE = initProtocolDB().build();
+        public static final IANAProtocolsDB INSTANCE = initProtocolDB().build();
     }
 
-    private IANAProtocolDB(Map<String, Protocol> nameToProto, Map<Integer, Protocol> numberToProto) {
+    private IANAProtocolsDB(Map<String, Protocol> nameToProto, Map<Integer, Protocol> numberToProto) {
         this.nameToProto = nameToProto;
         this.numberToProto = numberToProto;
     }
@@ -76,8 +76,8 @@ public void add(String name, int proto, String... aliases) {
             numberToProto.put(proto, p);
         }
 
-        public IANAProtocolDB build() {
-            return new IANAProtocolDB(nameToProto, numberToProto);
+        public IANAProtocolsDB build() {
+            return new IANAProtocolsDB(nameToProto, numberToProto);
         }
     }