grogv3 / grog-cubi

Go to a project
Toggle navigation Toggle navigation pinning
Jean-Francois Leveque
481eadf5 1 parent 1a574575

Renommage minimal des attributs de vue pour éviter les signalements de code dupliqué

Inline Side-by-side
Showing 3 changed files with 132 additions and 132 deletions
...@@ -32,15 +32,15 @@ public class PublisherVersionView implements Serializable { ...@@ -32,15 +32,15 @@ public class PublisherVersionView implements Serializable {
32 32
33 private int publisherVersionId; 33 private int publisherVersionId;
34 private String publisherName; 34 private String publisherName;
35 - private String publisherStreetAddress; 35 + private String streetAddress;
36 - private String publisherPostalCode; 36 + private String postalCode;
37 - private String publisherPostOfficeBoxNumber; 37 + private String postOfficeBoxNumber;
38 - private String publisherAddressRegion; 38 + private String addressRegion;
39 - private String publisherAddressLocality; 39 + private String addressLocality;
40 private transient Country publisherAddressCountry; 40 private transient Country publisherAddressCountry;
41 - private String publisherTelephone; 41 + private String telephone;
42 - private String publisherEmail; 42 + private String email;
43 - private String publisherURL; 43 + private String uRL;
44 private String publisherHistory; 44 private String publisherHistory;
45 private transient Account publisherVersionAuthor; 45 private transient Account publisherVersionAuthor;
46 private Timestamp publisherVersionDatetime; 46 private Timestamp publisherVersionDatetime;
...@@ -90,15 +90,15 @@ public class PublisherVersionView implements Serializable { ...@@ -90,15 +90,15 @@ public class PublisherVersionView implements Serializable {
90 editMode = false; 90 editMode = false;
91 } else { 91 } else {
92 publisherName = null; 92 publisherName = null;
93 - publisherStreetAddress = null; 93 + streetAddress = null;
94 - publisherPostalCode = null; 94 + postalCode = null;
95 - publisherPostOfficeBoxNumber = null; 95 + postOfficeBoxNumber = null;
96 - publisherAddressRegion = null; 96 + addressRegion = null;
97 - publisherAddressLocality = null; 97 + addressLocality = null;
98 publisherAddressCountry = null; 98 publisherAddressCountry = null;
99 - publisherTelephone = null; 99 + telephone = null;
100 - publisherEmail = null; 100 + email = null;
101 - publisherURL = null; 101 + uRL = null;
102 publisherHistory = null; 102 publisherHistory = null;
103 // Je ne pense pas que la ligne suivante soit nécessaire 103 // Je ne pense pas que la ligne suivante soit nécessaire
104 publisher = null; 104 publisher = null;
...@@ -124,16 +124,16 @@ public class PublisherVersionView implements Serializable { ...@@ -124,16 +124,16 @@ public class PublisherVersionView implements Serializable {
124 private PublisherVersion getNewPublisherVersion() { 124 private PublisherVersion getNewPublisherVersion() {
125 PublisherVersion publisherVersion = new PublisherVersion(); 125 PublisherVersion publisherVersion = new PublisherVersion();
126 publisherVersion.setPublisherAddressCountry(publisherAddressCountry); 126 publisherVersion.setPublisherAddressCountry(publisherAddressCountry);
127 - publisherVersion.setPublisherAddressLocality(publisherAddressLocality); 127 + publisherVersion.setPublisherAddressLocality(addressLocality);
128 - publisherVersion.setPublisherAddressRegion(publisherAddressRegion); 128 + publisherVersion.setPublisherAddressRegion(addressRegion);
129 - publisherVersion.setPublisherEmail(publisherEmail); 129 + publisherVersion.setPublisherEmail(email);
130 publisherVersion.setPublisherHistory(publisherHistory); 130 publisherVersion.setPublisherHistory(publisherHistory);
131 publisherVersion.setPublisherName(publisherName); 131 publisherVersion.setPublisherName(publisherName);
132 - publisherVersion.setPublisherPostalCode(publisherPostalCode); 132 + publisherVersion.setPublisherPostalCode(postalCode);
133 - publisherVersion.setPublisherPostOfficeBoxNumber(publisherPostOfficeBoxNumber); 133 + publisherVersion.setPublisherPostOfficeBoxNumber(postOfficeBoxNumber);
134 - publisherVersion.setPublisherStreetAddress(publisherStreetAddress); 134 + publisherVersion.setPublisherStreetAddress(streetAddress);
135 - publisherVersion.setPublisherTelephone(publisherTelephone); 135 + publisherVersion.setPublisherTelephone(telephone);
136 - publisherVersion.setPublisherURL(publisherURL); 136 + publisherVersion.setPublisherURL(uRL);
137 return publisherVersion; 137 return publisherVersion;
138 } 138 }
139 139
...@@ -163,10 +163,10 @@ public class PublisherVersionView implements Serializable { ...@@ -163,10 +163,10 @@ public class PublisherVersionView implements Serializable {
163 } 163 }
164 164
165 void update() { 165 void update() {
166 - logger.trace("debut update, attributs locaux, publisherAddressCountry = {} publisherAddressLocality = {} publisherAddressRegion = {} publisherEmail = {} publisherHistory = {} publisherName = {} publisherPostalCode = {} publisherPostOfficeBoxNumber = {} publisherStreetAddress = {} publisherTelephone {} publisherURL {}", 166 + logger.trace("debut update, attributs locaux, publisherAddressCountry = {} addressLocality = {} addressRegion = {} email = {} publisherHistory = {} publisherName = {} postalCode = {} postOfficeBoxNumber = {} streetAddress = {} telephone {} uRL {}",
167 - publisherAddressCountry, publisherAddressLocality, publisherAddressRegion, 167 + publisherAddressCountry, addressLocality, addressRegion,
168 - publisherEmail, publisherHistory, publisherName, publisherPostalCode, publisherPostOfficeBoxNumber, 168 + email, publisherHistory, publisherName, postalCode, postOfficeBoxNumber,
169 - publisherStreetAddress, publisherTelephone, publisherURL); 169 + streetAddress, telephone, uRL);
170 170
171 PublisherVersion publisherVersion = getNewPublisherVersion(); 171 PublisherVersion publisherVersion = getNewPublisherVersion();
172 172
...@@ -196,15 +196,15 @@ public class PublisherVersionView implements Serializable { ...@@ -196,15 +196,15 @@ public class PublisherVersionView implements Serializable {
196 logger.debug("Found a publisher version : {}", publisherVersion.toString()); 196 logger.debug("Found a publisher version : {}", publisherVersion.toString());
197 197
198 publisherName = publisherVersion.getPublisherName(); 198 publisherName = publisherVersion.getPublisherName();
199 - publisherStreetAddress = publisherVersion.getPublisherStreetAddress(); 199 + streetAddress = publisherVersion.getPublisherStreetAddress();
200 - publisherPostalCode = publisherVersion.getPublisherPostalCode(); 200 + postalCode = publisherVersion.getPublisherPostalCode();
201 - publisherPostOfficeBoxNumber = publisherVersion.getPublisherPostOfficeBoxNumber(); 201 + postOfficeBoxNumber = publisherVersion.getPublisherPostOfficeBoxNumber();
202 - publisherAddressRegion = publisherVersion.getPublisherAddressRegion(); 202 + addressRegion = publisherVersion.getPublisherAddressRegion();
203 - publisherAddressLocality = publisherVersion.getPublisherAddressLocality(); 203 + addressLocality = publisherVersion.getPublisherAddressLocality();
204 publisherAddressCountry = publisherVersion.getPublisherAddressCountry(); 204 publisherAddressCountry = publisherVersion.getPublisherAddressCountry();
205 - publisherTelephone = publisherVersion.getPublisherTelephone(); 205 + telephone = publisherVersion.getPublisherTelephone();
206 - publisherEmail = publisherVersion.getPublisherEmail(); 206 + email = publisherVersion.getPublisherEmail();
207 - publisherURL = publisherVersion.getPublisherURL(); 207 + uRL = publisherVersion.getPublisherURL();
208 publisherHistory = publisherVersion.getPublisherHistory(); 208 publisherHistory = publisherVersion.getPublisherHistory();
209 publisher = publisherVersion.getPublisher(); 209 publisher = publisherVersion.getPublisher();
210 210
...@@ -237,44 +237,44 @@ public class PublisherVersionView implements Serializable { ...@@ -237,44 +237,44 @@ public class PublisherVersionView implements Serializable {
237 this.publisherName = publisherName; 237 this.publisherName = publisherName;
238 } 238 }
239 239
240 - public String getPublisherStreetAddress() { 240 + public String getStreetAddress() {
241 - return publisherStreetAddress; 241 + return streetAddress;
242 } 242 }
243 243
244 - public void setPublisherStreetAddress(String publisherStreetAddress) { 244 + public void setStreetAddress(String streetAddress) {
245 - this.publisherStreetAddress = publisherStreetAddress; 245 + this.streetAddress = streetAddress;
246 } 246 }
247 247
248 - public String getPublisherPostalCode() { 248 + public String getPostalCode() {
249 - return publisherPostalCode; 249 + return postalCode;
250 } 250 }
251 251
252 - public void setPublisherPostalCode(String publisherPostalCode) { 252 + public void setPostalCode(String postalCode) {
253 - this.publisherPostalCode = publisherPostalCode; 253 + this.postalCode = postalCode;
254 } 254 }
255 255
256 - public String getPublisherPostOfficeBoxNumber() { 256 + public String getPostOfficeBoxNumber() {
257 - return publisherPostOfficeBoxNumber; 257 + return postOfficeBoxNumber;
258 } 258 }
259 259
260 - public void setPublisherPostOfficeBoxNumber(String publisherPostOfficeBoxNumber) { 260 + public void setPostOfficeBoxNumber(String postOfficeBoxNumber) {
261 - this.publisherPostOfficeBoxNumber = publisherPostOfficeBoxNumber; 261 + this.postOfficeBoxNumber = postOfficeBoxNumber;
262 } 262 }
263 263
264 - public String getPublisherAddressRegion() { 264 + public String getAddressRegion() {
265 - return publisherAddressRegion; 265 + return addressRegion;
266 } 266 }
267 267
268 - public void setPublisherAddressRegion(String publisherAddressRegion) { 268 + public void setAddressRegion(String addressRegion) {
269 - this.publisherAddressRegion = publisherAddressRegion; 269 + this.addressRegion = addressRegion;
270 } 270 }
271 271
272 - public String getPublisherAddressLocality() { 272 + public String getAddressLocality() {
273 - return publisherAddressLocality; 273 + return addressLocality;
274 } 274 }
275 275
276 - public void setPublisherAddressLocality(String publisherAddressLocality) { 276 + public void setAddressLocality(String addressLocality) {
277 - this.publisherAddressLocality = publisherAddressLocality; 277 + this.addressLocality = addressLocality;
278 } 278 }
279 279
280 public Country getPublisherAddressCountry() { 280 public Country getPublisherAddressCountry() {
...@@ -285,28 +285,28 @@ public class PublisherVersionView implements Serializable { ...@@ -285,28 +285,28 @@ public class PublisherVersionView implements Serializable {
285 this.publisherAddressCountry = publisherAddressCountry; 285 this.publisherAddressCountry = publisherAddressCountry;
286 } 286 }
287 287
288 - public String getPublisherTelephone() { 288 + public String getTelephone() {
289 - return publisherTelephone; 289 + return telephone;
290 } 290 }
291 291
292 - public void setPublisherTelephone(String publisherTelephone) { 292 + public void setTelephone(String telephone) {
293 - this.publisherTelephone = publisherTelephone; 293 + this.telephone = telephone;
294 } 294 }
295 295
296 - public String getPublisherEmail() { 296 + public String getEmail() {
297 - return publisherEmail; 297 + return email;
298 } 298 }
299 299
300 - public void setPublisherEmail(String publisherEmail) { 300 + public void setEmail(String email) {
301 - this.publisherEmail = publisherEmail; 301 + this.email = email;
302 } 302 }
303 303
304 - public String getPublisherURL() { 304 + public String getuRL() {
305 - return publisherURL; 305 + return uRL;
306 } 306 }
307 307
308 - public void setPublisherURL(String publisherURL) { 308 + public void setuRL(String uRL) {
309 - this.publisherURL = publisherURL; 309 + this.uRL = uRL;
310 } 310 }
311 311
312 public String getPublisherHistory() { 312 public String getPublisherHistory() {
......
...@@ -30,28 +30,28 @@ ...@@ -30,28 +30,28 @@
30 <h:panelGrid columns="2"> 30 <h:panelGrid columns="2">
31 <label for="publisherName">publisherName</label> 31 <label for="publisherName">publisherName</label>
32 <input type="text" id="publisherName" jsf:value='#{publisherVersionView.publisherName}' jsf:disabled="#{not publisherVersionView.editMode}"/> 32 <input type="text" id="publisherName" jsf:value='#{publisherVersionView.publisherName}' jsf:disabled="#{not publisherVersionView.editMode}"/>
33 - <label for="publisherStreetAddress">publisherStreetAddress</label> 33 + <label for="streetAddress">streetAddress</label>
34 - <input type="text" id="publisherStreetAddress" jsf:value='#{publisherVersionView.publisherStreetAddress}' jsf:disabled="#{not publisherVersionView.editMode}"/> 34 + <input type="text" id="streetAddress" jsf:value='#{publisherVersionView.streetAddress}' jsf:disabled="#{not publisherVersionView.editMode}"/>
35 - <label for="publisherPostalCode">publisherPostalCode</label> 35 + <label for="postalCode">postalCode</label>
36 - <input type="text" id="publisherPostalCode" jsf:value='#{publisherVersionView.publisherPostalCode}' jsf:disabled="#{not publisherVersionView.editMode}"/> 36 + <input type="text" id="postalCode" jsf:value='#{publisherVersionView.postalCode}' jsf:disabled="#{not publisherVersionView.editMode}"/>
37 - <label for="publisherPostOfficeBoxNumber">publisherPostOfficeBoxNumber</label> 37 + <label for="postOfficeBoxNumber">postOfficeBoxNumber</label>
38 - <input type="text" id="publisherPostOfficeBoxNumber" jsf:value='#{publisherVersionView.publisherPostOfficeBoxNumber}' jsf:disabled="#{not publisherVersionView.editMode}"/> 38 + <input type="text" id="postOfficeBoxNumber" jsf:value='#{publisherVersionView.postOfficeBoxNumber}' jsf:disabled="#{not publisherVersionView.editMode}"/>
39 - <label for="publisherAddressRegion">publisherAddressRegion</label> 39 + <label for="addressRegion">addressRegion</label>
40 - <input type="text" id="publisherAddressRegion" jsf:value='#{publisherVersionView.publisherAddressRegion}' jsf:disabled="#{not publisherVersionView.editMode}"/> 40 + <input type="text" id="addressRegion" jsf:value='#{publisherVersionView.addressRegion}' jsf:disabled="#{not publisherVersionView.editMode}"/>
41 - <label for="publisherAddressLocality">publisherAddressLocality</label> 41 + <label for="addressLocality">addressLocality</label>
42 - <input type="text" id="publisherAddressLocality" jsf:value='#{publisherVersionView.publisherAddressLocality}' jsf:disabled="#{not publisherVersionView.editMode}"/> 42 + <input type="text" id="addressLocality" jsf:value='#{publisherVersionView.addressLocality}' jsf:disabled="#{not publisherVersionView.editMode}"/>
43 43
44 <label for="publisherAddressCountry">publisherAddressCountry</label> 44 <label for="publisherAddressCountry">publisherAddressCountry</label>
45 <h:selectOneMenu id="publisherAddressCountry" value="#{publisherVersionView.publisherAddressCountry}" converter="omnifaces.SelectItemsConverter" disabled="#{not publisherVersionView.editMode}"> 45 <h:selectOneMenu id="publisherAddressCountry" value="#{publisherVersionView.publisherAddressCountry}" converter="omnifaces.SelectItemsConverter" disabled="#{not publisherVersionView.editMode}">
46 <f:selectItems value="#{publisherVersionView.availableCountries}" var="country" itemLabel="#{country.countryName}"/> 46 <f:selectItems value="#{publisherVersionView.availableCountries}" var="country" itemLabel="#{country.countryName}"/>
47 </h:selectOneMenu> 47 </h:selectOneMenu>
48 48
49 - <label for="publisherTelephone">publisherTelephone</label> 49 + <label for="telephone">telephone</label>
50 - <input type="text" id="publisherTelephone" jsf:value='#{publisherVersionView.publisherTelephone}' jsf:disabled="#{not publisherVersionView.editMode}"/> 50 + <input type="text" id="telephone" jsf:value='#{publisherVersionView.telephone}' jsf:disabled="#{not publisherVersionView.editMode}"/>
51 - <label for="publisherEmail">publisherEmail</label> 51 + <label for="email">email</label>
52 - <input type="text" id="publisherEmail" jsf:value='#{publisherVersionView.publisherEmail}' jsf:disabled="#{not publisherVersionView.editMode}"/> 52 + <input type="text" id="email" jsf:value='#{publisherVersionView.email}' jsf:disabled="#{not publisherVersionView.editMode}"/>
53 - <label for="publisherURL">publisherURL</label> 53 + <label for="uRL">uRL</label>
54 - <input type="text" id="publisherURL" jsf:value='#{publisherVersionView.publisherURL}' jsf:disabled="#{not publisherVersionView.editMode}"/> 54 + <input type="text" id="uRL" jsf:value='#{publisherVersionView.uRL}' jsf:disabled="#{not publisherVersionView.editMode}"/>
55 55
56 <label for="publisherHistory">publisherHistory</label> 56 <label for="publisherHistory">publisherHistory</label>
57 <textarea id="publisherHistory" rows="" cols="" jsf:disabled="#{not publisherVersionView.editMode}" jsf:value="#{publisherVersionView.publisherHistory}"/> 57 <textarea id="publisherHistory" rows="" cols="" jsf:disabled="#{not publisherVersionView.editMode}" jsf:value="#{publisherVersionView.publisherHistory}"/>
......
...@@ -92,14 +92,14 @@ public class PublisherVersionViewTest { ...@@ -92,14 +92,14 @@ public class PublisherVersionViewTest {
92 publisherVersionView.cancel(); 92 publisherVersionView.cancel();
93 93
94 assertThat(publisherVersionView.getPublisherName()).isNull(); 94 assertThat(publisherVersionView.getPublisherName()).isNull();
95 - assertThat(publisherVersionView.getPublisherStreetAddress()).isNull(); 95 + assertThat(publisherVersionView.getStreetAddress()).isNull();
96 - assertThat(publisherVersionView.getPublisherPostalCode()).isNull(); 96 + assertThat(publisherVersionView.getPostalCode()).isNull();
97 - assertThat(publisherVersionView.getPublisherPostOfficeBoxNumber()).isNull(); 97 + assertThat(publisherVersionView.getPostOfficeBoxNumber()).isNull();
98 - assertThat(publisherVersionView.getPublisherAddressRegion()).isNull(); 98 + assertThat(publisherVersionView.getAddressRegion()).isNull();
99 - assertThat(publisherVersionView.getPublisherAddressLocality()).isNull(); 99 + assertThat(publisherVersionView.getAddressLocality()).isNull();
100 - assertThat(publisherVersionView.getPublisherTelephone()).isNull(); 100 + assertThat(publisherVersionView.getTelephone()).isNull();
101 - assertThat(publisherVersionView.getPublisherEmail()).isNull(); 101 + assertThat(publisherVersionView.getEmail()).isNull();
102 - assertThat(publisherVersionView.getPublisherURL()).isNull(); 102 + assertThat(publisherVersionView.getuRL()).isNull();
103 assertThat(publisherVersionView.getPublisherHistory()).isNull(); 103 assertThat(publisherVersionView.getPublisherHistory()).isNull();
104 assertThat(publisherVersionView.isEditMode()).isTrue(); 104 assertThat(publisherVersionView.isEditMode()).isTrue();
105 } 105 }
...@@ -111,28 +111,28 @@ public class PublisherVersionViewTest { ...@@ -111,28 +111,28 @@ public class PublisherVersionViewTest {
111 publisherVersionView.setPublisherVersionId(1); 111 publisherVersionView.setPublisherVersionId(1);
112 112
113 publisherVersionView.setPublisherName("1"); 113 publisherVersionView.setPublisherName("1");
114 - publisherVersionView.setPublisherStreetAddress("2"); 114 + publisherVersionView.setStreetAddress("2");
115 - publisherVersionView.setPublisherPostalCode("3"); 115 + publisherVersionView.setPostalCode("3");
116 - publisherVersionView.setPublisherPostOfficeBoxNumber("4"); 116 + publisherVersionView.setPostOfficeBoxNumber("4");
117 - publisherVersionView.setPublisherAddressRegion("5"); 117 + publisherVersionView.setAddressRegion("5");
118 - publisherVersionView.setPublisherAddressLocality("6"); 118 + publisherVersionView.setAddressLocality("6");
119 publisherVersionView.setPublisherAddressCountry(new Country()); 119 publisherVersionView.setPublisherAddressCountry(new Country());
120 - publisherVersionView.setPublisherTelephone("7"); 120 + publisherVersionView.setTelephone("7");
121 - publisherVersionView.setPublisherEmail("8"); 121 + publisherVersionView.setEmail("8");
122 - publisherVersionView.setPublisherURL("9"); 122 + publisherVersionView.setuRL("9");
123 publisherVersionView.setPublisherHistory("10"); 123 publisherVersionView.setPublisherHistory("10");
124 124
125 publisherVersionView.cancel(); 125 publisherVersionView.cancel();
126 126
127 assertThat(publisherVersionView.getPublisherName()).isEqualTo("A"); 127 assertThat(publisherVersionView.getPublisherName()).isEqualTo("A");
128 - assertThat(publisherVersionView.getPublisherStreetAddress()).isEqualTo("B"); 128 + assertThat(publisherVersionView.getStreetAddress()).isEqualTo("B");
129 - assertThat(publisherVersionView.getPublisherPostalCode()).isEqualTo("C"); 129 + assertThat(publisherVersionView.getPostalCode()).isEqualTo("C");
130 - assertThat(publisherVersionView.getPublisherPostOfficeBoxNumber()).isEqualTo("D"); 130 + assertThat(publisherVersionView.getPostOfficeBoxNumber()).isEqualTo("D");
131 - assertThat(publisherVersionView.getPublisherAddressRegion()).isEqualTo("E"); 131 + assertThat(publisherVersionView.getAddressRegion()).isEqualTo("E");
132 - assertThat(publisherVersionView.getPublisherAddressLocality()).isEqualTo("F"); 132 + assertThat(publisherVersionView.getAddressLocality()).isEqualTo("F");
133 - assertThat(publisherVersionView.getPublisherTelephone()).isEqualTo("G"); 133 + assertThat(publisherVersionView.getTelephone()).isEqualTo("G");
134 - assertThat(publisherVersionView.getPublisherEmail()).isEqualTo("H"); 134 + assertThat(publisherVersionView.getEmail()).isEqualTo("H");
135 - assertThat(publisherVersionView.getPublisherURL()).isEqualTo("I"); 135 + assertThat(publisherVersionView.getuRL()).isEqualTo("I");
136 assertThat(publisherVersionView.getPublisherHistory()).isEqualTo("J"); 136 assertThat(publisherVersionView.getPublisherHistory()).isEqualTo("J");
137 assertThat(publisherVersionView.isEditMode()).isFalse(); 137 assertThat(publisherVersionView.isEditMode()).isFalse();
138 138
...@@ -157,14 +157,14 @@ public class PublisherVersionViewTest { ...@@ -157,14 +157,14 @@ public class PublisherVersionViewTest {
157 publisherVersionView.setPublisherVersionId(1); 157 publisherVersionView.setPublisherVersionId(1);
158 publisherVersionView.loadData(); 158 publisherVersionView.loadData();
159 assertThat(publisherVersionView.getPublisherName()).isEqualTo("A"); 159 assertThat(publisherVersionView.getPublisherName()).isEqualTo("A");
160 - assertThat(publisherVersionView.getPublisherStreetAddress()).isEqualTo("B"); 160 + assertThat(publisherVersionView.getStreetAddress()).isEqualTo("B");
161 - assertThat(publisherVersionView.getPublisherPostalCode()).isEqualTo("C"); 161 + assertThat(publisherVersionView.getPostalCode()).isEqualTo("C");
162 - assertThat(publisherVersionView.getPublisherPostOfficeBoxNumber()).isEqualTo("D"); 162 + assertThat(publisherVersionView.getPostOfficeBoxNumber()).isEqualTo("D");
163 - assertThat(publisherVersionView.getPublisherAddressRegion()).isEqualTo("E"); 163 + assertThat(publisherVersionView.getAddressRegion()).isEqualTo("E");
164 - assertThat(publisherVersionView.getPublisherAddressLocality()).isEqualTo("F"); 164 + assertThat(publisherVersionView.getAddressLocality()).isEqualTo("F");
165 - assertThat(publisherVersionView.getPublisherTelephone()).isEqualTo("G"); 165 + assertThat(publisherVersionView.getTelephone()).isEqualTo("G");
166 - assertThat(publisherVersionView.getPublisherEmail()).isEqualTo("H"); 166 + assertThat(publisherVersionView.getEmail()).isEqualTo("H");
167 - assertThat(publisherVersionView.getPublisherURL()).isEqualTo("I"); 167 + assertThat(publisherVersionView.getuRL()).isEqualTo("I");
168 assertThat(publisherVersionView.getPublisherHistory()).isEqualTo("J"); 168 assertThat(publisherVersionView.getPublisherHistory()).isEqualTo("J");
169 assertThat(publisherVersionView.isNewPublisher()).isFalse(); 169 assertThat(publisherVersionView.isNewPublisher()).isFalse();
170 } 170 }
...@@ -268,15 +268,15 @@ public class PublisherVersionViewTest { ...@@ -268,15 +268,15 @@ public class PublisherVersionViewTest {
268 publisherVersionView.setNewPublisher(false); 268 publisherVersionView.setNewPublisher(false);
269 269
270 publisherVersionView.setPublisherName("1"); 270 publisherVersionView.setPublisherName("1");
271 - publisherVersionView.setPublisherStreetAddress("2"); 271 + publisherVersionView.setStreetAddress("2");
272 - publisherVersionView.setPublisherPostalCode("3"); 272 + publisherVersionView.setPostalCode("3");
273 - publisherVersionView.setPublisherPostOfficeBoxNumber("4"); 273 + publisherVersionView.setPostOfficeBoxNumber("4");
274 - publisherVersionView.setPublisherAddressRegion("5"); 274 + publisherVersionView.setAddressRegion("5");
275 - publisherVersionView.setPublisherAddressLocality("6"); 275 + publisherVersionView.setAddressLocality("6");
276 publisherVersionView.setPublisherAddressCountry(new Country()); 276 publisherVersionView.setPublisherAddressCountry(new Country());
277 - publisherVersionView.setPublisherTelephone("7"); 277 + publisherVersionView.setTelephone("7");
278 - publisherVersionView.setPublisherEmail("8"); 278 + publisherVersionView.setEmail("8");
279 - publisherVersionView.setPublisherURL("9"); 279 + publisherVersionView.setuRL("9");
280 publisherVersionView.setPublisherHistory("10"); 280 publisherVersionView.setPublisherHistory("10");
281 publisherVersionView.setPublisher(publisherMock); 281 publisherVersionView.setPublisher(publisherMock);
282 } 282 }
...@@ -339,15 +339,15 @@ public class PublisherVersionViewTest { ...@@ -339,15 +339,15 @@ public class PublisherVersionViewTest {
339 publisherVersionView.setNewPublisher(true); 339 publisherVersionView.setNewPublisher(true);
340 340
341 publisherVersionView.setPublisherName("A"); 341 publisherVersionView.setPublisherName("A");
342 - publisherVersionView.setPublisherStreetAddress("B"); 342 + publisherVersionView.setStreetAddress("B");
343 - publisherVersionView.setPublisherPostalCode("C"); 343 + publisherVersionView.setPostalCode("C");
344 - publisherVersionView.setPublisherPostOfficeBoxNumber("D"); 344 + publisherVersionView.setPostOfficeBoxNumber("D");
345 - publisherVersionView.setPublisherAddressRegion("E"); 345 + publisherVersionView.setAddressRegion("E");
346 - publisherVersionView.setPublisherAddressLocality("F"); 346 + publisherVersionView.setAddressLocality("F");
347 publisherVersionView.setPublisherAddressCountry(new Country()); 347 publisherVersionView.setPublisherAddressCountry(new Country());
348 - publisherVersionView.setPublisherTelephone("G"); 348 + publisherVersionView.setTelephone("G");
349 - publisherVersionView.setPublisherEmail("H"); 349 + publisherVersionView.setEmail("H");
350 - publisherVersionView.setPublisherURL("I"); 350 + publisherVersionView.setuRL("I");
351 publisherVersionView.setPublisherHistory("J"); 351 publisherVersionView.setPublisherHistory("J");
352 publisherVersionView.setPublisher(publisherMock); 352 publisherVersionView.setPublisher(publisherMock);
353 } 353 }
......