From 8d5cab0b3f8f071ab2594777e1c6d34d28bc0cd5 Mon Sep 17 00:00:00 2001 From: tkellner Date: Wed, 24 Jul 2013 14:58:44 +0000 Subject: Comment out proxy auth settings gui for now git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@474 174cde9d-5d70-4d2a-aa98-46368bc2aaf7 --- .../composites/AdvancedConfigurationComposite.java | 356 ++++++++++----------- 1 file changed, 178 insertions(+), 178 deletions(-) (limited to 'pdf-over-gui') diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/AdvancedConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/AdvancedConfigurationComposite.java index 20ca737d..d7870f6a 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/AdvancedConfigurationComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/AdvancedConfigurationComposite.java @@ -93,12 +93,12 @@ public class AdvancedConfigurationComposite extends BaseConfigurationComposite { private Label lblProxyPort; private Text txtProxyPort; private ErrorMarker txtProxyPortErrorMarker; - private Label lblProxyUser; - private Text txtProxyUser; - private ErrorMarker proxyUserErrorMarker; - private Label lblProxyPass; - private Text txtProxyPass; - private ErrorMarker proxyPassErrorMarker; +// private Label lblProxyUser; +// private Text txtProxyUser; +// private ErrorMarker proxyUserErrorMarker; +// private Label lblProxyPass; +// private Text txtProxyPass; +// private ErrorMarker proxyPassErrorMarker; FormData fd_txtProxyPort; FormData fd_txtProxyPortErrorMarker; @@ -526,117 +526,117 @@ public class AdvancedConfigurationComposite extends BaseConfigurationComposite { } }); - this.lblProxyUser = new Label(this.grpProxy, SWT.NONE); - GridData gd_lblProxyUser = new GridData(SWT.LEFT, SWT.CENTER, false, - false, 1, 1); - gd_lblProxyUser.widthHint = 80; - this.lblProxyUser.setLayoutData(gd_lblProxyUser); - this.lblProxyUser.setBounds(0, 0, 57, 15); - - FontData[] fD_lblProxyUser = this.lblProxyUser.getFont().getFontData(); - fD_lblProxyUser[0].setHeight(Constants.TEXT_SIZE_NORMAL); - this.lblProxyUser.setFont(new Font(Display.getCurrent(), - fD_lblProxyUser[0])); - - Composite compProxyUserContainer = new Composite(this.grpProxy, SWT.NONE); - compProxyUserContainer.setLayout(new FormLayout()); - compProxyUserContainer.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, - 1, 1)); - this.txtProxyUser = new Text(compProxyUserContainer, SWT.BORDER); - FormData fd_txtProxyUser = new FormData(); - fd_txtProxyUser.right = new FormAttachment(100, -42); - fd_txtProxyUser.top = new FormAttachment(0); - fd_txtProxyUser.left = new FormAttachment(0, 5); - - FontData[] fD_txtProxyUser = this.txtProxyUser.getFont().getFontData(); - fD_txtProxyUser[0].setHeight(Constants.TEXT_SIZE_NORMAL); - this.txtProxyUser.setFont(new Font(Display.getCurrent(), - fD_txtProxyUser[0])); - - this.proxyUserErrorMarker = new ErrorMarker(compProxyUserContainer, SWT.NONE, ""); //$NON-NLS-1$ - - FormData fd_proxyUserErrorMarker = new FormData(); - fd_proxyUserErrorMarker.left = new FormAttachment(100, -32); - fd_proxyUserErrorMarker.right = new FormAttachment(100); - fd_proxyUserErrorMarker.top = new FormAttachment(0); - fd_proxyUserErrorMarker.bottom = new FormAttachment(0, 32); - - this.proxyUserErrorMarker.setLayoutData(fd_proxyUserErrorMarker); - this.proxyUserErrorMarker.setVisible(false); - this.txtProxyUser.setLayoutData(fd_txtProxyUser); - - this.txtProxyUser.addFocusListener(new FocusAdapter() { - - @Override - public void focusLost(FocusEvent e) { - processProxyUserChanged(); - } - }); - - this.txtProxyUser.addTraverseListener(new TraverseListener() { - - @Override - public void keyTraversed(TraverseEvent e) { - if (e.detail == SWT.TRAVERSE_RETURN) { - processProxyUserChanged(); - } - } - }); - - this.lblProxyPass = new Label(this.grpProxy, SWT.NONE); - this.lblProxyPass.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, - false, false, 1, 1)); - this.lblProxyPass.setBounds(0, 0, 57, 15); - - FontData[] fD_lblProxyPass = this.lblProxyPass.getFont().getFontData(); - fD_lblProxyPass[0].setHeight(Constants.TEXT_SIZE_NORMAL); - this.lblProxyPass.setFont(new Font(Display.getCurrent(), - fD_lblProxyPass[0])); - - Composite compProxyPassContainer = new Composite(this.grpProxy, SWT.NONE); - compProxyPassContainer.setLayout(new FormLayout()); - compProxyPassContainer.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, - 1, 1)); - this.txtProxyPass = new Text(compProxyPassContainer, SWT.PASSWORD | SWT.BORDER); - FormData fd_txtProxyPass = new FormData(); - fd_txtProxyPass.right = new FormAttachment(100, -42); - fd_txtProxyPass.top = new FormAttachment(0); - fd_txtProxyPass.left = new FormAttachment(0, 5); - - FontData[] fD_txtProxyPass = this.txtProxyPass.getFont().getFontData(); - fD_txtProxyPass[0].setHeight(Constants.TEXT_SIZE_NORMAL); - this.txtProxyPass.setFont(new Font(Display.getCurrent(), - fD_txtProxyPass[0])); - - this.proxyPassErrorMarker = new ErrorMarker(compProxyPassContainer, SWT.NONE, ""); //$NON-NLS-1$ - - FormData fd_proxyPassErrorMarker = new FormData(); - fd_proxyPassErrorMarker.left = new FormAttachment(100, -32); - fd_proxyPassErrorMarker.right = new FormAttachment(100); - fd_proxyPassErrorMarker.top = new FormAttachment(0); - fd_proxyPassErrorMarker.bottom = new FormAttachment(0, 32); - - this.proxyPassErrorMarker.setLayoutData(fd_proxyPassErrorMarker); - this.proxyPassErrorMarker.setVisible(false); - this.txtProxyPass.setLayoutData(fd_txtProxyPass); - - this.txtProxyPass.addFocusListener(new FocusAdapter() { - - @Override - public void focusLost(FocusEvent e) { - processProxyPassChanged(); - } - }); - - this.txtProxyPass.addTraverseListener(new TraverseListener() { - - @Override - public void keyTraversed(TraverseEvent e) { - if (e.detail == SWT.TRAVERSE_RETURN) { - processProxyPassChanged(); - } - } - }); +// this.lblProxyUser = new Label(this.grpProxy, SWT.NONE); +// GridData gd_lblProxyUser = new GridData(SWT.LEFT, SWT.CENTER, false, +// false, 1, 1); +// gd_lblProxyUser.widthHint = 80; +// this.lblProxyUser.setLayoutData(gd_lblProxyUser); +// this.lblProxyUser.setBounds(0, 0, 57, 15); +// +// FontData[] fD_lblProxyUser = this.lblProxyUser.getFont().getFontData(); +// fD_lblProxyUser[0].setHeight(Constants.TEXT_SIZE_NORMAL); +// this.lblProxyUser.setFont(new Font(Display.getCurrent(), +// fD_lblProxyUser[0])); +// +// Composite compProxyUserContainer = new Composite(this.grpProxy, SWT.NONE); +// compProxyUserContainer.setLayout(new FormLayout()); +// compProxyUserContainer.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, +// 1, 1)); +// this.txtProxyUser = new Text(compProxyUserContainer, SWT.BORDER); +// FormData fd_txtProxyUser = new FormData(); +// fd_txtProxyUser.right = new FormAttachment(100, -42); +// fd_txtProxyUser.top = new FormAttachment(0); +// fd_txtProxyUser.left = new FormAttachment(0, 5); +// +// FontData[] fD_txtProxyUser = this.txtProxyUser.getFont().getFontData(); +// fD_txtProxyUser[0].setHeight(Constants.TEXT_SIZE_NORMAL); +// this.txtProxyUser.setFont(new Font(Display.getCurrent(), +// fD_txtProxyUser[0])); +// +// this.proxyUserErrorMarker = new ErrorMarker(compProxyUserContainer, SWT.NONE, ""); //$NON-NLS-1$ +// +// FormData fd_proxyUserErrorMarker = new FormData(); +// fd_proxyUserErrorMarker.left = new FormAttachment(100, -32); +// fd_proxyUserErrorMarker.right = new FormAttachment(100); +// fd_proxyUserErrorMarker.top = new FormAttachment(0); +// fd_proxyUserErrorMarker.bottom = new FormAttachment(0, 32); +// +// this.proxyUserErrorMarker.setLayoutData(fd_proxyUserErrorMarker); +// this.proxyUserErrorMarker.setVisible(false); +// this.txtProxyUser.setLayoutData(fd_txtProxyUser); +// +// this.txtProxyUser.addFocusListener(new FocusAdapter() { +// +// @Override +// public void focusLost(FocusEvent e) { +// processProxyUserChanged(); +// } +// }); +// +// this.txtProxyUser.addTraverseListener(new TraverseListener() { +// +// @Override +// public void keyTraversed(TraverseEvent e) { +// if (e.detail == SWT.TRAVERSE_RETURN) { +// processProxyUserChanged(); +// } +// } +// }); +// +// this.lblProxyPass = new Label(this.grpProxy, SWT.NONE); +// this.lblProxyPass.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, +// false, false, 1, 1)); +// this.lblProxyPass.setBounds(0, 0, 57, 15); +// +// FontData[] fD_lblProxyPass = this.lblProxyPass.getFont().getFontData(); +// fD_lblProxyPass[0].setHeight(Constants.TEXT_SIZE_NORMAL); +// this.lblProxyPass.setFont(new Font(Display.getCurrent(), +// fD_lblProxyPass[0])); +// +// Composite compProxyPassContainer = new Composite(this.grpProxy, SWT.NONE); +// compProxyPassContainer.setLayout(new FormLayout()); +// compProxyPassContainer.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, +// 1, 1)); +// this.txtProxyPass = new Text(compProxyPassContainer, SWT.PASSWORD | SWT.BORDER); +// FormData fd_txtProxyPass = new FormData(); +// fd_txtProxyPass.right = new FormAttachment(100, -42); +// fd_txtProxyPass.top = new FormAttachment(0); +// fd_txtProxyPass.left = new FormAttachment(0, 5); +// +// FontData[] fD_txtProxyPass = this.txtProxyPass.getFont().getFontData(); +// fD_txtProxyPass[0].setHeight(Constants.TEXT_SIZE_NORMAL); +// this.txtProxyPass.setFont(new Font(Display.getCurrent(), +// fD_txtProxyPass[0])); +// +// this.proxyPassErrorMarker = new ErrorMarker(compProxyPassContainer, SWT.NONE, ""); //$NON-NLS-1$ +// +// FormData fd_proxyPassErrorMarker = new FormData(); +// fd_proxyPassErrorMarker.left = new FormAttachment(100, -32); +// fd_proxyPassErrorMarker.right = new FormAttachment(100); +// fd_proxyPassErrorMarker.top = new FormAttachment(0); +// fd_proxyPassErrorMarker.bottom = new FormAttachment(0, 32); +// +// this.proxyPassErrorMarker.setLayoutData(fd_proxyPassErrorMarker); +// this.proxyPassErrorMarker.setVisible(false); +// this.txtProxyPass.setLayoutData(fd_txtProxyPass); +// +// this.txtProxyPass.addFocusListener(new FocusAdapter() { +// +// @Override +// public void focusLost(FocusEvent e) { +// processProxyPassChanged(); +// } +// }); +// +// this.txtProxyPass.addTraverseListener(new TraverseListener() { +// +// @Override +// public void keyTraversed(TraverseEvent e) { +// if (e.detail == SWT.TRAVERSE_RETURN) { +// processProxyPassChanged(); +// } +// } +// }); reloadResources(); } @@ -752,43 +752,43 @@ public class AdvancedConfigurationComposite extends BaseConfigurationComposite { this.configurationContainer.setProxyHost(host); } - void processProxyUserChanged() { - try { - this.proxyUserErrorMarker.setVisible(false); - plainProxyUserSetter(); - } catch (Exception ex) { - this.proxyUserErrorMarker.setVisible(true); - this.proxyUserErrorMarker.setToolTipText(ex.getMessage()); - log.error("processProxyUser: ", ex); //$NON-NLS-1$ - } - } - - /** - * - */ - private void plainProxyUserSetter() { - String user = this.txtProxyUser.getText(); - this.configurationContainer.setProxyUser(user); - } - - void processProxyPassChanged() { - try { - this.proxyPassErrorMarker.setVisible(false); - plainProxyPassSetter(); - } catch (Exception ex) { - this.proxyPassErrorMarker.setVisible(true); - this.proxyPassErrorMarker.setToolTipText(ex.getMessage()); - log.error("processProxyPass: ", ex); //$NON-NLS-1$ - } - } - - /** - * - */ - private void plainProxyPassSetter() { - String pass = this.txtProxyPass.getText(); - this.configurationContainer.setProxyPass(pass); - } +// void processProxyUserChanged() { +// try { +// this.proxyUserErrorMarker.setVisible(false); +// plainProxyUserSetter(); +// } catch (Exception ex) { +// this.proxyUserErrorMarker.setVisible(true); +// this.proxyUserErrorMarker.setToolTipText(ex.getMessage()); +// log.error("processProxyUser: ", ex); //$NON-NLS-1$ +// } +// } +// +// /** +// * +// */ +// private void plainProxyUserSetter() { +// String user = this.txtProxyUser.getText(); +// this.configurationContainer.setProxyUser(user); +// } +// +// void processProxyPassChanged() { +// try { +// this.proxyPassErrorMarker.setVisible(false); +// plainProxyPassSetter(); +// } catch (Exception ex) { +// this.proxyPassErrorMarker.setVisible(true); +// this.proxyPassErrorMarker.setToolTipText(ex.getMessage()); +// log.error("processProxyPass: ", ex); //$NON-NLS-1$ +// } +// } +// +// /** +// * +// */ +// private void plainProxyPassSetter() { +// String pass = this.txtProxyPass.getText(); +// this.configurationContainer.setProxyPass(pass); +// } void processProxyPortChanged() { try { @@ -862,15 +862,15 @@ public class AdvancedConfigurationComposite extends BaseConfigurationComposite { this.txtProxyHost.setText(host); } - String user = this.configurationContainer.getProxyUser(); - if (user != null) { - this.txtProxyUser.setText(user); - } - - String pass = this.configurationContainer.getProxyPass(); - if (pass != null) { - this.txtProxyPass.setText(pass); - } +// String user = this.configurationContainer.getProxyUser(); +// if (user != null) { +// this.txtProxyUser.setText(user); +// } +// +// String pass = this.configurationContainer.getProxyPass(); +// if (pass != null) { +// this.txtProxyPass.setText(pass); +// } } /* @@ -903,11 +903,11 @@ public class AdvancedConfigurationComposite extends BaseConfigurationComposite { case 2: this.plainProxyPortSetter(); // Fall through - case 3: - this.plainProxyUserSetter(); - // Fall through - case 4: - this.plainProxyPassSetter(); +// case 3: +// this.plainProxyUserSetter(); +// // Fall through +// case 4: +// this.plainProxyPassSetter(); } } @@ -961,15 +961,15 @@ public class AdvancedConfigurationComposite extends BaseConfigurationComposite { .getString("advanced_config.ProxyPort_ToolTip")); //$NON-NLS-1$ this.txtProxyPort.setMessage(Messages .getString("advanced_config.ProxyPort_Template")); //$NON-NLS-1$ - this.lblProxyUser.setText(Messages.getString("advanced_config.ProxyUser")); //$NON-NLS-1$ - this.txtProxyUser.setToolTipText(Messages - .getString("advanced_config.ProxyUser_ToolTip")); //$NON-NLS-1$ - this.txtProxyUser.setMessage(Messages - .getString("advanced_config.ProxyUser_Template")); //$NON-NLS-1$ - this.lblProxyPass.setText(Messages.getString("advanced_config.ProxyPass")); //$NON-NLS-1$ - this.txtProxyPass.setToolTipText(Messages - .getString("advanced_config.ProxyPass_ToolTip")); //$NON-NLS-1$ - this.txtProxyPass.setMessage(Messages - .getString("advanced_config.ProxyPass_Template")); //$NON-NLS-1$ +// this.lblProxyUser.setText(Messages.getString("advanced_config.ProxyUser")); //$NON-NLS-1$ +// this.txtProxyUser.setToolTipText(Messages +// .getString("advanced_config.ProxyUser_ToolTip")); //$NON-NLS-1$ +// this.txtProxyUser.setMessage(Messages +// .getString("advanced_config.ProxyUser_Template")); //$NON-NLS-1$ +// this.lblProxyPass.setText(Messages.getString("advanced_config.ProxyPass")); //$NON-NLS-1$ +// this.txtProxyPass.setToolTipText(Messages +// .getString("advanced_config.ProxyPass_ToolTip")); //$NON-NLS-1$ +// this.txtProxyPass.setMessage(Messages +// .getString("advanced_config.ProxyPass_Template")); //$NON-NLS-1$ } } -- cgit v1.2.3