taylor 2004/07/13 15:45:29
Modified: src/java/org/apache/jetspeed/services/profiler
JetspeedProfilerService.java
Log:
clean up tabbing
CVS: ----------------------------------------------------------------------
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision Changes Path
1.58 +18 -14
jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java
Index: JetspeedProfilerService.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- JetspeedProfilerService.java 25 Jun 2004 21:43:53 -0000 1.57
+++ JetspeedProfilerService.java 13 Jul 2004 22:45:29 -0000 1.58
@@ -104,7 +104,7 @@
private final static String CONFIG_SECURITY = "security";
private final static String CONFIG_ROLE_FALLBACK = "rolefallback";
private final static String CONFIG_NEWUSER_TEMPLATE = "newuser.template";
- private final static String CONFIG_NEWGROUP_TEMPLATE = "newgroup.template";
+ private final static String CONFIG_NEWGROUP_TEMPLATE = "newgroup.template";
private final static String CONFIG_NEWUSER_MEDIA = "newuser.media_types";
private final static String CONFIG_FALLBACK_LANGUAGE = "fallback.language";
private final static String CONFIG_FALLBACK_COUNTRY = "fallback.country";
@@ -119,8 +119,8 @@
private final static boolean DEFAULT_CONFIG_SECURITY = false;
private final static boolean DEFAULT_CONFIG_ROLE_FALLBACK = true;
private final static String DEFAULT_CONFIG_NEWUSER_TEMPLATE = null;
- private final static String DEFAULT_CONFIG_NEWGROUP_TEMPLATE = "Jetspeed";
- private final static String [] DEFAULT_CONFIG_NEWUSER_MEDIA = { "html", "wml" };
+ private final static String DEFAULT_CONFIG_NEWGROUP_TEMPLATE = "Jetspeed";
+ private final static String [] DEFAULT_CONFIG_NEWUSER_MEDIA = { "html", "wml" };
private final static String DEFAULT_CONFIG_ROLE_MERGE_CONTROL = "TabControl";
private final static String DEFAULT_CONFIG_ROLE_MERGE_CONTROLLER =
"TabController";
@@ -143,8 +143,8 @@
// MODIFIED: A. Kempf
String newUserTemplate = DEFAULT_CONFIG_NEWUSER_TEMPLATE;
- // added by Bob Fleischman - June 2004
- String newGroupTemplate = DEFAULT_CONFIG_NEWGROUP_TEMPLATE;
+ // added by Bob Fleischman - June 2004
+ String newGroupTemplate = DEFAULT_CONFIG_NEWGROUP_TEMPLATE;
boolean useSecurity = false; // use security features
boolean useRoleFallback = true;
@@ -169,7 +169,7 @@
Profile current = null;
CapabilityMap map;
- String newTemplate;
+ String newTemplate;
if (data == null)
{
@@ -202,7 +202,7 @@
Profile dummy;
for (int ix=0; ix < mediaTypes.length; ix++)
{
- dummy = createProfile(data, profile, mediaTypes[ix], newTemplate);
+ dummy = createProfile(data, profile, mediaTypes[ix], newTemplate);
if (mediaTypes[ix].equalsIgnoreCase(mediaType))
current = dummy;
}
@@ -836,7 +836,7 @@
newUserTemplate = serviceConf.getString( CONFIG_NEWUSER_TEMPLATE,
DEFAULT_CONFIG_NEWUSER_TEMPLATE );
- newGroupTemplate = serviceConf.getString( CONFIG_NEWGROUP_TEMPLATE,
DEFAULT_CONFIG_NEWGROUP_TEMPLATE );
+ newGroupTemplate = serviceConf.getString( CONFIG_NEWGROUP_TEMPLATE,
DEFAULT_CONFIG_NEWGROUP_TEMPLATE );
useFallbackToRoot = serviceConf.getBoolean( CONFIG_FALLBACK_TO_ROOT,
useFallbackToRoot );
@@ -1049,11 +1049,15 @@
try
{
ProfileLocator locator = createLocator();
- // If group is not null assume this is a Group we are requesting
- if (profile.getGroup() != null)
- locator.setGroup( JetspeedSecurity.getGroup(from) );
- else
- locator.setUser( JetspeedSecurity.getUser(from) );
+ // If group is not null assume this is a Group we are requesting
+ if (profile.getGroup() != null)
+ {
+ locator.setGroup( JetspeedSecurity.getGroup(from) );
+ }
+ else
+ {
+ locator.setUser( JetspeedSecurity.getUser(from) );
+ }
locator.setMediaType(contentType);
PSMLDocument doc = fallback(locator);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
