X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.ui.admin%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Fviews%2FJcrRolesView.java;h=66f7a03358c9edb1400bc60cda311d078cf74680;hb=f090d55a56532e0e6c2cde5760a451e56ef25f1c;hp=a8745435264f0e76617179c6fa75062eee856147;hpb=dd3d0d60b62c99810eca8619a376b66dbca5e44d;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/views/JcrRolesView.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/views/JcrRolesView.java
index a87454352..66f7a0335 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/views/JcrRolesView.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/views/JcrRolesView.java
@@ -15,133 +15,114 @@
  */
 package org.argeo.security.ui.admin.views;
 
-import org.argeo.ArgeoException;
-import org.argeo.security.UserAdminService;
-import org.argeo.security.ui.admin.SecurityAdminPlugin;
-import org.argeo.security.ui.admin.commands.AddRole;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.handlers.IHandlerService;
-import org.eclipse.ui.part.ViewPart;
-
-/** List all roles. */
-public class JcrRolesView extends ViewPart {
-	public final static String ID = SecurityAdminPlugin.PLUGIN_ID
-			+ ".jcrRolesView";
-
-	private Text newRole;
-
-	private TableViewer viewer;
-	private UserAdminService userAdminService;
-
-	private String addNewRoleText = "<add new role here>";
-
-	@Override
-	public void createPartControl(Composite parent) {
-		parent.setLayout(new GridLayout(1, false));
-
-		// new role text field
-		newRole = new Text(parent, SWT.BORDER);
-		newRole.setText(addNewRoleText);
-		newRole.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-		// default action is add role
-		newRole.addListener(SWT.DefaultSelection, new Listener() {
-			private static final long serialVersionUID = -2367261849260929505L;
-
-			public void handleEvent(Event evt) {
-				IWorkbench iw = SecurityAdminPlugin.getDefault().getWorkbench();
-				IHandlerService handlerService = (IHandlerService) iw
-						.getService(IHandlerService.class);
-				try {
-					handlerService.executeCommand(AddRole.COMMAND_ID, evt);
-				} catch (Exception e) {
-					throw new ArgeoException("Cannot execute add role command",
-							e);
-				}
-			}
-		});
-		// select all on focus
-		newRole.addListener(SWT.FocusIn, new Listener() {
-			private static final long serialVersionUID = 2612811281477034356L;
-
-			public void handleEvent(Event e) {
-				newRole.selectAll();
-			}
-		});
-
-		// roles table
-		Table table = new Table(parent, SWT.V_SCROLL | SWT.BORDER);
-		table.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		table.setLinesVisible(false);
-		table.setHeaderVisible(false);
-		viewer = new TableViewer(table);
-		viewer.setContentProvider(new RolesContentProvider());
-		viewer.setLabelProvider(new UsersLabelProvider());
-		getViewSite().setSelectionProvider(viewer);
-		viewer.setInput(getViewSite());
-	}
-
-	@Override
-	public void setFocus() {
-		viewer.getTable().setFocus();
-	}
-
-	public void setUserAdminService(UserAdminService userAdminService) {
-		this.userAdminService = userAdminService;
-	}
-
-	public String getAddNewRoleText() {
-		return addNewRoleText;
-	}
-
-	private class RolesContentProvider implements IStructuredContentProvider {
-		private static final long serialVersionUID = 7446442682717419289L;
-
-		public Object[] getElements(Object inputElement) {
-			return userAdminService.listEditableRoles().toArray();
-		}
-
-		public void dispose() {
-		}
-
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		}
-
-	}
-
-	private class UsersLabelProvider extends LabelProvider implements
-			ITableLabelProvider {
-		private static final long serialVersionUID = -1886204791002421430L;
-
-		public String getColumnText(Object element, int columnIndex) {
-			return element.toString();
-		}
-
-		public Image getColumnImage(Object element, int columnIndex) {
-			return null;
-		}
-
-	}
-
-	public String getNewRole() {
-		return newRole.getText();
-	}
-
-	public void refresh() {
-		viewer.refresh();
-		newRole.setText(addNewRoleText);
-	}
+public class JcrRolesView {
 }
+
+/** List all roles. Legacy. TODO Remove */
+// public class JcrRolesView extends ViewPart {
+// public final static String ID = SecurityAdminPlugin.PLUGIN_ID
+// + ".jcrRolesView";
+//
+// private Text newRole;
+//
+// private TableViewer viewer;
+// private UserAdminService userAdminService;
+//
+// private String addNewRoleText = "<add new role here>";
+//
+// @Override
+// public void createPartControl(Composite parent) {
+// parent.setLayout(new GridLayout(1, false));
+//
+// // new role text field
+// newRole = new Text(parent, SWT.BORDER);
+// newRole.setText(addNewRoleText);
+// newRole.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+// // default action is add role
+// newRole.addListener(SWT.DefaultSelection, new Listener() {
+// private static final long serialVersionUID = -2367261849260929505L;
+//
+// public void handleEvent(Event evt) {
+// IWorkbench iw = SecurityAdminPlugin.getDefault().getWorkbench();
+// IHandlerService handlerService = (IHandlerService) iw
+// .getService(IHandlerService.class);
+// try {
+// handlerService.executeCommand(AddRole.COMMAND_ID, evt);
+// } catch (Exception e) {
+// throw new ArgeoException("Cannot execute add role command",
+// e);
+// }
+// }
+// });
+// // select all on focus
+// newRole.addListener(SWT.FocusIn, new Listener() {
+// private static final long serialVersionUID = 2612811281477034356L;
+//
+// public void handleEvent(Event e) {
+// newRole.selectAll();
+// }
+// });
+//
+// // roles table
+// Table table = new Table(parent, SWT.V_SCROLL | SWT.BORDER);
+// table.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+// table.setLinesVisible(false);
+// table.setHeaderVisible(false);
+// viewer = new TableViewer(table);
+// viewer.setContentProvider(new RolesContentProvider());
+// viewer.setLabelProvider(new UsersLabelProvider());
+// getViewSite().setSelectionProvider(viewer);
+// viewer.setInput(getViewSite());
+// }
+//
+// @Override
+// public void setFocus() {
+// viewer.getTable().setFocus();
+// }
+//
+// public void setUserAdminService(UserAdminService userAdminService) {
+// this.userAdminService = userAdminService;
+// }
+//
+// public String getAddNewRoleText() {
+// return addNewRoleText;
+// }
+//
+// private class RolesContentProvider implements IStructuredContentProvider {
+// private static final long serialVersionUID = 7446442682717419289L;
+//
+// public Object[] getElements(Object inputElement) {
+// return userAdminService.listEditableRoles().toArray();
+// }
+//
+// public void dispose() {
+// }
+//
+// public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+// }
+//
+// }
+//
+// private class UsersLabelProvider extends LabelProvider implements
+// ITableLabelProvider {
+// private static final long serialVersionUID = -1886204791002421430L;
+//
+// public String getColumnText(Object element, int columnIndex) {
+// return element.toString();
+// }
+//
+// public Image getColumnImage(Object element, int columnIndex) {
+// return null;
+// }
+//
+// }
+//
+// public String getNewRole() {
+// return newRole.getText();
+// }
+//
+// public void refresh() {
+// viewer.refresh();
+// newRole.setText(addNewRoleText);
+// }
+// }