@@ -98,7 +98,7 @@ public static DataModel getInstance() {
9898
9999 DataModel (@ Nonnull final String fileName ) throws IncorrectDataModelException {
100100 // Read data only once in static initializer.
101- LOG .info ("DataAccess : reading regions from file: {}" , fileName );
101+ LOG .info ("DataModel : reading regions from file: {}" , fileName );
102102 final byte [] readBuffer = new byte [FILE_BUFFER_SIZE ];
103103 int total = 0 ;
104104 try {
@@ -119,7 +119,7 @@ public static DataModel getInstance() {
119119 final byte [] bytes = outputStream .toByteArray ();
120120 assert total == bytes .length ;
121121 if (total < 12 ) {
122- LOG .error ("DataAccess : expected more than {} bytes" , total );
122+ LOG .error ("DataModel : expected more than {} bytes" , total );
123123 throw new IncorrectDataModelException ("Data file corrupt: " + fileName );
124124 }
125125
@@ -140,7 +140,7 @@ public static DataModel getInstance() {
140140
141141 // Check if the number of territories matches the enumeration in Territory.
142142 if (nrTerritories != Territory .values ().length ) {
143- LOG .error ("DataAccess : expected {} territories, got {}" , Territory .values ().length , nrTerritories );
143+ LOG .error ("DataModel : expected {} territories, got {}" , Territory .values ().length , nrTerritories );
144144 throw new IncorrectDataModelException ("Data file corrupt: " + fileName );
145145 }
146146
@@ -150,10 +150,10 @@ public static DataModel getInstance() {
150150 (nrTerritoryRecords * (DATA_FIELDS_PER_REC * BYTES_PER_LONG ));
151151
152152 if (expectedSize != total ) {
153- LOG .error ("DataAccess : expected {} bytes, got {}" , expectedSize , total );
153+ LOG .error ("DataModel : expected {} bytes, got {}" , expectedSize , total );
154154 throw new IncorrectDataModelException ("Data file corrupt: " + fileName );
155155 }
156- LOG .debug ("DataAccess : version={} territories={} territory records={}" , dataVersion , nrTerritories , nrTerritoryRecords );
156+ LOG .debug ("DataModel : version={} territories={} territory records={}" , dataVersion , nrTerritories , nrTerritoryRecords );
157157
158158 // Read DATA+START array (2 bytes per territory, plus closing record).
159159 index = new int [nrTerritories + 1 ];
@@ -181,7 +181,7 @@ public static DataModel getInstance() {
181181 throw new IncorrectDataModelException ("Cannot initialize static data structure from: " +
182182 fileName + ", exception=" + e );
183183 }
184- LOG .info ("DataAccess : regions initialized, read {} bytes" , total );
184+ LOG .info ("DataModel : regions initialized, read {} bytes" , total );
185185 }
186186
187187 /**
0 commit comments