BlueGreycalmElegant

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /kickup/trunk/src/ak/kickup/core @ 1265

  → /kickup/trunk/src/ak/kickup/core @ 1428

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 1265 → Rev 1428

/kickup/trunk/src/ak/kickup/core/action/ParticipantAction.java
144,6 → 144,7
showForm.set("transportComment", participant.getTransportComment());
showForm.set("freeSleep", StringConverter.toString(participant.getFreeSleep()));
showForm.set("sleepComment", participant.getSleepComment());
showForm.set("protectedComment", participant.getProtectedComment());
showForm.set("comment", participant.getComment());
request.setAttribute("participant", participant);
232,6 → 233,7
participant.setTransportComment((String)theForm.get("transportComment"));
participant.setFreeSleep(StringConverter.parseInteger(theForm.get("freeSleep")));
participant.setSleepComment((String)theForm.get("sleepComment"));
participant.setProtectedComment((String)theForm.get("protectedComment"));
participant.setComment((String)theForm.get("comment"));
ParticipantManager.getInstance().save(participant);
296,6 → 298,7
participant.setTransportComment((String)theForm.get("transportComment"));
participant.setFreeSleep(StringConverter.parseInteger(theForm.get("freeSleep")));
participant.setSleepComment((String)theForm.get("sleepComment"));
participant.setProtectedComment((String)theForm.get("protectedComment"));
participant.setComment((String)theForm.get("comment"));
ParticipantManager.getInstance().save(participant);

/kickup/trunk/src/ak/kickup/core/action/AdminParticipantAction.java
104,6 → 104,7
showForm.set("sleepComment", participant.getSleepComment());
showForm.set("payed", StringConverter.toCurrency(participant.getPayed()));
showForm.set("comment", participant.getComment());
showForm.set("protectedComment", participant.getProtectedComment());
showForm.set("privateComment", participant.getPrivateComment());
}
202,6 → 203,7
participant.setSleepComment((String)theForm.get("sleepComment"));
participant.setPayed(StringConverter.parseCurrency(theForm.get("payed")));
participant.setComment((String)theForm.get("comment"));
participant.setProtectedComment((String)theForm.get("protectedComment"));
participant.setPrivateComment((String)theForm.get("privateComment"));
ParticipantManager.getInstance().save(participant);

/kickup/trunk/src/ak/kickup/core/model/Participant.java
41,6 → 41,7
private String sleepComment;
private BigDecimal payed;
private String comment;
private String protectedComment;
private String privateComment;
private Collection acts; // Collection(ParticipantAct)
private Map actsMap = new HashMap(); // Map(Long id -> ParticipantAct)
314,6 → 315,20
/**
*
* @hibernate.property column="protected_comment"
*/
public String getProtectedComment()
{
return protectedComment;
}
public void setProtectedComment(String protectedComment)
{
this.protectedComment = protectedComment;
}
/**
*
* @hibernate.property column="private_comment"
*/
public String getPrivateComment()