Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 563557 - "Licensing Configuration": remove "null:null" for locations #221

Merged
merged 1 commit into from
May 29, 2020
Merged

Bug 563557 - "Licensing Configuration": remove "null:null" for locations #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...sage.lic.base/src/org/eclipse/passage/lic/base/conditions/BaseConditionMinerRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public String getConditionMinerTarget(ConditionMiner miner) {
BaseConditionMiner basePathMiner = (BaseConditionMiner) miner;
return basePathMiner.getBaseLocation();
}
return null;
return ""; //$NON-NLS-1$
}

}
2 changes: 1 addition & 1 deletion bundles/org.eclipse.passage.lic.hc/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Automatic-Module-Name: org.eclipse.passage.lic.hc
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.passage.lic.hc
Bundle-Version: 0.5.200.qualifier
Bundle-Version: 0.5.300.qualifier
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Bundle-Copyright: %Bundle-Copyright
Expand Down
8 changes: 6 additions & 2 deletions .../org.eclipse.passage.lic.hc/src/org/eclipse/passage/lic/internal/hc/HcConditionMiner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,12 @@ private Map<String, String> loadIstallationAreaSettings(List<String> readAllLine

@Override
protected String getBaseLocation() {
String hostValue = settingsMap.get(LicensingNet.LICENSING_SERVER_HOST);
String portValue = settingsMap.get(LicensingNet.LICENSING_SERVER_PORT);
String underfined = ""; //$NON-NLS-1$
String hostValue = settingsMap.getOrDefault(LicensingNet.LICENSING_SERVER_HOST, underfined);
String portValue = settingsMap.getOrDefault(LicensingNet.LICENSING_SERVER_PORT, underfined);
if (underfined.equals(hostValue) || underfined.equals(portValue)) {
return underfined;
}
return String.format(HOST_PORT, hostValue, portValue);
}

Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.passage.lic.jface/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Automatic-Module-Name: org.eclipse.passage.lic.base.ui
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.passage.lic.jface
Bundle-Version: 0.6.100.qualifier
Bundle-Version: 0.6.200.qualifier
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Bundle-Copyright: %Bundle-Copyright
Expand Down
14 changes: 7 additions & 7 deletions ...e.lic.jface/src/org/eclipse/passage/lic/internal/jface/dialogs/ConditionLocationPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@ public ConditionLocationPage() {

@Override
protected void createContent(Composite parent, ConditionMinerRegistry registry) {
Iterable<ConditionMiner> conditionTypes = registry.getConditionMiners();
Iterable<ConditionMiner> miners = registry.getConditionMiners();
GridDataFactory groupData = GridDataFactory.fillDefaults().align(SWT.FILL, SWT.BEGINNING).grab(true, false);
for (ConditionMiner miner : conditionTypes) {
for (ConditionMiner miner : miners) {
String target = registry.getConditionMinerTarget(miner);
if (target.isEmpty()) {
continue;
}
Group group = new Group(parent, SWT.NONE);
group.setData(miner);
group.setLayout(new GridLayout(1, false));
group.setLayoutData(groupData.create());

Label description = new Label(group, SWT.WRAP);
String target = registry.getConditionMinerTarget(miner);
if (target != null) {
description.setText(target);
}
description.setText(target);
}
}

Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.passage.lic.hc.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<feature
id="org.eclipse.passage.lic.hc.feature"
label="%featureName"
version="0.6.100.qualifier"
version="0.6.200.qualifier"
provider-name="%providerName"
plugin="org.eclipse.passage.lic.hc"
license-feature="org.eclipse.license"
Expand Down