Skip to content

Commit 86f01b5

Browse files
authored
Fix typos from application licensor and #212 (#215)
* Fix some other typos * There is a typo inside the DefaultLicensedExtensionManager #212
1 parent 988c002 commit 86f01b5

File tree

12 files changed

+21
-21
lines changed

12 files changed

+21
-21
lines changed

application-licensing-common/application-licensing-common-api/src/main/java/com/xwiki/licensing/License.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ public Map<String, String> getLicensee()
267267
}
268268

269269
/**
270-
* Set licensee informations.
270+
* Set licensee information.
271271
*
272272
* @param licensee a map of licensee information to be assigned.
273273
*/

application-licensing-licensor/application-licensing-licensor-api/src/main/java/com/xwiki/licensing/LicenseManager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ public interface LicenseManager
4242
/**
4343
* Add a new license to the current set of active license. The added license is checked to be applicable to the
4444
* current wiki instance, else it will not be added. The license is also checked to be more interesting than the
45-
* currently installed licenses. If the license does not provides any improvement of the licensing state of this
46-
* wiki, it will not be added. This check does not reject unsigned license, but give immediate priority to signed
45+
* currently installed licenses. If the license does not provide any improvement of the licensing state of this
46+
* wiki, it will not be added. This check does not reject unsigned license, but gives immediate priority to signed
4747
* ones over unsigned ones, even if the signed license has narrower constraints. These evaluations are done for
48-
* each licensed extension independently, whether these extension are currently installed or not.
48+
* each licensed extension independently, whether these extensions are currently installed or not.
4949
*
5050
* @param license a license to be added (could be signed or not, unsigned will be stored but not really applied)
5151
* @return true if the license has been actually added (see above).

application-licensing-licensor/application-licensing-licensor-api/src/main/java/com/xwiki/licensing/LicenseValidator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
public interface LicenseValidator
3131
{
3232
/**
33-
* A LicenseValidator that always reply false. Used when the license validator received is not pristine.
33+
* A LicenseValidator that always returns false. Used when the license validator received is not pristine.
3434
*/
3535
LicenseValidator INVALIDATOR = new LicenseValidator() {
3636
@Override
@@ -69,7 +69,7 @@ public boolean isValid(License license)
6969
boolean isSigned(License license);
7070

7171
/**
72-
* Check if a license is valid, its constrains are respected.
72+
* Check if a license is valid, its constraints are respected.
7373
* The instance constraint is NOT checked, see {@link #isApplicable(License)}
7474
*
7575
* @param license the license to be checked.

application-licensing-licensor/application-licensing-licensor-api/src/main/java/com/xwiki/licensing/internal/DefaultLicensedExtensionManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ private Map<String, Collection<InstalledExtension>> getLicensorBackwardDependenc
117117
// This can happen if the licensor API extension is currently being installed (some components are loaded
118118
// before the extension is marked as installed).
119119
this.logger.warn("The Licensor API extension ({}) is not installed on the root namespace as it should."
120-
+ " Licensed extensions won't be detected correctly as a conseuence.", LICENSOR_EXTENSION_ID);
120+
+ " Licensed extensions won't be detected correctly as a consequence.", LICENSOR_EXTENSION_ID);
121121
}
122122

123123
return Collections.emptyMap();

application-licensing-licensor/application-licensing-licensor-api/src/main/java/com/xwiki/licensing/internal/GetTrialLicenseListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public void onEvent(Event event, Object source, Object data)
9898
}
9999

100100
/**
101-
* Try to generate a trial license for the given extension. Since a free extension has no license to cover it's
101+
* Try to generate a trial license for the given extension. Since a free extension has no license to cover its
102102
* dependencies, check also to see if there aren't any paid dependencies, direct or transitive, that need a trial
103103
* license.
104104
*

application-licensing-licensor/application-licensing-licensor-api/src/main/java/com/xwiki/licensing/internal/LicenseRenewListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050

5151
/**
5252
* Listen to licensed extensions upgrades or install in order to trigger a license renewal if needed. A license renew
53-
* it's needed if licensed dependencies (direct or transitive) have changed between versions, or if the currnt license
53+
* is needed if licensed dependencies (direct or transitive) have changed between versions, or if the current license
5454
* has outdated feature ids. Listen also for the install event in case a license was already generated for an older
5555
* uninstalled version.
5656
*

application-licensing-licensor/application-licensing-licensor-api/src/main/java/com/xwiki/licensing/internal/LicensedDependenciesMap.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
/**
4040
* Get a dependency map for licensed applications. The scope is to know for licensed extensions that where installed as
4141
* dependencies, on which licensed application (and so on which license) they depend on, considering transitive
42-
* dependencies. Optional dependencies will not be included, since that means it's license is not covered by the
42+
* dependencies. Optional dependencies will not be included, since that means its license is not covered by the
4343
* parent's license.
4444
*
4545
* @version $Id$

application-licensing-licensor/application-licensing-licensor-api/src/main/java/com/xwiki/licensing/internal/TrialLicenseGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public Boolean canGenerateTrialLicense(ExtensionId extensionId)
126126
*
127127
* @param extensionId extension for which the trial license is needed
128128
* @return the URL for getting a trial license, or null if it couldn't be constructed
129-
* @throws Exception if an error occured while constructing the url
129+
* @throws Exception if an error occurred while constructing the url
130130
*/
131131
private URL getTrialURL(ExtensionId extensionId) throws Exception
132132
{

application-licensing-licensor/application-licensing-licensor-api/src/main/java/com/xwiki/licensing/script/LicensorScriptService.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ public Licensor getLicensor()
198198
}
199199

200200
/**
201-
* @return the licence manager (programming rights is required).
201+
* @return the license manager (programming rights is required).
202202
*/
203203
public LicenseManager getLicenseManager()
204204
{
@@ -209,7 +209,7 @@ public LicenseManager getLicenseManager()
209209
}
210210

211211
/**
212-
* @return the {@link LicensedExtensionManager} (programming rights is required).
212+
* @return the {@link LicensedExtensionManager} (programming rights are required).
213213
* @since 1.29
214214
*/
215215
public LicensedExtensionManager getLicensedExtensionManager()
@@ -223,9 +223,9 @@ public LicensedExtensionManager getLicensedExtensionManager()
223223
/**
224224
* Add a new signed license to the current set of active license. The added license is checked to be applicable to
225225
* the current wiki instance, else it will not be added. The license is also checked to be more useful than the
226-
* currently installed licenses. If the license does not provides any improvement of the licensing state of this
226+
* currently installed licenses. If the license does not provide any improvement of the licensing state of this
227227
* wiki, it will not be added. These evaluations are done for each licensed extension independently, whether the
228-
* extension are currently installed or not.
228+
* extension is currently installed or not.
229229
*
230230
* @param license a base 64 representation of the license to add.
231231
* @return true if the license has been successfully added, false if it was useless.
@@ -242,9 +242,9 @@ public boolean addLicense(String license) throws AccessDeniedException, IOExcept
242242
/**
243243
* Add a new signed license to the current set of active license. The added license is checked to be applicable to
244244
* the current wiki instance, else it will not be added. The license is also checked to be more useful than the
245-
* currently installed licenses. If the license does not provides any improvement of the licensing state of this
245+
* currently installed licenses. If the license does not provide any improvement of the licensing state of this
246246
* wiki, it will not be added. These evaluations are done for each licensed extension independently, whether the
247-
* extension are currently installed or not.
247+
* extension is currently installed or not.
248248
*
249249
* @param license a base 64 representation of the license to add.
250250
* @return true if the license has been successfully added, false if it was useless.

application-licensing-licensor/application-licensing-licensor-ui/src/main/resources/Licenses/Code/LicenseJSON.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@
108108
#end
109109
#set ($namespaces = $collectiontool.sort($namespaces))
110110
##
111-
## Extension name. A warning will be displayed for extensions installed as depedencies.Note
112-
## that we consider optional depedencies as being not covered by the license of the parent
111+
## Extension name. A warning will be displayed for extensions installed as dependencies. Note
112+
## that we consider optional dependencies as being not covered by the license of the parent
113113
## extension, as they can be uninstalled, so a warning will be displayed for them.
114114
##
115115
#set ($queryString = $escapetool.url({

0 commit comments

Comments
 (0)