Jean-Francois Leveque

Merge manuel.

...@@ -9,6 +9,8 @@ import javax.inject.Inject; ...@@ -9,6 +9,8 @@ import javax.inject.Inject;
9 import javax.inject.Named; 9 import javax.inject.Named;
10 import java.io.Serializable; 10 import java.io.Serializable;
11 import java.util.List; 11 import java.util.List;
12 +import javax.faces.context.FacesContext;
13 +import java.util.Map;
12 import java.util.stream.Collectors; 14 import java.util.stream.Collectors;
13 15
14 /* 16 /*
...@@ -32,12 +34,10 @@ public class ListPublisherVersionsView implements Serializable { ...@@ -32,12 +34,10 @@ public class ListPublisherVersionsView implements Serializable {
32 public ListPublisherVersionsView(PublisherService publisherService) { 34 public ListPublisherVersionsView(PublisherService publisherService) {
33 this.publisherService = publisherService; 35 this.publisherService = publisherService;
34 } 36 }
35 -
36 //no args constructor to make it proxyable 37 //no args constructor to make it proxyable
37 ListPublisherVersionsView() { 38 ListPublisherVersionsView() {
38 } 39 }
39 40
40 -
41 // View Action being executed at view loading 41 // View Action being executed at view loading
42 public void setView() { 42 public void setView() {
43 logger.trace("setView : publisherId = {}", publisherId); 43 logger.trace("setView : publisherId = {}", publisherId);
...@@ -64,7 +64,6 @@ public class ListPublisherVersionsView implements Serializable { ...@@ -64,7 +64,6 @@ public class ListPublisherVersionsView implements Serializable {
64 publisherVersions = publisherService.getAllPublisherVersions(); 64 publisherVersions = publisherService.getAllPublisherVersions();
65 filterOnID(); 65 filterOnID();
66 } 66 }
67 -//
68 67
69 public PublisherService getPublisherService() { 68 public PublisherService getPublisherService() {
70 return publisherService; 69 return publisherService;
......
...@@ -89,7 +89,7 @@ public class PublisherVersionView implements Serializable { ...@@ -89,7 +89,7 @@ public class PublisherVersionView implements Serializable {
89 publisherURL = null; 89 publisherURL = null;
90 publisherActive = false; 90 publisherActive = false;
91 publisherHistory = null; 91 publisherHistory = null;
92 - // Je ne pense pas que la ligne suivante soit nécessaire 92 +
93 publisher = null; 93 publisher = null;
94 94
95 editMode = true; 95 editMode = true;
......