Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
TDT4250
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ådne Karstad
TDT4250
Commits
d94f6fac
Commit
d94f6fac
authored
Oct 09, 2020
by
Ådne Karstad
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor(sample.xmi): change sample to newer examples
parent
c1ec6c03
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
419 additions
and
241 deletions
+419
-241
tdt4250.spp.html/src/tdt4250/spp/html/source/SampleSpp.xmi
tdt4250.spp.html/src/tdt4250/spp/html/source/SampleSpp.xmi
+62
-59
tdt4250.spp.html/src/tdt4250/spp/html/target/NTNU.html
tdt4250.spp.html/src/tdt4250/spp/html/target/NTNU.html
+50
-114
tdt4250.spp.model.edit/plugin.properties
tdt4250.spp.model.edit/plugin.properties
+2
-0
tdt4250.spp.model.edit/src/tdt4250/spp/provider/SpecialisationItemProvider.java
.../src/tdt4250/spp/provider/SpecialisationItemProvider.java
+46
-0
tdt4250.spp.model/src/tdt4250/spp/Course.java
tdt4250.spp.model/src/tdt4250/spp/Course.java
+2
-1
tdt4250.spp.model/src/tdt4250/spp/Program.java
tdt4250.spp.model/src/tdt4250/spp/Program.java
+5
-15
tdt4250.spp.model/src/tdt4250/spp/Specialisation.java
tdt4250.spp.model/src/tdt4250/spp/Specialisation.java
+27
-0
tdt4250.spp.model/src/tdt4250/spp/SppPackage.java
tdt4250.spp.model/src/tdt4250/spp/SppPackage.java
+61
-5
tdt4250.spp.model/src/tdt4250/spp/impl/ProgramImpl.java
tdt4250.spp.model/src/tdt4250/spp/impl/ProgramImpl.java
+12
-45
tdt4250.spp.model/src/tdt4250/spp/impl/SpecialisationImpl.java
...50.spp.model/src/tdt4250/spp/impl/SpecialisationImpl.java
+75
-0
tdt4250.spp.model/src/tdt4250/spp/impl/SppPackageImpl.java
tdt4250.spp.model/src/tdt4250/spp/impl/SppPackageImpl.java
+37
-1
tdt4250.spp.model/src/tdt4250/spp/util/SppValidator.java
tdt4250.spp.model/src/tdt4250/spp/util/SppValidator.java
+40
-1
No files found.
tdt4250.spp.html/src/tdt4250/spp/html/source/SampleSpp.xmi
View file @
d94f6fac
...
@@ -6,30 +6,6 @@
...
@@ -6,30 +6,6 @@
xmlns:spp=
"platform:/plugin/tdt4250.spp.model/model/spp.ecore"
xmlns:spp=
"platform:/plugin/tdt4250.spp.model/model/spp.ecore"
xsi:schemaLocation=
"platform:/plugin/tdt4250.spp.model/model/spp.ecore spp.ecore"
xsi:schemaLocation=
"platform:/plugin/tdt4250.spp.model/model/spp.ecore spp.ecore"
name=
"NTNU"
>
name=
"NTNU"
>
<programs
name=
"Bachelor in IT"
>
<semesters
selectedCourses=
"//@institutes.0/@courses.0 //@institutes.0/@courses.12"
/>
<semesters
semester=
"2"
season=
"Spring"
selectedCourses=
"//@institutes.0/@courses.4 //@institutes.1/@courses.5"
/>
<semesters
semester=
"3"
selectedCourses=
"//@institutes.0/@courses.5 //@institutes.1/@courses.2"
/>
<semesters
semester=
"4"
season=
"Spring"
/>
<semesters
semester=
"5"
/>
<semesters
semester=
"6"
season=
"Spring"
/>
<mandatoryCourses
courses=
"//@institutes.0/@courses.0 //@institutes.0/@courses.3 //@institutes.0/@courses.4 //@institutes.0/@courses.5 //@institutes.0/@courses.12"
/>
<electiveCourses
courses=
"//@institutes.0/@courses.1 //@institutes.0/@courses.2 //@institutes.0/@courses.6 //@institutes.1/@courses.3 //@institutes.1/@courses.4 //@institutes.1/@courses.5"
/>
</programs>
<programs
<programs
name=
"Lektor i Realfag"
name=
"Lektor i Realfag"
duration=
"IntegratedMasters"
>
duration=
"IntegratedMasters"
>
...
@@ -41,38 +17,59 @@
...
@@ -41,38 +17,59 @@
selectedCourses=
"//@institutes.0/@courses.4 //@institutes.1/@courses.5 //@institutes.2/@courses.0 //@institutes.2/@courses.1 //@institutes.1/@courses.1"
/>
selectedCourses=
"//@institutes.0/@courses.4 //@institutes.1/@courses.5 //@institutes.2/@courses.0 //@institutes.2/@courses.1 //@institutes.1/@courses.1"
/>
<semesters
<semesters
semester=
"3"
semester=
"3"
selectedCourses=
"//@institutes.0/@courses.5 //@institutes.2/@courses.2 //@institutes.2/@courses.3 //@institutes.0/@courses.1
3
//@institutes.1/@courses.6"
/>
selectedCourses=
"//@institutes.0/@courses.5 //@institutes.2/@courses.2 //@institutes.2/@courses.3 //@institutes.0/@courses.1
2
//@institutes.1/@courses.6"
/>
<semesters
<semesters
semester=
"4"
semester=
"4"
season=
"Spring"
season=
"Spring"
selectedCourses=
"//@institutes.1/@courses.7 //@institutes.0/@courses.
9 //@institutes.0/@courses.10
//@institutes.0/@courses.3"
/>
selectedCourses=
"//@institutes.1/@courses.7 //@institutes.0/@courses.
8 //@institutes.0/@courses.9
//@institutes.0/@courses.3"
/>
<semesters
<semesters
semester=
"5"
semester=
"5"
selectedCourses=
"//@institutes.0/@courses.1
1
//@institutes.2/@courses.4 //@institutes.2/@courses.5 //@institutes.2/@courses.6 //@institutes.1/@courses.8"
/>
selectedCourses=
"//@institutes.0/@courses.1
0
//@institutes.2/@courses.4 //@institutes.2/@courses.5 //@institutes.2/@courses.6 //@institutes.1/@courses.8"
/>
<semesters
<semesters
semester=
"6"
semester=
"6"
season=
"Spring"
season=
"Spring"
selectedCourses=
"//@institutes.0/@courses.7 //@institutes.0/@courses.1
6 //@institutes.0/@courses.14 //@institutes.0/@courses.15
"
/>
selectedCourses=
"//@institutes.0/@courses.7 //@institutes.0/@courses.1
5 //@institutes.0/@courses.13 //@institutes.0/@courses.14
"
/>
<semesters
<semesters
semester=
"7"
semester=
"7"
selectedCourses=
"//@institutes.3/@courses.0 //@institutes.0/@courses.6 //@institutes.0/@courses.1
2 //@institutes.0/@courses.2 //@institutes.0/@courses.19 //@institutes.0/@courses.21 //@institutes.0/@courses.23 //@institutes.0/@courses.24 //@institutes.0/@courses.20
"
/>
selectedCourses=
"//@institutes.3/@courses.0 //@institutes.0/@courses.6 //@institutes.0/@courses.1
1 //@institutes.0/@courses.2 //@institutes.0/@courses.16 //@institutes.0/@courses.18 //@institutes.0/@courses.19 //@institutes.0/@courses.20 //@institutes.0/@courses.17
"
/>
<semesters
<semesters
semester=
"8"
semester=
"8"
season=
"Spring"
season=
"Spring"
selectedCourses=
"//@institutes.2/@courses.1
3 //@institutes.2/@courses.7 //@institutes.2/@courses.8 //@institutes.2/@courses.9 //@institutes.2/@courses.10
"
/>
selectedCourses=
"//@institutes.2/@courses.1
2 //@institutes.2/@courses.7 //@institutes.2/@courses.8 //@institutes.2/@courses.9
"
/>
<semesters
<semesters
semester=
"9"
semester=
"9"
selectedCourses=
"//@institutes.0/@courses.2
5 //@institutes.2/@courses.11 //@institutes.2/@courses.12
"
/>
selectedCourses=
"//@institutes.0/@courses.2
1 //@institutes.2/@courses.10 //@institutes.2/@courses.11
"
/>
<semesters
<semesters
semester=
"10"
semester=
"10"
season=
"Spring"
season=
"Spring"
selectedCourses=
"//@institutes.0/@courses.26"
/>
selectedCourses=
"//@institutes.0/@courses.22"
/>
<specialisation
name=
"Matematikk og Informatikk"
/>
<mandatoryCourses
<mandatoryCourses
courses=
"//@institutes.0/@courses.0 //@institutes.1/@courses.0 //@institutes.1/@courses.1 //@institutes.1/@courses.4 //@institutes.1/@courses.3 //@institutes.1/@courses.5 //@institutes.2/@courses.0 //@institutes.2/@courses.2 //@institutes.2/@courses.7 //@institutes.2/@courses.1 //@institutes.2/@courses.3 //@institutes.2/@courses.4 //@institutes.0/@courses.4 //@institutes.1/@courses.6 //@institutes.0/@courses.5 //@institutes.0/@courses.1
3 //@institutes.1/@courses.7 //@institutes.2/@courses.5 //@institutes.2/@courses.6 //@institutes.2/@courses.9 //@institutes.2/@courses.10 //@institutes.1/@courses.8 //@institutes.0/@courses.11 //@institutes.3/@courses.0 //@institutes.0/@courses.26 //@institutes.2/@courses.13
"
/>
courses=
"//@institutes.0/@courses.0 //@institutes.1/@courses.0 //@institutes.1/@courses.1 //@institutes.1/@courses.4 //@institutes.1/@courses.3 //@institutes.1/@courses.5 //@institutes.2/@courses.0 //@institutes.2/@courses.2 //@institutes.2/@courses.7 //@institutes.2/@courses.1 //@institutes.2/@courses.3 //@institutes.2/@courses.4 //@institutes.0/@courses.4 //@institutes.1/@courses.6 //@institutes.0/@courses.5 //@institutes.0/@courses.1
2 //@institutes.1/@courses.7 //@institutes.2/@courses.5 //@institutes.2/@courses.6 //@institutes.2/@courses.8 //@institutes.2/@courses.9 //@institutes.1/@courses.8 //@institutes.0/@courses.10 //@institutes.3/@courses.0 //@institutes.0/@courses.22 //@institutes.2/@courses.12
"
/>
<electiveCourses
<electiveCourses
courses=
"//@institutes.0/@courses.25 //@institutes.2/@courses.11 //@institutes.2/@courses.12 //@institutes.0/@courses.17 //@institutes.0/@courses.18 //@institutes.0/@courses.1 //@institutes.0/@courses.14 //@institutes.0/@courses.15 //@institutes.0/@courses.21 //@institutes.0/@courses.23 //@institutes.0/@courses.2 //@institutes.0/@courses.19 //@institutes.0/@courses.24 //@institutes.0/@courses.16"
/>
courses=
"//@institutes.0/@courses.21 //@institutes.2/@courses.10 //@institutes.2/@courses.11 //@institutes.0/@courses.1 //@institutes.0/@courses.13 //@institutes.0/@courses.14 //@institutes.0/@courses.18 //@institutes.0/@courses.19 //@institutes.0/@courses.2 //@institutes.0/@courses.16 //@institutes.0/@courses.20 //@institutes.0/@courses.15"
/>
</programs>
<programs
name=
"Master i informatikk"
duration=
"Master"
>
<semesters/>
<semesters
semester=
"2"
season=
"Spring"
/>
<semesters
semester=
"3"
/>
<semesters
semester=
"4"
season=
"Spring"
/>
<specialisation
name=
"Software"
mandatoryCourses=
"//@institutes.0/@courses.2 //@institutes.0/@courses.23 //@institutes.0/@courses.13 //@institutes.0/@courses.24"
/>
<specialisation
name=
"Interaction Design, Game and Learning Technology"
mandatoryCourses=
"//@institutes.0/@courses.27 //@institutes.0/@courses.23 //@institutes.0/@courses.20 //@institutes.0/@courses.25"
/>
<specialisation
name=
"Databases and Search"
/>
<specialisation
name=
"Artificial Intelligence"
/>
</programs>
</programs>
<institutes
<institutes
name=
"Institutt for datateknologi og informatikk"
>
name=
"Institutt for datateknologi og informatikk"
>
...
@@ -116,10 +113,6 @@
...
@@ -116,10 +113,6 @@
name=
"Operativssystemer"
name=
"Operativssystemer"
credits=
"7.5"
credits=
"7.5"
level=
"ThirdYearCourse"
/>
level=
"ThirdYearCourse"
/>
<courses
code=
"TDT4140"
name=
"Programvareutvikling"
credits=
"7.5"
/>
<courses
<courses
code=
"TDT4145"
code=
"TDT4145"
name=
"Datamodellering og databasesystemer"
name=
"Datamodellering og databasesystemer"
...
@@ -158,15 +151,6 @@
...
@@ -158,15 +151,6 @@
name=
"Informatikk prosjektarbeid II"
name=
"Informatikk prosjektarbeid II"
credits=
"7.5"
credits=
"7.5"
level=
"ThirdYearCourse"
/>
level=
"ThirdYearCourse"
/>
<courses
code=
"IT2805"
name=
"Webteknologi"
credits=
"7.5"
/>
<courses
code=
"IT2810"
name=
"Webutvikling"
credits=
"7.5"
level=
"ThirdYearCourse"
/>
<courses
<courses
code=
"TDT4117"
code=
"TDT4117"
name=
"Informasjonsgjenfinning"
name=
"Informasjonsgjenfinning"
...
@@ -182,11 +166,6 @@
...
@@ -182,11 +166,6 @@
name=
"Programmeringsspråk"
name=
"Programmeringsspråk"
credits=
"7.5"
credits=
"7.5"
level=
"ThirdYearCourse"
/>
level=
"ThirdYearCourse"
/>
<courses
code=
"TDT4175"
name=
"Informasjonssystemer"
credits=
"7.5"
level=
"ThirdYearCourse"
/>
<courses
<courses
code=
"TDT4237"
code=
"TDT4237"
name=
"Programvaresikkerhet og personvern"
name=
"Programvaresikkerhet og personvern"
...
@@ -210,6 +189,35 @@
...
@@ -210,6 +189,35 @@
credits=
"30.0"
credits=
"30.0"
level=
"SecoundDegreeCourse"
level=
"SecoundDegreeCourse"
season=
"Both"
/>
season=
"Both"
/>
<courses
code=
"IT3010"
name=
"Metoder for forskningsbasert innovasjon i IT"
credits=
"7.5"
level=
"SecoundDegreeCourse"
season=
"Spring"
/>
<courses
code=
"IT3901"
name=
"Masteroppgave i informatikk: Programvaresystemer"
credits=
"60.0"
level=
"SecoundDegreeCourse"
season=
"Both"
/>
<courses
code=
"IT3402 "
name=
"Design av grafiske brukergrensesnitt"
credits=
"7.5"
level=
"SecoundDegreeCourse"
/>
<courses
code=
"TDT4245 "
name=
"Samhandlingsteknologi og sosiale medier"
credits=
"7.5"
level=
"SecoundDegreeCourse"
season=
"Spring"
/>
<courses
code=
"IT3906 "
name=
"Masteroppgave i informatikk: Interaksjonsdesign, spill- og læringsteknologi"
credits=
"60.0"
level=
"SecoundDegreeCourse"
season=
"Both"
/>
</institutes>
</institutes>
<institutes
<institutes
name=
"Institutt for matematiske fag"
>
name=
"Institutt for matematiske fag"
>
...
@@ -292,11 +300,6 @@
...
@@ -292,11 +300,6 @@
name=
"Pedagogikk"
name=
"Pedagogikk"
credits=
"15.0"
credits=
"15.0"
season=
"Spring"
/>
season=
"Spring"
/>
<courses
code=
"PPU4614"
name=
"PPU4625"
level=
"SecoundDegreeCourse"
season=
"Spring"
/>
<courses
<courses
code=
"PPU4625"
code=
"PPU4625"
name=
"Fagdidaktikk 2 - informatikk"
name=
"Fagdidaktikk 2 - informatikk"
...
...
tdt4250.spp.html/src/tdt4250/spp/html/target/NTNU.html
View file @
d94f6fac
...
@@ -11,118 +11,11 @@
...
@@ -11,118 +11,11 @@
<label
for=
"programs"
>
Choose program:
</label>
<label
for=
"programs"
>
Choose program:
</label>
<select
name=
"programs"
id=
"programs"
>
<select
name=
"programs"
id=
"programs"
>
<option
value=
"bachelor-in-it"
>
Bachelor in IT
</option>
<option
value=
"lektor-i-realfag"
>
Lektor i Realfag
</option>
<option
value=
"lektor-i-realfag"
>
Lektor i Realfag
</option>
<option
value=
"master-i-informatikk"
>
Master i informatikk
</option>
</select>
</select>
<div
id=
"bachelor-in-it"
class=
"spp-table"
>
<h2>
Bachelor in IT
</h2
<p
>
Bachelor in IT is taken over 6 semesters.
</p>
<h3>
Semester 1
</h3>
<table
style=
"width=80%"
>
<tr>
<th>
Code
</th>
<th>
Name
</th>
<th>
Credits
</th>
<th>
Level
</th>
</tr>
<tr>
<td>
TDT4110
</td>
<td>
Informasjonsteknologi, grunnkurs
</td>
<td>
7.5
</td>
<td>
FoundationCourse
</td>
</tr>
<tr>
<td>
IT2805
</td>
<td>
Webteknologi
</td>
<td>
7.5
</td>
<td>
FoundationCourse
</td>
</tr>
</table>
<h3>
Semester 2
</h3>
<table
style=
"width=80%"
>
<tr>
<th>
Code
</th>
<th>
Name
</th>
<th>
Credits
</th>
<th>
Level
</th>
</tr>
<tr>
<td>
TDT4100
</td>
<td>
Objektorientert programmering
</td>
<td>
7.5
</td>
<td>
FoundationCourse
</td>
</tr>
<tr>
<td>
MA1103
</td>
<td>
Flerdimensjonal analyse
</td>
<td>
7.5
</td>
<td>
FoundationCourse
</td>
</tr>
</table>
<h3>
Semester 3
</h3>
<table
style=
"width=80%"
>
<tr>
<th>
Code
</th>
<th>
Name
</th>
<th>
Credits
</th>
<th>
Level
</th>
</tr>
<tr>
<td>
TDT4120
</td>
<td>
Algoritmer og datastrukturer
</td>
<td>
7.5
</td>
<td>
IntermediateCourse
</td>
</tr>
<tr>
<td>
TMA4135
</td>
<td>
Matematikk 4D
</td>
<td>
7.5
</td>
<td>
ThirdYearCourse
</td>
</tr>
</table>
<h3>
Semester 4
</h3>
<table
style=
"width=80%"
>
<tr>
<th>
Code
</th>
<th>
Name
</th>
<th>
Credits
</th>
<th>
Level
</th>
</tr>
</table>
<h3>
Semester 5
</h3>
<table
style=
"width=80%"
>
<tr>
<th>
Code
</th>
<th>
Name
</th>
<th>
Credits
</th>
<th>
Level
</th>
</tr>
</table>
<h3>
Semester 6
</h3>
<table
style=
"width=80%"
>
<tr>
<th>
Code
</th>
<th>
Name
</th>
<th>
Credits
</th>
<th>
Level
</th>
</tr>
</table>
</div>
<div
id=
"lektor-i-realfag"
class=
"spp-table"
>
<div
id=
"lektor-i-realfag"
class=
"spp-table"
>
<h2>
Lektor i Realfag
</h2
<h2>
Lektor i Realfag
</h2
<p
>
Lektor i Realfag is taken over 10 semesters.
</p>
<p
>
Lektor i Realfag is taken over 10 semesters.
</p>
...
@@ -440,12 +333,6 @@
...
@@ -440,12 +333,6 @@
<td>
15.0
</td>
<td>
15.0
</td>
<td>
FoundationCourse
</td>
<td>
FoundationCourse
</td>
</tr>
</tr>
<tr>
<td>
PPU4614
</td>
<td>
PPU4625
</td>
<td>
0.0
</td>
<td>
SecoundDegreeCourse
</td>
</tr>
<tr>
<tr>
<td>
PPU4625
</td>
<td>
PPU4625
</td>
<td>
Fagdidaktikk 2 - informatikk
</td>
<td>
Fagdidaktikk 2 - informatikk
</td>
...
@@ -507,6 +394,55 @@
...
@@ -507,6 +394,55 @@
</table>
</table>
</div>
<div
id=
"master-i-informatikk"
class=
"spp-table"
>
<h2>
Master i informatikk
</h2
<p
>
Master i informatikk is taken over 4 semesters.
</p>
<h3>
Semester 1
</h3>
<table
style=
"width=80%"
>
<tr>
<th>
Code
</th>
<th>
Name
</th>
<th>
Credits
</th>
<th>
Level
</th>
</tr>
</table>
<h3>
Semester 2
</h3>
<table
style=
"width=80%"
>
<tr>
<th>
Code
</th>
<th>
Name
</th>
<th>
Credits
</th>
<th>
Level
</th>
</tr>
</table>
<h3>
Semester 3
</h3>
<table
style=
"width=80%"
>
<tr>
<th>
Code
</th>
<th>
Name
</th>
<th>
Credits
</th>
<th>
Level
</th>
</tr>
</table>
<h3>
Semester 4
</h3>
<table
style=
"width=80%"
>
<tr>
<th>
Code
</th>
<th>
Name
</th>
<th>
Credits
</th>
<th>
Level
</th>
</tr>
</table>
</div>
</div>
<script
src=
"index.js"
></script>
<script
src=
"index.js"
></script>
...
...
tdt4250.spp.model.edit/plugin.properties
View file @
d94f6fac
...
@@ -66,3 +66,5 @@ _UI_CourseLevelType_IntermediateCourse_literal = IntermediateCourse
...
@@ -66,3 +66,5 @@ _UI_CourseLevelType_IntermediateCourse_literal = IntermediateCourse
_UI_CourseLevelType_ThirdYearCourse_literal
=
ThirdYearCourse
_UI_CourseLevelType_ThirdYearCourse_literal
=
ThirdYearCourse
_UI_CourseLevelType_SecoundDegreeCourse_literal
=
SecoundDegreeCourse
_UI_CourseLevelType_SecoundDegreeCourse_literal
=
SecoundDegreeCourse
_UI_Semester_semester_feature
=
Semester
_UI_Semester_semester_feature
=
Semester
_UI_Specialisation_mandatoryCourses_feature
=
Mandatory Courses
_UI_Specialisation_electiveCourses_feature
=
Elective Courses
tdt4250.spp.model.edit/src/tdt4250/spp/provider/SpecialisationItemProvider.java
View file @
d94f6fac
...
@@ -61,6 +61,8 @@ public class SpecialisationItemProvider
...
@@ -61,6 +61,8 @@ public class SpecialisationItemProvider
super
.
getPropertyDescriptors
(
object
);
super
.
getPropertyDescriptors
(
object
);
addNamePropertyDescriptor
(
object
);
addNamePropertyDescriptor
(
object
);
addMandatoryCoursesPropertyDescriptor
(
object
);
addElectiveCoursesPropertyDescriptor
(
object
);
}
}
return
itemPropertyDescriptors
;
return
itemPropertyDescriptors
;
}
}
...
@@ -87,6 +89,50 @@ public class SpecialisationItemProvider
...
@@ -87,6 +89,50 @@ public class SpecialisationItemProvider
null
));
null
));
}
}
/**
* This adds a property descriptor for the Mandatory Courses feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected
void
addMandatoryCoursesPropertyDescriptor
(
Object
object
)
{
itemPropertyDescriptors
.
add
(
createItemPropertyDescriptor
(((
ComposeableAdapterFactory
)
adapterFactory
).
getRootAdapterFactory
(),
getResourceLocator
(),
getString
(
"_UI_Specialisation_mandatoryCourses_feature"
),
getString
(
"_UI_PropertyDescriptor_description"
,
"_UI_Specialisation_mandatoryCourses_feature"
,
"_UI_Specialisation_type"
),
SppPackage
.
Literals
.
SPECIALISATION__MANDATORY_COURSES
,
true
,
false
,
true
,
null
,
null
,
null
));
}
/**
* This adds a property descriptor for the Elective Courses feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected
void
addElectiveCoursesPropertyDescriptor
(
Object
object
)
{
itemPropertyDescriptors
.
add
(
createItemPropertyDescriptor
(((
ComposeableAdapterFactory
)
adapterFactory
).
getRootAdapterFactory
(),
getResourceLocator
(),
getString
(
"_UI_Specialisation_electiveCourses_feature"
),
getString
(
"_UI_PropertyDescriptor_description"
,
"_UI_Specialisation_electiveCourses_feature"
,
"_UI_Specialisation_type"
),
SppPackage
.
Literals
.
SPECIALISATION__ELECTIVE_COURSES
,
true
,
false
,
true
,
null
,
null
,
null
));
}
/**
/**
* This returns Specialisation.gif.
* This returns Specialisation.gif.
* <!-- begin-user-doc -->
* <!-- begin-user-doc -->
...
...
tdt4250.spp.model/src/tdt4250/spp/Course.java
View file @
d94f6fac
...
@@ -22,7 +22,8 @@ import org.eclipse.emf.ecore.EObject;
...
@@ -22,7 +22,8 @@ import org.eclipse.emf.ecore.EObject;
* </ul>
* </ul>
*
*
* @see tdt4250.spp.SppPackage#getCourse()
* @see tdt4250.spp.SppPackage#getCourse()
* @model
* @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='courseCodeNeedsToBeUnique'"
* annotation="http://www.eclipse.org/acceleo/query/1.0 courseCodeNeedsToBeUnique='self.eContainer().eContainer().institutes.courses.code -> select(i: String | i = self.code) -> size() < 2'"
* @generated
* @generated
*/
*/
public
interface
Course
extends
EObject
{
public
interface
Course
extends
EObject
{
...
...
tdt4250.spp.model/src/tdt4250/spp/Program.java
View file @
d94f6fac
...
@@ -91,28 +91,18 @@ public interface Program extends EObject {
...
@@ -91,28 +91,18 @@ public interface Program extends EObject {
EList
<
Semester
>
getSemesters
();
EList
<
Semester
>
getSemesters
();
/**
/**
* Returns the value of the '<em><b>Specialisation</b></em>' containment reference.
* Returns the value of the '<em><b>Specialisation</b></em>' containment reference list.
* The list contents are of type {@link tdt4250.spp.Specialisation}.
* It is bidirectional and its opposite is '{@link tdt4250.spp.Specialisation#getProgram <em>Program</em>}'.
* It is bidirectional and its opposite is '{@link tdt4250.spp.Specialisation#getProgram <em>Program</em>}'.
* <!-- begin-user-doc -->
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* <!-- end-user-doc -->
* @return the value of the '<em>Specialisation</em>' containment reference.
* @return the value of the '<em>Specialisation</em>' containment reference list.
* @see #setSpecialisation(Specialisation)
* @see tdt4250.spp.SppPackage#getProgram_Specialisation()
* @see tdt4250.spp.SppPackage#getProgram_Specialisation()
* @see tdt4250.spp.Specialisation#getProgram
* @see tdt4250.spp.Specialisation#getProgram
* @model opposite="program" containment="true"
* @model opposite="program" containment="true" upper="20"
* @generated
*/
Specialisation
getSpecialisation
();
/**
* Sets the value of the '{@link tdt4250.spp.Program#getSpecialisation <em>Specialisation</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Specialisation</em>' containment reference.
* @see #getSpecialisation()
* @generated
* @generated
*/
*/
void
setSpecialisation
(
Specialisation
value
);
EList
<
Specialisation
>
getSpecialisation
(
);
/**
/**
* Returns the value of the '<em><b>Mandatory Courses</b></em>' containment reference list.
* Returns the value of the '<em><b>Mandatory Courses</b></em>' containment reference list.
...
...
tdt4250.spp.model/src/tdt4250/spp/Specialisation.java
View file @
d94f6fac
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
*/
*/
package
tdt4250.spp
;
package
tdt4250.spp
;
import
org.eclipse.emf.common.util.EList
;
import
org.eclipse.emf.ecore.EObject
;
import
org.eclipse.emf.ecore.EObject
;
/**
/**
...
@@ -15,6 +16,8 @@ import org.eclipse.emf.ecore.EObject;
...
@@ -15,6 +16,8 @@ import org.eclipse.emf.ecore.EObject;
* <ul>
* <ul>
* <li>{@link tdt4250.spp.Specialisation#getName <em>Name</em>}</li>
* <li>{@link tdt4250.spp.Specialisation#getName <em>Name</em>}</li>
* <li>{@link tdt4250.spp.Specialisation#getProgram <em>Program</em>}</li>
* <li>{@link tdt4250.spp.Specialisation#getProgram <em>Program</em>}</li>
* <li>{@link tdt4250.spp.Specialisation#getMandatoryCourses <em>Mandatory Courses</em>}</li>
* <li>{@link tdt4250.spp.Specialisation#getElectiveCourses <em>Elective Courses</em>}</li>
* </ul>
* </ul>
*
*
* @see tdt4250.spp.SppPackage#getSpecialisation()
* @see tdt4250.spp.SppPackage#getSpecialisation()
...
@@ -68,4 +71,28 @@ public interface Specialisation extends EObject {
...
@@ -68,4 +71,28 @@ public interface Specialisation extends EObject {
*/
*/
void
setProgram
(
Program
value
);
void
setProgram
(
Program
value
);
/**
* Returns the value of the '<em><b>Mandatory Courses</b></em>' reference list.
* The list contents are of type {@link tdt4250.spp.Course}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the value of the '<em>Mandatory Courses</em>' reference list.
* @see tdt4250.spp.SppPackage#getSpecialisation_MandatoryCourses()
* @model
* @generated
*/
EList
<
Course
>
getMandatoryCourses
();
/**
* Returns the value of the '<em><b>Elective Courses</b></em>' reference list.
* The list contents are of type {@link tdt4250.spp.Course}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the value of the '<em>Elective Courses</em>' reference list.
* @see tdt4250.spp.SppPackage#getSpecialisation_ElectiveCourses()
* @model
* @generated
*/
EList
<
Course
>
getElectiveCourses
();
}
// Specialisation
}
// Specialisation
tdt4250.spp.model/src/tdt4250/spp/SppPackage.java
View file @
d94f6fac
...
@@ -208,7 +208,7 @@ public interface SppPackage extends EPackage {
...
@@ -208,7 +208,7 @@ public interface SppPackage extends EPackage {
int
PROGRAM__SEMESTERS
=
2
;
int
PROGRAM__SEMESTERS
=
2
;
/**
/**
* The feature id for the '<em><b>Specialisation</b></em>' containment reference.
* The feature id for the '<em><b>Specialisation</b></em>' containment reference
list
.
* <!-- begin-user-doc -->
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* <!-- end-user-doc -->
* @generated
* @generated
...
@@ -453,6 +453,24 @@ public interface SppPackage extends EPackage {
...
@@ -453,6 +453,24 @@ public interface SppPackage extends EPackage {
*/
*/
int
SPECIALISATION__PROGRAM
=
1
;
int
SPECIALISATION__PROGRAM
=
1
;
/**
* The feature id for the '<em><b>Mandatory Courses</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int
SPECIALISATION__MANDATORY_COURSES
=
2
;
/**
* The feature id for the '<em><b>Elective Courses</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int
SPECIALISATION__ELECTIVE_COURSES
=
3
;
/**
/**
* The number of structural features of the '<em>Specialisation</em>' class.
* The number of structural features of the '<em>Specialisation</em>' class.
* <!-- begin-user-doc -->
* <!-- begin-user-doc -->
...
@@ -460,7 +478,7 @@ public interface SppPackage extends EPackage {
...
@@ -460,7 +478,7 @@ public interface SppPackage extends EPackage {
* @generated
* @generated
* @ordered
* @ordered
*/
*/
int
SPECIALISATION_FEATURE_COUNT
=
2
;
int
SPECIALISATION_FEATURE_COUNT
=
4
;
/**
/**
* The number of operations of the '<em>Specialisation</em>' class.
* The number of operations of the '<em>Specialisation</em>' class.
...
@@ -735,10 +753,10 @@ public interface SppPackage extends EPackage {
...
@@ -735,10 +753,10 @@ public interface SppPackage extends EPackage {
EReference
getProgram_Semesters
();
EReference
getProgram_Semesters
();
/**
/**
* Returns the meta object for the containment reference '{@link tdt4250.spp.Program#getSpecialisation <em>Specialisation</em>}'.
* Returns the meta object for the containment reference
list
'{@link tdt4250.spp.Program#getSpecialisation <em>Specialisation</em>}'.
* <!-- begin-user-doc -->
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the containment reference '<em>Specialisation</em>'.
* @return the meta object for the containment reference
list
'<em>Specialisation</em>'.
* @see tdt4250.spp.Program#getSpecialisation()
* @see tdt4250.spp.Program#getSpecialisation()
* @see #getProgram()
* @see #getProgram()
* @generated
* @generated
...
@@ -960,6 +978,28 @@ public interface SppPackage extends EPackage {
...
@@ -960,6 +978,28 @@ public interface SppPackage extends EPackage {
*/
*/
EReference
getSpecialisation_Program
();