From 71ad012fa10a25e7174f6cb0e453852065b4953f Mon Sep 17 00:00:00 2001 From: travismccauley Date: Wed, 7 Jan 2004 18:36:50 +0000 Subject: [PATCH] Updated Roster to use new ThdlUser Repository --- build.xml | 77 ++--- src/java/org/thdl/roster/om/Person.java | 2 +- src/java/org/thdl/roster/pages/Home.java | 2 +- src/java/org/thdl/roster/pages/Login.java | 10 +- .../roster/pages/forms/ContactInfoPage.java | 2 +- .../thdl/roster/pages/forms/MemberData.java | 2 +- .../roster/pages/forms/MemberFormSeries.java | 2 +- .../report.roster-repository.om.generation | 327 ------------------ 8 files changed, 39 insertions(+), 385 deletions(-) delete mode 100755 src/java/report.roster-repository.om.generation diff --git a/build.xml b/build.xml index c72014a..552ee0e 100755 --- a/build.xml +++ b/build.xml @@ -19,59 +19,22 @@ + + + + - + + - - - - - - - - - - - - - - - - - - - - - - - + - - + + @@ -98,6 +61,11 @@ + - - - + + + + + + + diff --git a/src/java/org/thdl/roster/om/Person.java b/src/java/org/thdl/roster/om/Person.java index 71afca6..c2b0b43 100755 --- a/src/java/org/thdl/roster/om/Person.java +++ b/src/java/org/thdl/roster/om/Person.java @@ -71,7 +71,7 @@ public class Person extends org.thdl.roster.om.Member implements RosterMember, j public Person( ThdlUser user ) throws TorqueException { this(); - getPersonData().setThdlUserId( new Integer( user.getId() ) ); + getPersonData().setThdlUserId( user.getId() ); getPersonData().setFirstname( user.getFirstname() ); getPersonData().setMiddlename( user.getMiddlename() ); getPersonData().setLastname( user.getLastname() ); diff --git a/src/java/org/thdl/roster/pages/Home.java b/src/java/org/thdl/roster/pages/Home.java index f38cd41..648f460 100755 --- a/src/java/org/thdl/roster/pages/Home.java +++ b/src/java/org/thdl/roster/pages/Home.java @@ -54,7 +54,7 @@ public class Home extends RosterPage Visit visit = (Visit)getVisit(); if ( visit.isAuthenticated() ) { - Integer userId = new Integer( visit.getThdlUser().getId() ); + Integer userId = visit.getThdlUser().getId() ; Global global = (Global) getGlobal(); Iterator iter = global.getAllPeople().iterator(); while( iter.hasNext() ) diff --git a/src/java/org/thdl/roster/pages/Login.java b/src/java/org/thdl/roster/pages/Login.java index 4b3a858..62724c9 100755 --- a/src/java/org/thdl/roster/pages/Login.java +++ b/src/java/org/thdl/roster/pages/Login.java @@ -60,10 +60,12 @@ public class Login extends RosterPage public boolean validateUser() { boolean rVal = false; - ThdlUser thdlUser = null; try { - thdlUser = ThdlUserRepository.getInstance().validate( getLogin(), getPassword() ); + ThdlUser thdlUser = new ThdlUser(); + thdlUser.setUsername( getLogin() ); + thdlUser.setPassword( getPassword() ); + thdlUser = ThdlUserRepository.getInstance().validate( thdlUser, "roster" ); rVal = true; Visit visit = (Visit) getVisit(); visit.setThdlUser( thdlUser ); @@ -73,6 +75,10 @@ public class Login extends RosterPage { setMessage( ture.getMessage() ); } + catch ( java.sql.SQLException e ) + { + throw new ApplicationRuntimeException( e ); + } return rVal; } diff --git a/src/java/org/thdl/roster/pages/forms/ContactInfoPage.java b/src/java/org/thdl/roster/pages/forms/ContactInfoPage.java index b3e9e55..200749a 100755 --- a/src/java/org/thdl/roster/pages/forms/ContactInfoPage.java +++ b/src/java/org/thdl/roster/pages/forms/ContactInfoPage.java @@ -19,7 +19,7 @@ public class ContactInfoPage extends MemberFormSeries { Visit visit = (Visit) getVisit(); Member member = (Member) visit.getMember(); - member.save( new Integer( visit.getThdlUser().getId() ) ); + member.save( visit.getThdlUser().getId() ); try { if ( member instanceof Person ) diff --git a/src/java/org/thdl/roster/pages/forms/MemberData.java b/src/java/org/thdl/roster/pages/forms/MemberData.java index 383b2a8..630390e 100755 --- a/src/java/org/thdl/roster/pages/forms/MemberData.java +++ b/src/java/org/thdl/roster/pages/forms/MemberData.java @@ -90,7 +90,7 @@ public class MemberData extends MemberFormSeries //don't move this line! List flatDataIds = person.getPersonData().getPersonTypeIdList(); - Integer userId = new Integer( visit.getThdlUser().getId() ); + Integer userId = visit.getThdlUser().getId() ; person.getPersonData().setThdlUserId( userId ); person.getPersonData().save(); person.setPersonDataKey( member.getPersonData().getPrimaryKey() ); diff --git a/src/java/org/thdl/roster/pages/forms/MemberFormSeries.java b/src/java/org/thdl/roster/pages/forms/MemberFormSeries.java index 92ee5da..5dcf2bd 100755 --- a/src/java/org/thdl/roster/pages/forms/MemberFormSeries.java +++ b/src/java/org/thdl/roster/pages/forms/MemberFormSeries.java @@ -116,7 +116,7 @@ public abstract class MemberFormSeries extends SecureRosterPage if ( ! member.isNew() ) { Integer owner = member.getCreatedBy(); - Integer user = new Integer( visit.getThdlUser().getId() ); + Integer user = visit.getThdlUser().getId(); if ( ! owner.equals( user ) ) { RosterPage home = (RosterPage) cycle.getPage( "Home" ); diff --git a/src/java/report.roster-repository.om.generation b/src/java/report.roster-repository.om.generation deleted file mode 100755 index 2a3af22..0000000 --- a/src/java/report.roster-repository.om.generation +++ /dev/null @@ -1,327 +0,0 @@ - - - - - org.thdl.roster.om - org.thdl.roster.om - org.thdl.roster.om.map - - Failed to create dir or dir already exists: /Users/travis/webapps/roster/src/java/org/thdl/roster/om/ - - Failed to create dir or dir already exists: /Users/travis/webapps/roster/src/java/org/thdl/roster/om/map/ - - Failed to create dir or dir already exists: /Users/travis/webapps/roster/src/java/org/thdl/roster/om/ - - Member - - - - - - - - - - - - - PersonData - - - - - - - - - - - - - ProjectData - - - - - - - - - - - - - OrganizationData - - - - - - - - - - - - - ContactInfo - - - - - - - - - - - - - Address - - - - - - - - - - - - - Phone - - - - - - - - - - - - - Publication - - - - - - - - - - - - - ResearchInterest - - - - - - - - - - - - - Document - - - - - - - - - - - - - Country - - - - - - - - - - - - - CulturalArea - - - - - - - - - - - - - Language - - - - - - - - - - - - - Discipline - - - - - - - - - - - - - DocumentType - - - - - - - - - - - - - ProjectType - - - - - - - - - - - - - OrganizationType - - - - - - - - - - - - - PersonType - - - - - - - - - - - - - PersonPersonType - - - - - - - - - - - - - OrganizationOrganizationType - - - - - - - - - - - - - ProjectProjectType - - - - - - - - - - - - - ResearchInterestLanguage - - - - - - - - - - - - - ResearchInterestCulturalArea - - - - - - - - - - - - - ResearchInterestDiscipline - - - - - - - - - - - - - \ No newline at end of file