jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/363030 )
Change subject: Rename LexemeForm JavaScript DataModel class to Form
......................................................................
Rename LexemeForm JavaScript DataModel class to Form
The word "Lexeme" is already in the namespace.
This patch does not touch the "view" and "listview" widgets. This is
for a later patch.
Change-Id: I63900e60b65e75e4b3c8178449e6436d835f0e09
---
M extension.json
R resources/datamodel/Form.js
M resources/jquery.wikibase.lexemeformlistview.js
M resources/jquery.wikibase.lexemeformview.js
M resources/serialization/LexemeDeserializer.js
M resources/view/ControllerViewFactory.js
M src/WikibaseLexeme.hooks.php
R tests/qunit/datamodel/Form.tests.js
M tests/qunit/datamodel/Lexeme.tests.js
M tests/qunit/jquery.wikibase.lexemeformview.tests.js
M tests/qunit/serialization/LexemeDeserializer.tests.js
11 files changed, 44 insertions(+), 44 deletions(-)
Approvals:
Aleksey Bekh-Ivanov (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 715fdf0..b0000ec 100644
--- a/extension.json
+++ b/extension.json
@@ -208,10 +208,10 @@
"wikibase.lexeme.datamodel.Lemma": {
"scripts": "datamodel/Lemma.js"
},
- "wikibase.lexeme.datamodel.LexemeForm": {
+ "wikibase.lexeme.datamodel.Form": {
"scripts": [
"datamodel/__namespace.js",
- "datamodel/LexemeForm.js"
+ "datamodel/Form.js"
],
"dependencies": [
"util.inherit",
@@ -243,7 +243,7 @@
"util.inherit",
"wikibase.lexeme",
"wikibase.lexeme.datamodel.Lexeme",
- "wikibase.lexeme.datamodel.LexemeForm",
+ "wikibase.lexeme.datamodel.Form",
"wikibase.lexeme.datamodel.Sense",
"wikibase.serialization.Deserializer",
"wikibase.serialization.StatementGroupSetDeserializer",
@@ -326,7 +326,7 @@
"dependencies": [
"util.inherit",
"wikibase.lexeme",
- "wikibase.lexeme.datamodel.LexemeForm",
+ "wikibase.lexeme.datamodel.Form",
"wikibase.lexeme.datamodel.Sense",
"wikibase.view.ControllerViewFactory"
]
diff --git a/resources/datamodel/LexemeForm.js b/resources/datamodel/Form.js
similarity index 91%
rename from resources/datamodel/LexemeForm.js
rename to resources/datamodel/Form.js
index 7233063..8cdc2dc 100644
--- a/resources/datamodel/LexemeForm.js
+++ b/resources/datamodel/Form.js
@@ -2,15 +2,15 @@
'use strict';
/**
- * @class wikibase.lexeme.datamodel.LexemeForm
+ * @class wikibase.lexeme.datamodel.Form
*
* @param {string} id
* @param {wikibase.datamodel.TermMap} representations
* @param {string[]} grammaticalFeatures
* @param {wikibase.datamodel.StatementGroupSet} statementGroupSet
*/
- var LexemeForm = util.inherit(
- 'LexemeForm',
+ var Form = util.inherit(
+ 'Form',
function ( id, representations, grammaticalFeatures,
statementGroupSet ) {
statementGroupSet = statementGroupSet || new
wb.datamodel.StatementGroupSet();
representations = representations || new
wb.datamodel.TermMap();
@@ -79,11 +79,11 @@
},
/**
- * @param {LexemeForm} other
+ * @param {Form} other
* @return {boolean}
*/
equals: function ( other ) {
- if ( !( other instanceof LexemeForm ) ) {
+ if ( !( other instanceof Form ) ) {
return false;
}
@@ -104,6 +104,6 @@
}
);
- wb.lexeme.datamodel.LexemeForm = LexemeForm;
+ wb.lexeme.datamodel.Form = Form;
}( wikibase, util ) );
diff --git a/resources/jquery.wikibase.lexemeformlistview.js
b/resources/jquery.wikibase.lexemeformlistview.js
index 4ff48bf..db60aaa 100644
--- a/resources/jquery.wikibase.lexemeformlistview.js
+++ b/resources/jquery.wikibase.lexemeformlistview.js
@@ -14,7 +14,7 @@
* @param {jquery.wikibase.listview.ListItemAdapter}
options.getListItemAdapter
* @param {jQuery.wikibase.addtoolbar} options.getAdder
* @param {function} options.getMessage
- * @param {wikibase.lexeme.datamodel.LexemeForm} options.value
+ * @param {wikibase.lexeme.datamodel.Form[]} options.value
*/
$.widget( 'wikibase.lexemeformlistview', PARENT, {
/**
diff --git a/resources/jquery.wikibase.lexemeformview.js
b/resources/jquery.wikibase.lexemeformview.js
index c8ad5b7..baa3495 100644
--- a/resources/jquery.wikibase.lexemeformview.js
+++ b/resources/jquery.wikibase.lexemeformview.js
@@ -14,7 +14,7 @@
/**
* Initializes StatementGroupListView on given DOM element
* @callback buildStatementGroupListView
- * @param {wikibase.lexeme.datamodel.LexemeForm}
+ * @param {wikibase.lexeme.datamodel.Form}
* @param {jQuery} JQuery DOM element
*/
@@ -26,7 +26,7 @@
* @constructor
*
* @param {Object} options
- * @param {wikibase.lexeme.datamodel.LexemeForm} options.value
+ * @param {wikibase.lexeme.datamodel.Form} options.value
* @param {Function} options.buildStatementGroupListView
* @param {wikibase.LabelFormattingService}
options.labelFormattingService
* @param {mediaWiki.Api} options.api
@@ -100,15 +100,15 @@
_representationsWidget: null,
/**
- * This method acts as a setter if it is given a LexemeForm
object.
- * Otherwise it returns its value if it is not in edit mode and
returns a new LexemeForm from its
+ * This method acts as a setter if it is given a Form object.
+ * Otherwise it returns its value if it is not in edit mode and
returns a new Form from its
* input value otherwise.
*
- * @param {wikibase.lexeme.datamodel.LexemeForm} form
- * @return {wikibase.lexeme.datamodel.LexemeForm|undefined}
+ * @param {wikibase.lexeme.datamodel.Form} form
+ * @return {wikibase.lexeme.datamodel.Form|undefined}
*/
value: function ( form ) {
- if ( form instanceof
wikibase.lexeme.datamodel.LexemeForm ) {
+ if ( form instanceof wikibase.lexeme.datamodel.Form ) {
this.option( 'value', form );
this._grammaticalFeatureView.value(
form.getGrammaticalFeatures() );
if ( this.deferredFormWithId && form.getId() ) {
@@ -123,7 +123,7 @@
return this.options.value;
}
- return new wikibase.lexeme.datamodel.LexemeForm(
+ return new wikibase.lexeme.datamodel.Form(
this.options.value ? this.options.value.getId()
: null,
arrayToTermMap(
this._representationsWidget.representations ),
this._grammaticalFeatureView ?
this._grammaticalFeatureView.value() : []
diff --git a/resources/serialization/LexemeDeserializer.js
b/resources/serialization/LexemeDeserializer.js
index 5feb6cc..fae9659 100644
--- a/resources/serialization/LexemeDeserializer.js
+++ b/resources/serialization/LexemeDeserializer.js
@@ -55,7 +55,7 @@
deserializeForm: function ( formSerialization ) {
var statementGroupSetDeserializer = new
SERIALIZER.StatementGroupSetDeserializer();
var termMapDeserializer = new
SERIALIZER.TermMapDeserializer();
- return new wb.lexeme.datamodel.LexemeForm(
+ return new wb.lexeme.datamodel.Form(
formSerialization.id,
termMapDeserializer.deserialize(
formSerialization.representations ),
formSerialization.grammaticalFeatures,
diff --git a/resources/view/ControllerViewFactory.js
b/resources/view/ControllerViewFactory.js
index a3040ff..67db39b 100644
--- a/resources/view/ControllerViewFactory.js
+++ b/resources/view/ControllerViewFactory.js
@@ -123,18 +123,18 @@
removeCallback
) {
var lexemeFormView = this._getView(
- 'lexemeformview',
- $dom,
- {
- value: form || new
wb.lexeme.datamodel.LexemeForm(),
- labelFormattingService: labelFormattingService,
- api: this._api,
- buildStatementGroupListView:
this.getStatementGroupListView.bind(
- this,
- startEditingCallback
- )
- }
- ),
+ 'lexemeformview',
+ $dom,
+ {
+ value: form || new
wb.lexeme.datamodel.Form(),
+ labelFormattingService:
labelFormattingService,
+ api: this._api,
+ buildStatementGroupListView:
this.getStatementGroupListView.bind(
+ this,
+ startEditingCallback
+ )
+ }
+ ),
controller = this._getController(
this._toolbarFactory.getToolbarContainer(
lexemeFormView.element ),
lexemeFormView,
diff --git a/src/WikibaseLexeme.hooks.php b/src/WikibaseLexeme.hooks.php
index ade2e7a..56edaa3 100644
--- a/src/WikibaseLexeme.hooks.php
+++ b/src/WikibaseLexeme.hooks.php
@@ -95,7 +95,7 @@
public static function onResourceLoaderTestModules( array
&$testModules, ResourceLoader $rl ) {
$testModules['qunit']['WikibaseLexeme.tests'] = [
'scripts' => [
- 'tests/qunit/datamodel/LexemeForm.tests.js',
+ 'tests/qunit/datamodel/Form.tests.js',
'tests/qunit/datamodel/Sense.tests.js',
'tests/qunit/experts/Lexeme.tests.js',
'tests/qunit/jquery.wikibase.lexemeformlistview.tests.js',
@@ -123,7 +123,7 @@
'jquery.wikibase.senseview',
'oojs-ui',
'wikibase.experts.Lexeme',
- 'wikibase.lexeme.datamodel.LexemeForm',
+ 'wikibase.lexeme.datamodel.Form',
'wikibase.lexeme.datamodel.Sense',
'wikibase.lexeme.serialization.LexemeDeserializer',
'wikibase.lexeme.services.ItemLookup',
diff --git a/tests/qunit/datamodel/LexemeForm.tests.js
b/tests/qunit/datamodel/Form.tests.js
similarity index 94%
rename from tests/qunit/datamodel/LexemeForm.tests.js
rename to tests/qunit/datamodel/Form.tests.js
index 46aff97..bda7380 100644
--- a/tests/qunit/datamodel/LexemeForm.tests.js
+++ b/tests/qunit/datamodel/Form.tests.js
@@ -4,9 +4,9 @@
( function ( $, wb, QUnit ) {
'use strict';
- QUnit.module( 'wikibase.lexeme.datamodel.LexemeForm' );
+ QUnit.module( 'wikibase.lexeme.datamodel.Form' );
- var Form = wb.lexeme.datamodel.LexemeForm;
+ var Form = wb.lexeme.datamodel.Form;
var TermMap = wb.datamodel.TermMap;
var Term = wb.datamodel.Term;
@@ -89,7 +89,7 @@
},
{
comparison: null,
- message: 'not a LexemeForm object'
+ message: 'not a Form object'
}
];
diff --git a/tests/qunit/datamodel/Lexeme.tests.js
b/tests/qunit/datamodel/Lexeme.tests.js
index b4ab404..6f16a00 100644
--- a/tests/qunit/datamodel/Lexeme.tests.js
+++ b/tests/qunit/datamodel/Lexeme.tests.js
@@ -5,8 +5,8 @@
/** @type {wikibase.lexeme.datamodel.Lexeme} */
var Lexeme = wb.lexeme.datamodel.Lexeme;
- /** @type {wikibase.lexeme.datamodel.LexemeForm} */
- var LexemeForm = wb.lexeme.datamodel.LexemeForm;
+ /** @type {wikibase.lexeme.datamodel.Form} */
+ var Form = wb.lexeme.datamodel.Form;
QUnit.test( 'Can create with ID and get it', function ( assert ) {
var lexeme = new Lexeme( 'L1' );
@@ -40,12 +40,12 @@
} );
QUnit.test(
- 'Can find existing statement on LexemeForm through Lexeme by
GUID',
+ 'Can find existing statement on Form through Lexeme by GUID',
function ( assert ) {
var lexemeStatementGroupSet =
createStatementGroupWithSingleStatement( 'P1', 'L1$1' );
var formStatementGroupSet =
createStatementGroupWithSingleStatement( 'P1', 'F1$1' );
var lexeme = new Lexeme( 'L1', lexemeStatementGroupSet
);
- lexeme.forms = [ new LexemeForm( 'F1', '', [],
formStatementGroupSet ) ];
+ lexeme.forms = [ new Form( 'F1', '', [],
formStatementGroupSet ) ];
assert.ok( lexeme.findStatementByGuid( 'F1$1' )
instanceof wb.datamodel.Statement );
}
diff --git a/tests/qunit/jquery.wikibase.lexemeformview.tests.js
b/tests/qunit/jquery.wikibase.lexemeformview.tests.js
index 89656f1..757db78 100644
--- a/tests/qunit/jquery.wikibase.lexemeformview.tests.js
+++ b/tests/qunit/jquery.wikibase.lexemeformview.tests.js
@@ -43,7 +43,7 @@
var newForm = function ( id, defaultRepresentation ) {
var representations = new TermMap( { en: new Term( 'en',
defaultRepresentation ) } );
- return new wb.lexeme.datamodel.LexemeForm( id, representations
);
+ return new wb.lexeme.datamodel.Form( id, representations );
};
QUnit.test( 'can be created', function ( assert ) {
diff --git a/tests/qunit/serialization/LexemeDeserializer.tests.js
b/tests/qunit/serialization/LexemeDeserializer.tests.js
index c6b8fb2..0f98688 100644
--- a/tests/qunit/serialization/LexemeDeserializer.tests.js
+++ b/tests/qunit/serialization/LexemeDeserializer.tests.js
@@ -82,8 +82,8 @@
var form = result.forms[ 0 ];
assert.ok(
- form instanceof wb.lexeme.datamodel.LexemeForm,
- 'Data model should contain instance of LexemeForm'
+ form instanceof wb.lexeme.datamodel.Form,
+ 'Data model should contain instance of Form'
);
assert.equal( form.getId(), 'F1', 'Data model should contain
form id' );
assert.ok(
--
To view, visit https://gerrit.wikimedia.org/r/363030
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I63900e60b65e75e4b3c8178449e6436d835f0e09
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/WikibaseLexeme
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: Aleksey Bekh-Ivanov (WMDE) <aleksey.bekh-iva...@wikimedia.de>
Gerrit-Reviewer: Jakob <jakob.warkot...@wikimedia.de>
Gerrit-Reviewer: Jonas Kress (WMDE) <jonas.kr...@wikimedia.de>
Gerrit-Reviewer: Maintenance-bot <ladsgr...@gmail.com>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: WMDE-leszek <leszek.mani...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
