-
-
Notifications
You must be signed in to change notification settings - Fork 196
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1212 from umple/bug1193_extraTests
Fixes #1193, inner enumerations referencing in java
- Loading branch information
Showing
5 changed files
with
181 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
142 changes: 142 additions & 0 deletions
142
...ple/test/cruise/umple/implementation/java/TestUmpleEnumerations_innerQualified_1.java.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| /*PLEASE DO NOT EDIT THIS CODE*/ | ||
| /*This code was generated using the UMPLE @UMPLE_VERSION@ modeling language!*/ | ||
|
|
||
| package enumerations; | ||
| import java.util.*; | ||
|
|
||
|
|
||
| public class Driver | ||
| { | ||
|
|
||
| //------------------------ | ||
| // MEMBER VARIABLES | ||
| //------------------------ | ||
|
|
||
| //Driver Associations | ||
| private List<DriverSchedule> driverSchedules; | ||
|
|
||
| //------------------------ | ||
| // CONSTRUCTOR | ||
| //------------------------ | ||
|
|
||
| public Driver() | ||
| { | ||
| driverSchedules = new ArrayList<DriverSchedule>(); | ||
| } | ||
|
|
||
| //------------------------ | ||
| // INTERFACE | ||
| //------------------------ | ||
| /* Code from template association_GetMany */ | ||
| public DriverSchedule getDriverSchedule(int index) | ||
| { | ||
| DriverSchedule aDriverSchedule = driverSchedules.get(index); | ||
| return aDriverSchedule; | ||
| } | ||
|
|
||
| public List<DriverSchedule> getDriverSchedules() | ||
| { | ||
| List<DriverSchedule> newDriverSchedules = Collections.unmodifiableList(driverSchedules); | ||
| return newDriverSchedules; | ||
| } | ||
|
|
||
| public int numberOfDriverSchedules() | ||
| { | ||
| int number = driverSchedules.size(); | ||
| return number; | ||
| } | ||
|
|
||
| public boolean hasDriverSchedules() | ||
| { | ||
| boolean has = driverSchedules.size() > 0; | ||
| return has; | ||
| } | ||
|
|
||
| public int indexOfDriverSchedule(DriverSchedule aDriverSchedule) | ||
| { | ||
| int index = driverSchedules.indexOf(aDriverSchedule); | ||
| return index; | ||
| } | ||
| /* Code from template association_MinimumNumberOfMethod */ | ||
| public static int minimumNumberOfDriverSchedules() | ||
| { | ||
| return 0; | ||
| } | ||
| /* Code from template association_AddManyToOne */ | ||
| public DriverSchedule addDriverSchedule(DriverSchedule.Shift aShift, DriverSchedule.Status aStatus) | ||
| { | ||
| return new DriverSchedule(aShift, aStatus, this); | ||
| } | ||
|
|
||
| public boolean addDriverSchedule(DriverSchedule aDriverSchedule) | ||
| { | ||
| boolean wasAdded = false; | ||
| if (driverSchedules.contains(aDriverSchedule)) { return false; } | ||
| Driver existingDriver = aDriverSchedule.getDriver(); | ||
| boolean isNewDriver = existingDriver != null && !this.equals(existingDriver); | ||
| if (isNewDriver) | ||
| { | ||
| aDriverSchedule.setDriver(this); | ||
| } | ||
| else | ||
| { | ||
| driverSchedules.add(aDriverSchedule); | ||
| } | ||
| wasAdded = true; | ||
| return wasAdded; | ||
| } | ||
|
|
||
| public boolean removeDriverSchedule(DriverSchedule aDriverSchedule) | ||
| { | ||
| boolean wasRemoved = false; | ||
| //Unable to remove aDriverSchedule, as it must always have a driver | ||
| if (!this.equals(aDriverSchedule.getDriver())) | ||
| { | ||
| driverSchedules.remove(aDriverSchedule); | ||
| wasRemoved = true; | ||
| } | ||
| return wasRemoved; | ||
| } | ||
| /* Code from template association_AddIndexControlFunctions */ | ||
| public boolean addDriverScheduleAt(DriverSchedule aDriverSchedule, int index) | ||
| { | ||
| boolean wasAdded = false; | ||
| if(addDriverSchedule(aDriverSchedule)) | ||
| { | ||
| if(index < 0 ) { index = 0; } | ||
| if(index > numberOfDriverSchedules()) { index = numberOfDriverSchedules() - 1; } | ||
| driverSchedules.remove(aDriverSchedule); | ||
| driverSchedules.add(index, aDriverSchedule); | ||
| wasAdded = true; | ||
| } | ||
| return wasAdded; | ||
| } | ||
|
|
||
| public boolean addOrMoveDriverScheduleAt(DriverSchedule aDriverSchedule, int index) | ||
| { | ||
| boolean wasAdded = false; | ||
| if(driverSchedules.contains(aDriverSchedule)) | ||
| { | ||
| if(index < 0 ) { index = 0; } | ||
| if(index > numberOfDriverSchedules()) { index = numberOfDriverSchedules() - 1; } | ||
| driverSchedules.remove(aDriverSchedule); | ||
| driverSchedules.add(index, aDriverSchedule); | ||
| wasAdded = true; | ||
| } | ||
| else | ||
| { | ||
| wasAdded = addDriverScheduleAt(aDriverSchedule, index); | ||
| } | ||
| return wasAdded; | ||
| } | ||
|
|
||
| public void delete() | ||
| { | ||
| for(int i=driverSchedules.size(); i > 0; i--) | ||
| { | ||
| DriverSchedule aDriverSchedule = driverSchedules.get(i - 1); | ||
| aDriverSchedule.delete(); | ||
| } | ||
| } | ||
|
|
||
| } |
12 changes: 12 additions & 0 deletions
12
...se.umple/test/cruise/umple/implementation/java/TestUmpleEnumerations_innerQualified_1.ump
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| namespace enumerations; | ||
|
|
||
| class Driver { | ||
| } | ||
|
|
||
| class DriverSchedule { | ||
| enum Shift { Morning, Afternoon, Night } | ||
| enum Status {ACTIVE, INACTIVE} | ||
| Shift shift; | ||
| Status status; | ||
| * -- 1 Driver driver; | ||
| } |