using Package instead of Model whenever possible

OpenPonk · Feb 25, 2021 · ecf915c · ecf915c
1 parent 2bd5136
commit ecf915c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/repository/OpenPonk-ClassEditor/OPUmlClassEditorPlugin.class.st b/repository/OpenPonk-ClassEditor/OPUmlClassEditorPlugin.class.st
@@ -52,7 +52,9 @@ OPUmlClassEditorPlugin >> icon [
 
 { #category : #accessing }
 OPUmlClassEditorPlugin >> isPluginFor: aModel [
-	^ aModel class = self modelClass | (aModel class = OPUMLPackage) | (aModel class = OPUMLProfile)
+	^ {self modelClass.
+	OPUMLModel.
+	OPUMLProfile} includes: aModel class
 ]
 
 { #category : #'as yet unclassified' }
@@ -62,7 +64,7 @@ OPUmlClassEditorPlugin >> layouterClass [
 
 { #category : #accessing }
 OPUmlClassEditorPlugin >> modelClass [
-	^ OPUMLModel
+	^ OPUMLPackage
 ]
 
 { #category : #accessing }

diff --git a/repository/OpenPonk-ClassEditor/OPUmlClassEditorPluginTest.class.st b/repository/OpenPonk-ClassEditor/OPUmlClassEditorPluginTest.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'plugin'
 	],
-	#category : 'OpenPonk-ClassEditor-Tests'
+	#category : #'OpenPonk-ClassEditor-Tests'
 }
 
 { #category : #running }
@@ -25,7 +25,7 @@ OPUmlClassEditorPluginTest >> testIcon [
 
 { #category : #tests }
 OPUmlClassEditorPluginTest >> testModelClass [
-	self assert: plugin modelClass equals: OPUMLModel
+	self assert: plugin modelClass equals: OPUMLPackage
 ]
 
 { #category : #tests }

diff --git a/repository/OpenPonk-ClassEditor/OPUmlExamples.class.st b/repository/OpenPonk-ClassEditor/OPUmlExamples.class.st
@@ -15,7 +15,7 @@ Class {
 
 { #category : #examples }
 OPUmlExamples class >> exampleEmptyModel [
-	^ OPProject openOnModel: (OPUMLModel new name: 'Model')
+	^ OPProject openOnModel: (OPUMLPackage new name: 'Model')
 ]
 
 { #category : #examples }
@@ -114,7 +114,7 @@ OPUmlExamples >> emptyEnumeration [
 { #category : #accessing }
 OPUmlExamples >> emptyModel [
 	<gtExample>
-	^ OPUMLModel new name: 'Empty Model'
+	^ OPUMLPackage new name: 'Empty Model'
 ]
 
 { #category : #accessing }

diff --git a/repository/OpenPonk-ClassEditor/OPUmlPackageController.class.st b/repository/OpenPonk-ClassEditor/OPUmlPackageController.class.st
@@ -33,7 +33,7 @@ OPUmlPackageController >> attachTo: aDiagramController [
 
 { #category : #configuration }
 OPUmlPackageController >> beForModel [
-	modelClass := OPUMLModel
+	modelClass := OPUMLPackage
 ]
 
 { #category : #configuration }

diff --git a/repository/OpenPonk-ClassEditor/OPUmlPackageDiagramControllerTest.class.st b/repository/OpenPonk-ClassEditor/OPUmlPackageDiagramControllerTest.class.st
@@ -11,7 +11,7 @@ OPUmlPackageDiagramControllerTest >> controllerClass [
 
 { #category : #accessing }
 OPUmlPackageDiagramControllerTest >> modelClass [
-	^ OPUMLModel
+	^ OPUMLPackage
 ]
 
 { #category : #running }