You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by mo...@apache.org on 2003/04/23 16:49:13 UTC
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml JetspeedGroupProfilePeer.java JetspeedRoleProfilePeer.java JetspeedUserProfilePeer.java
morciuch 2003/04/23 07:49:13
Modified: src/java/org/apache/jetspeed/om/dbpsml
JetspeedGroupProfilePeer.java
JetspeedRoleProfilePeer.java
JetspeedUserProfilePeer.java
Log:
More fixes by Jeremy Ford related to Bugzilla bug# 16627
Revision Changes Path
1.11 +38 -5 jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedGroupProfilePeer.java
Index: JetspeedGroupProfilePeer.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedGroupProfilePeer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JetspeedGroupProfilePeer.java 21 Nov 2002 16:01:46 -0000 1.10
+++ JetspeedGroupProfilePeer.java 23 Apr 2003 14:49:13 -0000 1.11
@@ -78,8 +78,26 @@
groupProfile.setGroupName(profile.getGroup().getName());
groupProfile.setMediaType(profile.getMediaType());
- groupProfile.setLanguage(profile.getLanguage());
- groupProfile.setCountry(profile.getCountry());
+
+ String language = profile.getLanguage();
+ if(language != null && (!language.equals("-1")))
+ {
+ groupProfile.setLanguage(language);
+ }
+ else
+ {
+ groupProfile.setLanguage(null);
+ }
+
+ String country = profile.getCountry();
+ if(country != null && (!country.equals("-1")))
+ {
+ groupProfile.setCountry(country);
+ }
+ else
+ {
+ groupProfile.setCountry(null);
+ }
String name = profile.getName();
if (name == null || name.equals(""))
{
@@ -204,8 +222,23 @@
criteria.add(MEDIA_TYPE, locator.getMediaType());
}
- criteria.add(LANGUAGE, locator.getLanguage());
- criteria.add(COUNTRY, locator.getCountry());
+ if (language != null && language.length() > 0 && (!language.equals("-1")))
+ {
+ criteria.add(LANGUAGE, language);
+ }
+ else if(language != null && language.equals("-1"))
+ {
+ criteria.add(LANGUAGE, null);
+ }
+
+ if (country != null && country.length() > 0 && (!country.equals("-1")))
+ {
+ criteria.add(COUNTRY, country);
+ }
+ else if(country != null && country.equals("-1"))
+ {
+ criteria.add(COUNTRY, null);
+ }
return criteria;
}
1.11 +39 -5 jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedRoleProfilePeer.java
Index: JetspeedRoleProfilePeer.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedRoleProfilePeer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JetspeedRoleProfilePeer.java 21 Nov 2002 16:01:46 -0000 1.10
+++ JetspeedRoleProfilePeer.java 23 Apr 2003 14:49:13 -0000 1.11
@@ -78,8 +78,27 @@
roleProfile.setRoleName(profile.getRole().getName());
roleProfile.setMediaType(profile.getMediaType());
- roleProfile.setLanguage(profile.getLanguage());
- roleProfile.setCountry(profile.getCountry());
+
+ String language = profile.getLanguage();
+ if(language != null && (!language.equals("-1")))
+ {
+ roleProfile.setLanguage(language);
+ }
+ else
+ {
+ roleProfile.setLanguage(null);
+ }
+
+ String country = profile.getCountry();
+ if(country != null && (!country.equals("-1")))
+ {
+ roleProfile.setCountry(country);
+ }
+ else
+ {
+ roleProfile.setCountry(null);
+ }
+
String name = profile.getName();
if (name == null || name.equals(""))
{
@@ -201,8 +220,23 @@
criteria.add(MEDIA_TYPE, locator.getMediaType());
}
- criteria.add(LANGUAGE, locator.getLanguage());
- criteria.add(COUNTRY, locator.getCountry());
+ if (language != null && language.length() > 0 && (!language.equals("-1")))
+ {
+ criteria.add(LANGUAGE, language);
+ }
+ else if(language != null && language.equals("-1"))
+ {
+ criteria.add(LANGUAGE, null);
+ }
+
+ if (country != null && country.length() > 0 && (!country.equals("-1")))
+ {
+ criteria.add(COUNTRY, country);
+ }
+ else if(country != null && country.equals("-1"))
+ {
+ criteria.add(COUNTRY, null);
+ }
return criteria;
}
1.13 +36 -8 jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedUserProfilePeer.java
Index: JetspeedUserProfilePeer.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedUserProfilePeer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JetspeedUserProfilePeer.java 2 Apr 2003 17:08:46 -0000 1.12
+++ JetspeedUserProfilePeer.java 23 Apr 2003 14:49:13 -0000 1.13
@@ -84,9 +84,28 @@
userProfile.setUserName(profile.getUser().getUserName());
userProfile.setMediaType(profile.getMediaType());
- userProfile.setLanguage(profile.getLanguage());
+
+ String language = profile.getLanguage();
+ if(language != null && (!language.equals("-1")))
+ {
+ userProfile.setLanguage(language);
+ }
+ else
+ {
+ userProfile.setLanguage(null);
+ }
+
+ String country = profile.getCountry();
+ if(country != null && (!country.equals("-1")))
+ {
+ userProfile.setCountry(country);
+ }
+ else
+ {
+ userProfile.setCountry(null);
+ }
- userProfile.setCountry(profile.getCountry());
+
String name = profile.getName();
if (name == null || name.equals(""))
{
@@ -212,14 +231,23 @@
criteria.add(MEDIA_TYPE, mediaType);
}
- if (language != null && language.length() > 0) {
- criteria.add(LANGUAGE, language);
+ if (language != null && language.length() > 0 && (!language.equals("-1")))
+ {
+ criteria.add(LANGUAGE, language);
+ }
+ else if(language != null && language.equals("-1"))
+ {
+ criteria.add(LANGUAGE, null);
}
- if (country != null && country.length() > 0) {
- criteria.add(COUNTRY, country);
+ if (country != null && country.length() > 0 && (!country.equals("-1")))
+ {
+ criteria.add(COUNTRY, country);
}
-
+ else if(country != null && country.equals("-1"))
+ {
+ criteria.add(COUNTRY, null);
+ }
return criteria;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org