X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.ui%2Fsrc%2Forg%2Fsimantics%2Fui%2Fauth%2FLoginComposite.java;h=e15470431773af1f2aa0301aee5a2b1423eee6cc;hb=560d8aa2e37cb6b0249aec6d7e96e67d5a64c59f;hp=fdbd693efb1e7be5490b52994c40454668d7ca5d;hpb=969bd23cab98a79ca9101af33334000879fb60c5;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.ui/src/org/simantics/ui/auth/LoginComposite.java b/bundles/org.simantics.ui/src/org/simantics/ui/auth/LoginComposite.java
index fdbd693ef..e15470431 100644
--- a/bundles/org.simantics.ui/src/org/simantics/ui/auth/LoginComposite.java
+++ b/bundles/org.simantics.ui/src/org/simantics/ui/auth/LoginComposite.java
@@ -1,130 +1,130 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2010 Association for Decentralized Information Management
- * in Industry THTH ry.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     VTT Technical Research Centre of Finland - initial API and implementation
- *******************************************************************************/
-package org.simantics.ui.auth;
-
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.layout.GridLayoutFactory;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.FocusListener;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.simantics.ui.auth.model.LoginModel;
-
-/**
- * @author Tuukka Lehtonen
- */
-public class LoginComposite extends Composite {
-
-//    private FormToolkit toolkit;
-
-    private LoginModel  model;
-
-    public LoginComposite(Composite parent, int style, LoginModel m) {
-        super(parent, style);
-        
-        this.model = m;
-
-//        toolkit = new FormToolkit(parent.getDisplay());
-
-        Composite body = this;
-        GridLayoutFactory.fillDefaults().equalWidth(false).numColumns(2).applyTo(body);
-        GridDataFactory.fillDefaults().grab(true, true).applyTo(body);
-
-        Label desc = new Label(this, 0);
-        desc.setText("Enter credentials for " + model.getServer().getInfo());
-        GridDataFactory.fillDefaults().span(2, 1).applyTo(desc);
-        
-//        Label nameLabel = toolkit.createLabel(this, "User name:");
-        Label nameLabel = new Label(this, 0);
-        nameLabel.setText("&User name:");
-        GridDataFactory.fillDefaults().align(SWT.LEAD, SWT.CENTER).applyTo(nameLabel);
-//        final Text nameText = toolkit.createText(this, "", SWT.NONE);
-        final Text nameText = new Text(this, SWT.BORDER);
-        nameText.setText(model.getName());
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(nameText);
-
-//        Label passwordLabel = toolkit.createLabel(this, "Password:");
-        Label passwordLabel = new Label(this, 0);
-        passwordLabel.setText("&Password:");
-        GridDataFactory.fillDefaults().align(SWT.LEAD, SWT.CENTER).applyTo(passwordLabel);
-//        final Text passwordText = toolkit.createText(this, "", SWT.NONE);
-        final Text passwordText = new Text(this, SWT.PASSWORD | SWT.BORDER);
-        passwordText.setText(model.getPassword());
-        GridDataFactory.fillDefaults().grab(true, false).applyTo(passwordText);
-
-//        final Button rememberButton = toolkit.createButton(this, "Remember Login", SWT.CHECK);
-        final Button rememberButton = new Button(this, SWT.CHECK);
-        rememberButton.setText("&Remember Login");
-        GridDataFactory.fillDefaults().grab(true, false).span(2, 1).applyTo(rememberButton);
-        
-        // Build the separator line
-        Label separator = new Label(this, SWT.HORIZONTAL | SWT.SEPARATOR);
-        GridDataFactory.fillDefaults().align(SWT.FILL, SWT.BOTTOM).span(2, 1).grab(false, true).applyTo(separator);
-        
-        nameText.addModifyListener(new ModifyListener() {
-            @Override
-            public void modifyText(ModifyEvent e) {
-                model.setName(nameText.getText());
-            }
-        });
-        passwordText.addModifyListener(new ModifyListener() {
-            @Override
-            public void modifyText(ModifyEvent e) {
-                model.setPassword(passwordText.getText());
-            }
-        });
-        rememberButton.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent e) {
-                model.setRemember(rememberButton.getSelection());
-            }
-        });
-        
-        new FocusSelector(nameText);
-        new FocusSelector(passwordText);
-    }
-    
-    static class FocusSelector implements FocusListener {
-        Text text;
-        FocusSelector(Text text) {
-            this.text = text;
-            text.addFocusListener(this);
-        }
-        @Override
-        public void focusGained(FocusEvent e) {
-            text.selectAll();
-        }
-        @Override
-        public void focusLost(FocusEvent e) {
-            text.setSelection(0);
-        }
-    }
-
-    @Override
-    public void dispose() {
-        if (isDisposed()) {
-//            if (toolkit != null) {
-//                toolkit.dispose();
-//                toolkit = null;
-//            }
-            super.dispose();
-        }
-    }
-
-}
+/*******************************************************************************
+ * Copyright (c) 2007, 2010 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.ui.auth;
+
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.FocusEvent;
+import org.eclipse.swt.events.FocusListener;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.simantics.ui.auth.model.LoginModel;
+
+/**
+ * @author Tuukka Lehtonen
+ */
+public class LoginComposite extends Composite {
+
+//    private FormToolkit toolkit;
+
+    private LoginModel  model;
+
+    public LoginComposite(Composite parent, int style, LoginModel m) {
+        super(parent, style);
+        
+        this.model = m;
+
+//        toolkit = new FormToolkit(parent.getDisplay());
+
+        Composite body = this;
+        GridLayoutFactory.fillDefaults().equalWidth(false).numColumns(2).applyTo(body);
+        GridDataFactory.fillDefaults().grab(true, true).applyTo(body);
+
+        Label desc = new Label(this, 0);
+        desc.setText("Enter credentials for " + model.getServer().getInfo());
+        GridDataFactory.fillDefaults().span(2, 1).applyTo(desc);
+        
+//        Label nameLabel = toolkit.createLabel(this, "User name:");
+        Label nameLabel = new Label(this, 0);
+        nameLabel.setText("&User name:");
+        GridDataFactory.fillDefaults().align(SWT.LEAD, SWT.CENTER).applyTo(nameLabel);
+//        final Text nameText = toolkit.createText(this, "", SWT.NONE);
+        final Text nameText = new Text(this, SWT.BORDER);
+        nameText.setText(model.getName());
+        GridDataFactory.fillDefaults().grab(true, false).applyTo(nameText);
+
+//        Label passwordLabel = toolkit.createLabel(this, "Password:");
+        Label passwordLabel = new Label(this, 0);
+        passwordLabel.setText("&Password:");
+        GridDataFactory.fillDefaults().align(SWT.LEAD, SWT.CENTER).applyTo(passwordLabel);
+//        final Text passwordText = toolkit.createText(this, "", SWT.NONE);
+        final Text passwordText = new Text(this, SWT.PASSWORD | SWT.BORDER);
+        passwordText.setText(model.getPassword());
+        GridDataFactory.fillDefaults().grab(true, false).applyTo(passwordText);
+
+//        final Button rememberButton = toolkit.createButton(this, "Remember Login", SWT.CHECK);
+        final Button rememberButton = new Button(this, SWT.CHECK);
+        rememberButton.setText("&Remember Login");
+        GridDataFactory.fillDefaults().grab(true, false).span(2, 1).applyTo(rememberButton);
+        
+        // Build the separator line
+        Label separator = new Label(this, SWT.HORIZONTAL | SWT.SEPARATOR);
+        GridDataFactory.fillDefaults().align(SWT.FILL, SWT.BOTTOM).span(2, 1).grab(false, true).applyTo(separator);
+        
+        nameText.addModifyListener(new ModifyListener() {
+            @Override
+            public void modifyText(ModifyEvent e) {
+                model.setName(nameText.getText());
+            }
+        });
+        passwordText.addModifyListener(new ModifyListener() {
+            @Override
+            public void modifyText(ModifyEvent e) {
+                model.setPassword(passwordText.getText());
+            }
+        });
+        rememberButton.addSelectionListener(new SelectionAdapter() {
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                model.setRemember(rememberButton.getSelection());
+            }
+        });
+        
+        new FocusSelector(nameText);
+        new FocusSelector(passwordText);
+    }
+    
+    static class FocusSelector implements FocusListener {
+        Text text;
+        FocusSelector(Text text) {
+            this.text = text;
+            text.addFocusListener(this);
+        }
+        @Override
+        public void focusGained(FocusEvent e) {
+            text.selectAll();
+        }
+        @Override
+        public void focusLost(FocusEvent e) {
+            text.setSelection(0);
+        }
+    }
+
+    @Override
+    public void dispose() {
+        if (isDisposed()) {
+//            if (toolkit != null) {
+//                toolkit.dispose();
+//                toolkit = null;
+//            }
+            super.dispose();
+        }
+    }
+
+}