LCO: Improve ux for License issuing dialog / details page #1275

eclipse-passage · Feb 2, 2024 · a172df5 · a172df5
1 parent 7508e7b
commit a172df5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/...es/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/AccessFiles.java b/...es/org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/AccessFiles.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support
  *******************************************************************************/
 package org.eclipse.passage.lic.hc.remote.impl;
 
@@ -34,13 +35,13 @@ final class AccessFiles {
 		this.source = source;
 	}
 
-	public AccessFiles(LicensedProduct product) {
+	AccessFiles(LicensedProduct product) {
 		this(product, new LicensingFolder(new UserHomePath()));
 	}
 
-	public Collection<Path> get() throws LicensingException {
+	Collection<Path> get() throws LicensingException {
 		return new FileCollection(//
-				new PathFromLicensedProduct(source, product),
+				new PathFromLicensedProduct(source, product), //
 				new FloatingFileExtension.FloatingLicenseAccessEncrypted()//
 		).get();
 	}

diff --git a/....eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/RequestParameters.java b/....eclipse.passage.lic.hc/src/org/eclipse/passage/lic/hc/remote/impl/RequestParameters.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support
  *******************************************************************************/
 package org.eclipse.passage.lic.hc.remote.impl;
 
@@ -74,14 +75,12 @@ private List<NamedData> generalParameters() throws LicensingException {
 				new ProductVersion(encode(product.version())), //
 				new LicensingAction(action()), //
 				new LicenseUser(access.getUser()), //
-				new LicenseUser(access.getUser()), //
 				new EncodingAlgorithm(hash), //
 				new ServerAuthenticationType(access.getServer().getAuthentication().getType()), //
 				new ServerAuthenticationExpression(encode(access.getServer().getAuthentication().getExpression())));
-
 	}
 
-	protected String encode(String value) throws LicensingException {
+	protected final String encode(String value) throws LicensingException {
 		try {
 			return URLEncoder.encode(value, "UTF-8"); //$NON-NLS-1$
 		} catch (UnsupportedEncodingException e) {

diff --git a/...ashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/wizards/IssueLicenseDetailsPage.java b/...ashboard.ui/src/org/eclipse/passage/loc/dashboard/ui/wizards/IssueLicenseDetailsPage.java
@@ -44,8 +44,8 @@ public void createControl(Composite parent) {
 		Composite composite = new Composite(parent, SWT.NONE);
 		composite.setLayoutData(GridDataFactory.fillDefaults().grab(true, true).create());
 		composite.setLayout(new GridLayout());
-		this.info = new Text(composite, SWT.BORDER | SWT.MULTI | SWT.WRAP);
-		info.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+		this.info = new Text(composite, SWT.BORDER | SWT.MULTI | SWT.WRAP | SWT.READ_ONLY | SWT.V_SCROLL);
+		this.info.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		setControl(composite);
 		Dialog.applyDialogFont(composite);
 	}

diff --git a/...d.ui/src/org/eclipse/passage/loc/internal/dashboard/ui/i18n/IssueLicensePageMessages.java b/...d.ui/src/org/eclipse/passage/loc/internal/dashboard/ui/i18n/IssueLicensePageMessages.java
@@ -48,10 +48,6 @@ public final class IssueLicensePageMessages extends NLS {
 	public static String IssueLicenseWizard_window_title;
 	public static String IssueLicenseDetailsPage_page_title;
 	public static String IssueLicenseDetailsPage_page_description;
-	public static String IssueLicenseDetailsPage_lbl_eml_text;
-	public static String IssueLicenseMailRequestDialog_title;
-	public static String IssueLicenseMailRequestDialog_text;
-	public static String IssueLicensingMailJob_task_text;
 	public static String IssueFloatingLicenseWizard_failure;
 	public static String IssueFloatingLicenseWizard_title;
 	public static String IssueFloatingLicenseWizard_success;