From 31f7aec663db44db993420a8c8f5a57af924bc4a Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Fri, 17 Jul 2015 16:36:16 +0200 Subject: [client] first steps in ImagePermissions page --- .../org/openslx/dozmod/gui/wizard/ImageWizard.java | 7 ++++--- .../gui/wizard/page/ImageCustomPermissionPage.java | 20 ++++++++++++++++++-- 2 files changed, 22 insertions(+), 5 deletions(-) (limited to 'dozentenmodul/src/main/java') diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageWizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageWizard.java index 19f57f60..d5caa4af 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageWizard.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageWizard.java @@ -7,6 +7,7 @@ import org.openslx.bwlp.thrift.iface.ImageBaseWrite; import org.openslx.bwlp.thrift.iface.ImageDetailsRead; import org.openslx.dozmod.gui.MainWindow; import org.openslx.dozmod.gui.helper.MessageType; +import org.openslx.dozmod.gui.wizard.page.ImageCustomPermissionPage; import org.openslx.dozmod.gui.wizard.page.ImageMetaDataPage; import org.openslx.dozmod.gui.wizard.page.ImageUploadPage; import org.openslx.dozmod.state.UploadWizardState; @@ -20,7 +21,7 @@ public class ImageWizard extends Wizard { private UploadWizardState uploadWizardState; protected ImageUploadPage imageUploadPage; protected ImageMetaDataPage imageMetaDataPage; - //protected ImageCustomPermissionPage imageCustomPermissionPage; + protected ImageCustomPermissionPage imageCustomPermissionPage; protected boolean editExistingImage; /** @@ -45,10 +46,10 @@ public class ImageWizard extends Wizard { // create the shared object for all pages of the wizard imageUploadPage = new ImageUploadPage(uploadWizardState, editExistingImage); imageMetaDataPage = new ImageMetaDataPage(uploadWizardState); - //imageCustomPermissionPage = new ImageCustomPermissionPage(); + imageCustomPermissionPage = new ImageCustomPermissionPage(); addPage(imageUploadPage); addPage(imageMetaDataPage); - //addPage(imageCustomPermissionPage); + addPage(imageCustomPermissionPage); } @Override diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java index e2f4566b..5d9d4367 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java @@ -1,9 +1,15 @@ package org.openslx.dozmod.gui.wizard.page; +import java.util.List; + import org.apache.log4j.Logger; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.widgets.Composite; +import org.openslx.bwlp.thrift.iface.UserInfo; import org.openslx.dozmod.gui.helper.TableHelper; import org.openslx.dozmod.gui.wizard.layout.ImageCustomPermissionPageLayout; +import org.openslx.dozmod.thrift.UserCache; public class ImageCustomPermissionPage extends ImageCustomPermissionPageLayout { @@ -22,10 +28,20 @@ public class ImageCustomPermissionPage extends ImageCustomPermissionPageLayout { super.createControl(parent); TableHelper.createImagePermissionTableColumns(permissionTableViewer); + List userList = UserCache.getAll(); - // TODO set the input of the table then implement ColumnLabelProviders in TableHelper - permissionTableViewer.setInput(null); + permissionTableViewer.setInput(userList); permissionTableViewer.refresh(); + + addUser.addSelectionListener(new SelectionListener() { + @Override + public void widgetSelected(SelectionEvent e) { + LOGGER.debug("addUser"); + } + @Override + public void widgetDefaultSelected(SelectionEvent e) { + } + }); } } -- cgit v1.2.3-55-g7522