jenkins-bot has submitted this change and it was merged.
Change subject: Rename ve.NodeFactory to ve.NamedClassFactory
......................................................................
Rename ve.NodeFactory to ve.NamedClassFactory
We weren't really using it exclusively for nodes any more, and the only
functionality in there was for using .static.name
Change-Id: Ie26928cd01faee95a10912201663b45f1f20fb19
---
M .docs/categories.json
M VisualEditor.php
M demos/ve/index.php
M modules/ve/ce/ve.ce.AnnotationFactory.js
M modules/ve/ce/ve.ce.NodeFactory.js
M modules/ve/dm/ve.dm.NodeFactory.js
M modules/ve/test/index.php
A modules/ve/ve.NamedClassFactory.js
D modules/ve/ve.NodeFactory.js
9 files changed, 52 insertions(+), 53 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.docs/categories.json b/.docs/categories.json
index b37471d..0c6b621 100644
--- a/.docs/categories.json
+++ b/.docs/categories.json
@@ -150,7 +150,7 @@
},
{
"name": "Factories",
- "classes": ["ve.ActionFactory",
"ve.NodeFactory"]
+ "classes": ["ve.ActionFactory",
"ve.NamedClassFactory"]
},
{
"name": "Nodes",
diff --git a/VisualEditor.php b/VisualEditor.php
index 5b3e5f0..23d2ca0 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -205,7 +205,7 @@
've/ve.TriggerRegistry.js',
've/ve.Range.js',
've/ve.Node.js',
- 've/ve.NodeFactory.js',
+ 've/ve.NamedClassFactory.js',
've/ve.BranchNode.js',
've/ve.LeafNode.js',
've/ve.Surface.js',
diff --git a/demos/ve/index.php b/demos/ve/index.php
index eb342d3..216970c 100644
--- a/demos/ve/index.php
+++ b/demos/ve/index.php
@@ -98,7 +98,7 @@
<script src="../../modules/ve/ve.TriggerRegistry.js"></script>
<script src="../../modules/ve/ve.Range.js"></script>
<script src="../../modules/ve/ve.Node.js"></script>
- <script src="../../modules/ve/ve.NodeFactory.js"></script>
+ <script src="../../modules/ve/ve.NamedClassFactory.js"></script>
<script src="../../modules/ve/ve.BranchNode.js"></script>
<script src="../../modules/ve/ve.LeafNode.js"></script>
<script src="../../modules/ve/ve.Surface.js"></script>
diff --git a/modules/ve/ce/ve.ce.AnnotationFactory.js
b/modules/ve/ce/ve.ce.AnnotationFactory.js
index 0dd5232..350166a 100644
--- a/modules/ve/ce/ve.ce.AnnotationFactory.js
+++ b/modules/ve/ce/ve.ce.AnnotationFactory.js
@@ -9,18 +9,17 @@
* ContentEditable annotation factory.
*
* @class
- * @extends ve.NodeFactory
+ * @extends ve.NamedClassFactory
* @constructor
*/
ve.ce.AnnotationFactory = function VeCeAnnotationFactory() {
// Parent constructor
- // FIXME give ve.NodeFactory a more generic name
- ve.NodeFactory.call( this );
+ ve.NamedClassFactory.call( this );
};
/* Inheritance */
-ve.inheritClass( ve.ce.AnnotationFactory, ve.NodeFactory );
+ve.inheritClass( ve.ce.AnnotationFactory, ve.NamedClassFactory );
/* Initialization */
diff --git a/modules/ve/ce/ve.ce.NodeFactory.js
b/modules/ve/ce/ve.ce.NodeFactory.js
index 09eb863..64d8031 100644
--- a/modules/ve/ce/ve.ce.NodeFactory.js
+++ b/modules/ve/ce/ve.ce.NodeFactory.js
@@ -9,17 +9,17 @@
* ContentEditable node factory.
*
* @class
- * @extends ve.NodeFactory
+ * @extends ve.NamedClassFactory
* @constructor
*/
ve.ce.NodeFactory = function VeCeNodeFactory() {
// Parent constructor
- ve.NodeFactory.call( this );
+ ve.NamedClassFactory.call( this );
};
/* Inheritance */
-ve.inheritClass( ve.ce.NodeFactory, ve.NodeFactory );
+ve.inheritClass( ve.ce.NodeFactory, ve.NamedClassFactory );
/* Methods */
diff --git a/modules/ve/dm/ve.dm.NodeFactory.js
b/modules/ve/dm/ve.dm.NodeFactory.js
index dbb3133..e2a09e9 100644
--- a/modules/ve/dm/ve.dm.NodeFactory.js
+++ b/modules/ve/dm/ve.dm.NodeFactory.js
@@ -9,17 +9,17 @@
* DataModel node factory.
*
* @class
- * @extends ve.NodeFactory
+ * @extends ve.NamedClassFactory
* @constructor
*/
ve.dm.NodeFactory = function VeDmNodeFactory() {
// Parent constructor
- ve.NodeFactory.call( this );
+ ve.NamedClassFactory.call( this );
};
/* Inheritance */
-ve.inheritClass( ve.dm.NodeFactory, ve.NodeFactory );
+ve.inheritClass( ve.dm.NodeFactory, ve.NamedClassFactory );
/* Methods */
diff --git a/modules/ve/test/index.php b/modules/ve/test/index.php
index 1ec8fe6..8bb9d8d 100644
--- a/modules/ve/test/index.php
+++ b/modules/ve/test/index.php
@@ -42,7 +42,7 @@
<script src="../../ve/ve.TriggerRegistry.js"></script>
<script src="../../ve/ve.Range.js"></script>
<script src="../../ve/ve.Node.js"></script>
- <script src="../../ve/ve.NodeFactory.js"></script>
+ <script src="../../ve/ve.NamedClassFactory.js"></script>
<script src="../../ve/ve.BranchNode.js"></script>
<script src="../../ve/ve.LeafNode.js"></script>
<script src="../../ve/ve.Surface.js"></script>
diff --git a/modules/ve/ve.NamedClassFactory.js
b/modules/ve/ve.NamedClassFactory.js
new file mode 100644
index 0000000..8089053
--- /dev/null
+++ b/modules/ve/ve.NamedClassFactory.js
@@ -0,0 +1,39 @@
+/*!
+ * VisualEditor NamedClassFactory class.
+ *
+ * @copyright 2011-2013 VisualEditor Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+
+/**
+ * Generic factory for classes with a .static.name property.
+ *
+ * @abstract
+ * @extends ve.Factory
+ * @constructor
+ */
+ve.NamedClassFactory = function VeNamedClassFactory() {
+ // Parent constructor
+ ve.Factory.call( this );
+};
+
+/* Inheritance */
+
+ve.inheritClass( ve.NamedClassFactory, ve.Factory );
+
+/* Methods */
+
+/**
+ * Register a constructor with the factory.
+ *
+ * @method
+ * @param {Function} constructor Constructor to use when creating object
+ * @throws {Error} Names must be strings and must not be empty
+ */
+ve.NamedClassFactory.prototype.register = function ( constructor ) {
+ var name = constructor.static && constructor.static.name;
+ if ( typeof name !== 'string' || name === '' ) {
+ throw new Error( 'Names must be strings and must not be empty'
);
+ }
+ ve.Factory.prototype.register.call( this, name, constructor );
+};
diff --git a/modules/ve/ve.NodeFactory.js b/modules/ve/ve.NodeFactory.js
deleted file mode 100644
index b6d5bf4..0000000
--- a/modules/ve/ve.NodeFactory.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/*!
- * VisualEditor NodeFactory class.
- *
- * @copyright 2011-2013 VisualEditor Team and others; see AUTHORS.txt
- * @license The MIT License (MIT); see LICENSE.txt
- */
-
-/**
- * Generic node factory.
- *
- * @abstract
- * @extends ve.Factory
- * @constructor
- */
-ve.NodeFactory = function VeNodeFactory() {
- // Parent constructor
- ve.Factory.call( this );
-};
-
-/* Inheritance */
-
-ve.inheritClass( ve.NodeFactory, ve.Factory );
-
-/* Methods */
-
-/**
- * Register a constructor with the factory.
- *
- * @method
- * @param {Function} constructor Constructor to use when creating object
- * @throws {Error} Node names must be strings and must not be empty
- */
-ve.NodeFactory.prototype.register = function ( constructor ) {
- var name = constructor.static && constructor.static.name;
- if ( typeof name !== 'string' || name === '' ) {
- throw new Error( 'Node names must be strings and must not be
empty' );
- }
- ve.Factory.prototype.register.call( this, name, constructor );
-};
--
To view, visit https://gerrit.wikimedia.org/r/57243
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie26928cd01faee95a10912201663b45f1f20fb19
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
