From 699e71e76b15081baf746c6ce9c9144f7e5f1ff9 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 30 Sep 2013 10:11:28 -0400
Subject: [PATCH] Trim trailing whitespace and organize imports

---
 src/main/java/com/gitblit/wicket/panels/RegistrantPermissionsPanel.java |   45 ++++++++++++++++++++++++---------------------
 1 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/gitblit/wicket/panels/RegistrantPermissionsPanel.java b/src/main/java/com/gitblit/wicket/panels/RegistrantPermissionsPanel.java
index 4156cd1..b728082 100644
--- a/src/main/java/com/gitblit/wicket/panels/RegistrantPermissionsPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/RegistrantPermissionsPanel.java
@@ -52,17 +52,17 @@
 
 /**
  * Allows user to manipulate registrant access permissions.
- * 
+ *
  * @author James Moger
  *
  */
 public class RegistrantPermissionsPanel extends BasePanel {
 
 	private static final long serialVersionUID = 1L;
-	
+
 	public enum Show {
 		specified, mutable, effective;
-		
+
 		public boolean show(RegistrantAccessPermission ap) {
 			switch (this) {
 			case specified:
@@ -76,9 +76,9 @@
 			}
 		}
 	}
-	
+
 	private Show activeState = Show.mutable;
-	
+
 	public RegistrantPermissionsPanel(String wicketId, RegistrantType registrantType, List<String> allRegistrants, final List<RegistrantAccessPermission> permissions, final Map<AccessPermission, String> translations) {
 		super(wicketId);
 		setOutputMarkupId(true);
@@ -97,7 +97,7 @@
 		 */
 		RefreshingView<RegistrantAccessPermission> dataView = new RefreshingView<RegistrantAccessPermission>("permissionRow") {
 			private static final long serialVersionUID = 1L;
-		
+
 			@Override
             protected Iterator<IModel<RegistrantAccessPermission>> getItemModels() {
                 // the iterator returns RepositoryPermission objects, but we need it to
@@ -116,7 +116,8 @@
                 // 'even' for decoration
                 return new OddEvenItem<RegistrantAccessPermission>(id, index, model);
             }
-            
+
+			@Override
 			public void populateItem(final Item<RegistrantAccessPermission> item) {
 				final RegistrantAccessPermission entry = item.getModelObject();
 				if (RegistrantType.REPOSITORY.equals(entry.registrantType)) {
@@ -135,7 +136,7 @@
 						Label label = new Label("registrant", entry.registrant);
 						WicketUtils.setCssStyle(label, "font-weight: bold;");
 						item.add(label);
-					}					
+					}
 				} else if (RegistrantType.USER.equals(entry.registrantType)) {
 					// user
 					PersonIdent ident = new PersonIdent(entry.registrant, "");
@@ -146,8 +147,8 @@
 
 					Fragment userFragment = new Fragment("registrant", "userRegistrant", RegistrantPermissionsPanel.this);
 					userFragment.add(new GravatarImage("userAvatar", ident, 20, false));
-					userFragment.add(new Label("userName", entry.registrant));					
-					item.add(userFragment);					
+					userFragment.add(new Label("userName", entry.registrant));
+					item.add(userFragment);
 				} else {
 					// team
 					Fragment teamFragment = new Fragment("registrant", "teamRegistrant", RegistrantPermissionsPanel.this);
@@ -209,9 +210,10 @@
 				permissionChoice.setOutputMarkupId(true);
 				if (entry.mutable) {
 					permissionChoice.add(new AjaxFormComponentUpdatingBehavior("onchange") {
-		           
+
 						private static final long serialVersionUID = 1L;
 
+						@Override
 						protected void onUpdate(AjaxRequestTarget target) {
 							target.addComponent(permissionChoice);
 						}
@@ -265,29 +267,30 @@
 					copy.source = copy.registrant;
 				}
 				permissions.add(copy);
-				
+
 				// resort permissions after insert to convey idea of eval order
 				Collections.sort(permissions);
-				
+
 				// remove registrant from available choices
 				registrants.remove(rp.registrant);
-				
+
 				// force the panel to refresh
 				target.addComponent(RegistrantPermissionsPanel.this);
 			}
 		};
 		addPermissionForm.add(button);
-		
+
 		// only show add permission form if we have a registrant choice
 		add(addPermissionForm.setVisible(registrants.size() > 0));
 	}
-	
+
+	@Override
 	protected boolean getStatelessHint()
 	{
 		return false;
 	}
 
-	
+
 	private class AccessPermissionRenderer implements IChoiceRenderer<AccessPermission> {
 
 		private static final long serialVersionUID = 1L;
@@ -308,18 +311,18 @@
 			return Integer.toString(index);
 		}
 	}
-	
+
 	private class ShowStateButton extends AjaxButton {
 		private static final long serialVersionUID = 1L;
 
 		Show buttonState;
-		
+
 		public ShowStateButton(String wicketId, Show state) {
 			super(wicketId);
 			this.buttonState = state;
 			setOutputMarkupId(true);
 		}
-		
+
 		@Override
 		protected void onBeforeRender()
 		{
@@ -330,7 +333,7 @@
 			WicketUtils.setCssClass(this, cssClass);
 			super.onBeforeRender();
 		}
-		
+
 		@Override
 		protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
 			RegistrantPermissionsPanel.this.activeState = buttonState;

--
Gitblit v1.9.1