From 6638a2609d95593e24578b1f224b80985ca2377c Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Wed, 16 Jan 2013 10:48:05 +0100
Subject: [PATCH] no-jira: fix difference in java compiler
---
.../org/olat/instantMessaging/model/InstantMessageImpl.java | 3 +--
.../instantMessaging/model/InstantMessageNotificationImpl.java | 3 +--
.../java/org/olat/instantMessaging/model/RosterEntryImpl.java | 2 +-
.../java/org/olat/instantMessaging/model/RosterEntryView.java | 2 +-
4 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/olat/instantMessaging/model/InstantMessageImpl.java b/src/main/java/org/olat/instantMessaging/model/InstantMessageImpl.java
index b9b6887c02b..7547225a963 100644
--- a/src/main/java/org/olat/instantMessaging/model/InstantMessageImpl.java
+++ b/src/main/java/org/olat/instantMessaging/model/InstantMessageImpl.java
@@ -48,8 +48,7 @@ import org.olat.instantMessaging.InstantMessage;
@NamedQueries({
@NamedQuery(name="loadIMessageByKey",query="select msg from instantmessage msg where msg.key=:key"),
@NamedQuery(name="loadIMessageByResource", query="select msg from instantmessage msg where msg.resourceId=:resid and msg.resourceTypeName=:resname order by msg.creationDate desc"),
- @NamedQuery(name="loadIMessageByResourceAndDate", query="select msg from instantmessage msg where msg.resourceId=:resid and msg.resourceTypeName=:resname and msg.creationDate>=:from order by msg.creationDate desc"),
-
+ @NamedQuery(name="loadIMessageByResourceAndDate", query="select msg from instantmessage msg where msg.resourceId=:resid and msg.resourceTypeName=:resname and msg.creationDate>=:from order by msg.creationDate desc")
})
public class InstantMessageImpl implements InstantMessage, Persistable, CreateInfo {
diff --git a/src/main/java/org/olat/instantMessaging/model/InstantMessageNotificationImpl.java b/src/main/java/org/olat/instantMessaging/model/InstantMessageNotificationImpl.java
index 73c2a0bae67..d237626fc30 100644
--- a/src/main/java/org/olat/instantMessaging/model/InstantMessageNotificationImpl.java
+++ b/src/main/java/org/olat/instantMessaging/model/InstantMessageNotificationImpl.java
@@ -48,8 +48,7 @@ import org.olat.instantMessaging.InstantMessageNotification;
@Table(name="o_im_notification")
@NamedQueries({
@NamedQuery(name="loadIMNotificationByIdentity", query="select notification from imnotification notification where notification.toIdentityKey=:identityKey order by notification.creationDate desc"),
- @NamedQuery(name="deleteIMNotificationByResourceAndIdentity", query="delete from imnotification notification where notification.toIdentityKey=:identityKey and notification.resourceId=:resid and notification.resourceTypeName=:resname"),
-
+ @NamedQuery(name="deleteIMNotificationByResourceAndIdentity", query="delete from imnotification notification where notification.toIdentityKey=:identityKey and notification.resourceId=:resid and notification.resourceTypeName=:resname")
})
public class InstantMessageNotificationImpl implements InstantMessageNotification, Persistable, CreateInfo {
diff --git a/src/main/java/org/olat/instantMessaging/model/RosterEntryImpl.java b/src/main/java/org/olat/instantMessaging/model/RosterEntryImpl.java
index 91b4298d81e..6f158eed6a1 100644
--- a/src/main/java/org/olat/instantMessaging/model/RosterEntryImpl.java
+++ b/src/main/java/org/olat/instantMessaging/model/RosterEntryImpl.java
@@ -47,7 +47,7 @@ import org.olat.core.id.Persistable;
@NamedQuery(name="loadIMRosterEntryByIdentityandResource", query="select entry from imrosterentry entry where entry.identityKey=:identityKey and entry.resourceId=:resid and entry.resourceTypeName=:resname"),
@NamedQuery(name="loadIMRosterEntryByResource", query="select entry from imrosterentry entry where entry.resourceId=:resid and entry.resourceTypeName=:resname"),
@NamedQuery(name="clearIMRosterEntry", query="delete from imrosterentry entry"),
- @NamedQuery(name="deleteIMRosterEntryByIdentityAndResource", query="delete from imrosterentry entry where entry.identityKey=:identityKey and entry.resourceId=:resid and entry.resourceTypeName=:resname"),
+ @NamedQuery(name="deleteIMRosterEntryByIdentityAndResource", query="delete from imrosterentry entry where entry.identityKey=:identityKey and entry.resourceId=:resid and entry.resourceTypeName=:resname")
})
public class RosterEntryImpl implements Persistable, CreateInfo {
diff --git a/src/main/java/org/olat/instantMessaging/model/RosterEntryView.java b/src/main/java/org/olat/instantMessaging/model/RosterEntryView.java
index ffa2f04f0cc..081dce57bd3 100644
--- a/src/main/java/org/olat/instantMessaging/model/RosterEntryView.java
+++ b/src/main/java/org/olat/instantMessaging/model/RosterEntryView.java
@@ -45,7 +45,7 @@ import org.olat.core.id.Persistable;
@Entity(name="imrosterentryview") @Cacheable(false)
@Table(name="o_im_roster_entry_v")
@NamedQueries({
- @NamedQuery(name="loadIMRosterEntryViewByResource", query="select entry from imrosterentryview entry where entry.resourceId=:resid and entry.resourceTypeName=:resname"),
+ @NamedQuery(name="loadIMRosterEntryViewByResource", query="select entry from imrosterentryview entry where entry.resourceId=:resid and entry.resourceTypeName=:resname")
})
public class RosterEntryView implements Persistable, CreateInfo {
--
GitLab