name change from relativePath, to absolute
This commit is contained in:
parent
d453e02ae2
commit
5ae70ce57a
src/main/java/se/su/dsv/scipro/conference
@ -17,7 +17,7 @@ public class SubscriberModel implements IClusterable{
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
private User user;
|
||||
private String relativePath;
|
||||
private String absolutePath;
|
||||
private NotificationPriority notificationPriority;
|
||||
|
||||
|
||||
@ -29,7 +29,7 @@ public class SubscriberModel implements IClusterable{
|
||||
public SubscriberModel(User user, String absolutePath, NotificationPriority notificationPriority) {
|
||||
super();
|
||||
this.user = user;
|
||||
this.relativePath = absolutePath;
|
||||
this.absolutePath = absolutePath;
|
||||
this.notificationPriority = notificationPriority;
|
||||
}
|
||||
/**
|
||||
@ -45,17 +45,18 @@ public class SubscriberModel implements IClusterable{
|
||||
this.user = user;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @return the relativePath
|
||||
* @return the absolutePath
|
||||
*/
|
||||
public String getRelativePath() {
|
||||
return relativePath;
|
||||
public String getAbsolutePath() {
|
||||
return absolutePath;
|
||||
}
|
||||
/**
|
||||
* @param relativePath the relativePath to set
|
||||
* @param absolutePath the absolutePath to set
|
||||
*/
|
||||
public void setRelativePath(String relativePath) {
|
||||
this.relativePath = relativePath;
|
||||
public void setAbsolutePath(String absolutePath) {
|
||||
this.absolutePath = absolutePath;
|
||||
}
|
||||
/**
|
||||
* @return the notificationPriority
|
||||
@ -69,44 +70,4 @@ public class SubscriberModel implements IClusterable{
|
||||
public void setNotificationPriority(NotificationPriority notificationPriority) {
|
||||
this.notificationPriority = notificationPriority;
|
||||
}
|
||||
/* (non-Javadoc)
|
||||
* @see java.lang.Object#hashCode()
|
||||
*/
|
||||
@Override
|
||||
public int hashCode() {
|
||||
final int prime = 31;
|
||||
int result = 1;
|
||||
result = prime * result
|
||||
+ ((notificationPriority == null) ? 0 : notificationPriority.hashCode());
|
||||
result = prime * result + ((relativePath == null) ? 0 : relativePath.hashCode());
|
||||
result = prime * result + ((user == null) ? 0 : user.hashCode());
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (this == obj)
|
||||
return true;
|
||||
if (obj == null)
|
||||
return false;
|
||||
if (getClass() != obj.getClass())
|
||||
return false;
|
||||
SubscriberModel other = (SubscriberModel) obj;
|
||||
if (notificationPriority != other.notificationPriority)
|
||||
return false;
|
||||
if (relativePath == null) {
|
||||
if (other.relativePath != null)
|
||||
return false;
|
||||
} else if (!relativePath.equals(other.relativePath))
|
||||
return false;
|
||||
if (user == null) {
|
||||
if (other.user != null)
|
||||
return false;
|
||||
} else if (!user.equals(other.user))
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
@ -196,7 +196,7 @@ public class ConferencePanel extends Panel {
|
||||
|
||||
for (SubscriberModel subscriberModel : subscriberModels) {
|
||||
createNotification(subscriberModel.getUser(), message,
|
||||
subscriberModel.getNotificationPriority(), subscriberModel.getRelativePath());
|
||||
subscriberModel.getNotificationPriority(), subscriberModel.getAbsolutePath());
|
||||
}
|
||||
|
||||
webMarkupContainer.removeAll();
|
||||
|
Loading…
x
Reference in New Issue
Block a user