diff options
author | Simon Rettberg | 2015-07-10 17:02:23 +0200 |
---|---|---|
committer | Simon Rettberg | 2015-07-10 17:02:23 +0200 |
commit | e500a8530d8ba8a79413e6476005f628ed36c35b (patch) | |
tree | 36610e6203467187d8a0e1e3c7dcf81b98653400 /dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout | |
parent | [client] fix missing setControl in ImageMetaDataPageLayout (diff) | |
download | tutor-module-e500a8530d8ba8a79413e6476005f628ed36c35b.tar.gz tutor-module-e500a8530d8ba8a79413e6476005f628ed36c35b.tar.xz tutor-module-e500a8530d8ba8a79413e6476005f628ed36c35b.zip |
[client] Fix indentation
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout')
5 files changed, 32 insertions, 54 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java index be64badd..0f17451d 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java @@ -10,7 +10,6 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; - public abstract class DisclaimerWindowLayout extends Composite { protected String notice = "Bitte lesen und bestätigen Sie folgende rechtliche Hinweise"; @@ -54,16 +53,14 @@ public abstract class DisclaimerWindowLayout extends Composite { Label noticeLabel = new Label(noticeGroup, SWT.NONE); noticeLabel.setText(notice); - // the disclaimer text box with scrolling functionality - Text disclaimerText = new Text(this, SWT.READ_ONLY | SWT.WRAP| SWT.MULTI | SWT.V_SCROLL | SWT.BORDER); + Text disclaimerText = new Text(this, SWT.READ_ONLY | SWT.WRAP | SWT.MULTI | SWT.V_SCROLL | SWT.BORDER); GridData disclaimerLayoutData = new GridData(GridData.FILL, GridData.FILL, true, true); disclaimerLayoutData.widthHint = 900; disclaimerLayoutData.heightHint = 600; disclaimerText.setLayoutData(disclaimerLayoutData); disclaimerText.setText(disclaimer); - // checkbox for acknowledging the disclaimer Composite checkboxComposite = new Composite(this, SWT.BORDER); checkboxComposite.setLayout(new GridLayout()); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java index 4c66c996..96bf48a9 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java @@ -1,6 +1,5 @@ package org.openslx.dozmod.gui.window.layout; - import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.swt.SWT; @@ -28,14 +27,12 @@ public abstract class ImageListWindowLayout extends Composite { protected String tableGroupLabel = "Images"; protected String vmInfoGroupLabel = "Detailinformationen"; - // buttons protected Button newButton; protected Button deleteButton; protected Button editButton; protected Button downloadButton; - // imageDetail texts protected Text imageSelectedNameLabel; protected Text idInfo; @@ -47,7 +44,6 @@ public abstract class ImageListWindowLayout extends Composite { protected final TableViewer tableViewer; - protected String infoTextString = "Hier können Sie images erstellen, bearbeiten und löschen."; public ImageListWindowLayout(final Composite mainShell) { @@ -70,15 +66,12 @@ public abstract class ImageListWindowLayout extends Composite { infoTitle.setText(infoTitleString); // set the fond FontData fontData = infoTitle.getFont().getFontData()[0]; - Font font = new Font(Gui.display, new FontData(fontData.getName(), fontData - .getHeight(), SWT.BOLD)); + Font font = new Font(Gui.display, new FontData(fontData.getName(), fontData.getHeight(), SWT.BOLD)); infoTitle.setFont(font); // the infotext Label infoText = new Label(infoComposite, SWT.NONE); infoText.setText(infoTextString); - - // group for the table Group tableGroup = new Group(this, SWT.BORDER); tableGroup.setText(tableGroupLabel); @@ -86,14 +79,13 @@ public abstract class ImageListWindowLayout extends Composite { tableGroup.setLayout(new GridLayout(3, true)); // jface tableviewer on swt table - Table vmTable = new Table(tableGroup, SWT.BORDER | SWT.V_SCROLL - | SWT.H_SCROLL); + Table vmTable = new Table(tableGroup, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL); GridData tableGridData = new GridData(SWT.FILL, SWT.FILL, true, true); tableGridData.horizontalSpan = 3; tableGridData.minimumWidth = 200; vmTable.setLayoutData(tableGridData); vmTable.setHeaderVisible(true); - vmTable.setLinesVisible(true); + vmTable.setLinesVisible(true); // TableViewer on the table tableViewer = new TableViewer(vmTable); @@ -121,7 +113,6 @@ public abstract class ImageListWindowLayout extends Composite { downloadButton = new Button(buttonComposite, SWT.PUSH); downloadButton.setText(downloadButtonLabel); - // group for the info of the selected image in the tableViewer Group vmInfoGroup = new Group(this, SWT.BORDER); vmInfoGroup.setText(vmInfoGroupLabel); @@ -130,28 +121,20 @@ public abstract class ImageListWindowLayout extends Composite { vmInfoGroup.setLayoutData(buttonCompositeGridData); vmInfoGroup.setLayout(new GridLayout(2, false)); - // image name info imageSelectedNameLabel = createCaptionAndTextfield("Image Name:", vmInfoGroup); - - // id info idInfo = createCaptionAndTextfield("ID:", vmInfoGroup); versionInfo = createCaptionAndTextfield("Version", vmInfoGroup); lastUpdateInfo = createCaptionAndTextfield("Letztes Update:", vmInfoGroup); permissionInfo = createCaptionAndTextfield("Berechtigungen:", vmInfoGroup); - ownerInfo= createCaptionAndTextfield("Besitzer ID", vmInfoGroup); + ownerInfo = createCaptionAndTextfield("Besitzer ID", vmInfoGroup); templateInfo = createCaptionAndTextfield("Vorlage:", vmInfoGroup); - - - - } - - public Text createCaptionAndTextfield(String captionString, Group group){ + public Text createCaptionAndTextfield(String captionString, Group group) { Label caption = new Label(group, SWT.NONE); Text textField = new Text(group, SWT.READ_ONLY); caption.setText(captionString); @@ -161,5 +144,4 @@ public abstract class ImageListWindowLayout extends Composite { return textField; } - } diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java index 48ae60d2..683780c9 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java @@ -24,28 +24,39 @@ public abstract class LoginWindowLayout extends Composite { private final int id; private final String tag; + private LOGIN_TYPE(final int id, final String tag) { this.id = id; this.tag = tag; } - public int getId() { return this.id; } - public String getTag() { return this.tag; } + + public int getId() { + return this.id; + } + + public String getTag() { + return this.tag; + } public static LOGIN_TYPE getEnum(String tag) { - switch(tag) { - case "bwidm": return LOGIN_TYPE.BWIDM; - case "bwlp": return LOGIN_TYPE.BWLP; - case "sat": return LOGIN_TYPE.SAT; - default: return null; + switch (tag) { + case "bwidm": + return LOGIN_TYPE.BWIDM; + case "bwlp": + return LOGIN_TYPE.BWLP; + case "sat": + return LOGIN_TYPE.SAT; + default: + return null; } } } + // authentication method to use for login attempts protected LOGIN_TYPE loginType = null; private Image titleImage; - // textfields for the username/password protected Text usernameText; protected Text passwordText; @@ -64,9 +75,9 @@ public abstract class LoginWindowLayout extends Composite { /** * Create a new login composite - * + * * @param mainShell - * The shell it should be added to + * The shell it should be added to */ public LoginWindowLayout(final Shell mainShell) { super(mainShell, SWT.NONE); @@ -88,7 +99,6 @@ public abstract class LoginWindowLayout extends Composite { gridData.horizontalAlignment = SWT.CENTER; titlePicture.setLayoutData(gridData); - // group for the authentication method. // groups have borders and a title Group authGroup = new Group(this, SWT.NONE); @@ -131,18 +141,15 @@ public abstract class LoginWindowLayout extends Composite { idpText.setText("IdP:"); idpCombo = new Combo(loginGroup, SWT.DROP_DOWN | SWT.READ_ONLY); - idpCombo.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, - false)); + idpCombo.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false)); new Label(loginGroup, SWT.NONE).setText("Benutzername:"); usernameText = new Text(loginGroup, SWT.SINGLE | SWT.BORDER); - usernameText.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, - true, false)); + usernameText.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false)); new Label(loginGroup, SWT.NONE).setText("Passwort:"); passwordText = new Text(loginGroup, SWT.SINGLE | SWT.BORDER | SWT.PASSWORD); - passwordText.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, - true, false)); + passwordText.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false)); // login button loginButton = new Button(loginGroup, SWT.PUSH); loginButton.setText("Login"); @@ -157,8 +164,7 @@ public abstract class LoginWindowLayout extends Composite { // this way, we can be sure to get an image // (since the ResourceLoader always returns an image, // even if it cannot load the specified one). - titleImage = new Image(Gui.display, getClass() - .getResourceAsStream("/img/Logo_bwLehrpool.png")); + titleImage = new Image(Gui.display, getClass().getResourceAsStream("/img/Logo_bwLehrpool.png")); ImageData imgData = titleImage.getImageData(); imgData = imgData.scaledTo(imgData.width / 5, imgData.height / 5); titleImage = new Image(Gui.display, imgData); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java index ffb71f70..b8519a4f 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java @@ -1,7 +1,5 @@ package org.openslx.dozmod.gui.window.layout; - - import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -65,13 +63,11 @@ public abstract class MainMenuWindowLayout extends Composite { gridData = new GridData(SWT.CENTER, SWT.CENTER, true, true); vmButton.setLayoutData(gridData); - Label vmInfoLabel = new Label(vmGroup, SWT.NONE); vmInfoLabel.setText(vmInfo); gridData = new GridData(SWT.FILL, SWT.FILL, true, true); vmInfoLabel.setLayoutData(gridData); - //g group for the lecture selection Group lecturesGroup = new Group(this, SWT.NONE); lecturesGroup.setLayout(new GridLayout()); @@ -79,8 +75,6 @@ public abstract class MainMenuWindowLayout extends Composite { gridData = new GridData(SWT.FILL, SWT.FILL, true, true); lecturesGroup.setLayoutData(gridData); - - lecturesButton = new Button(lecturesGroup, SWT.PUSH); lecturesButton.setText("Veranstanstaltungen"); gridData = new GridData(SWT.CENTER, SWT.CENTER, true, true); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java index 37b50817..7d2a1aa6 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java @@ -37,8 +37,7 @@ public abstract class VirtualizerNoticeWindowLayout extends Composite { Label titleLabel = new Label(this, SWT.NONE); titleLabel.setText(infoTitle); FontData fontData = titleLabel.getFont().getFontData()[0]; - Font font = new Font(Gui.display, new FontData(fontData.getName(), fontData.getHeight(), - SWT.BOLD)); + Font font = new Font(Gui.display, new FontData(fontData.getName(), fontData.getHeight(), SWT.BOLD)); titleLabel.setFont(font); // TODO dispose of font? |