56,16 → 56,23 |
return e; |
} |
|
public Event get(Long id) |
public Event get(Long id, boolean enabledOnly) |
throws ModelException |
{ |
Event event; |
|
try { |
return (Event)HibernateUtil.currentSession().load(Event.class, id); |
event = (Event)HibernateUtil.currentSession().load(Event.class, id); |
} |
catch(HibernateException ex) |
{ |
throw new ModelException(ex); |
} |
|
if(enabledOnly && (event.getEnabled() == null || !event.getEnabled().booleanValue())) |
throw new ModelSecurityException(); |
|
return event; |
} |
|
public boolean nameExists(Event event, String name) |
201,4 → 208,62 |
return (obj instanceof StartComparator); |
} |
} |
|
public static final Comparator ACT_NAME_COMPARATOR = new ActNameComparator(); |
|
private static class ActNameComparator |
implements Comparator |
{ |
public int compare(Object o1, Object o2) |
{ |
if(!(o1 instanceof EventAct) || !(o2 instanceof EventAct)) |
throw new ClassCastException("not a EventAct"); |
|
EventAct a1 = (EventAct)o1; |
EventAct a2 = (EventAct)o2; |
|
if(a1 == null && a2 == null) |
return 0; |
else if(a1 == null && a2 != null) |
return -1; |
else if(a1 != null && a2 == null) |
return 1; |
else |
return a1.getAct().getName().compareToIgnoreCase(a2.getAct().getName()); |
} |
|
public boolean equals(Object obj) |
{ |
return (obj instanceof ActNameComparator); |
} |
} |
|
public static final Comparator APARTMENT_NAME_COMPARATOR = new ApartmentNameComparator(); |
|
private static class ApartmentNameComparator |
implements Comparator |
{ |
public int compare(Object o1, Object o2) |
{ |
if(!(o1 instanceof EventApartment) || !(o2 instanceof EventApartment)) |
throw new ClassCastException("not a EventApartment"); |
|
EventApartment a1 = (EventApartment)o1; |
EventApartment a2 = (EventApartment)o2; |
|
if(a1 == null && a2 == null) |
return 0; |
else if(a1 == null && a2 != null) |
return -1; |
else if(a1 != null && a2 == null) |
return 1; |
else |
return a1.getApartment().getName().compareToIgnoreCase(a2.getApartment().getName()); |
} |
|
public boolean equals(Object obj) |
{ |
return (obj instanceof ApartmentNameComparator); |
} |
} |
} |