Merge lp:~boegholm/juppaal/SARTS-sync into lp:juppaal
Proposed by
Thomas Bøgholm
Status: | Needs review |
---|---|
Proposed branch: | lp:~boegholm/juppaal/SARTS-sync |
Merge into: | lp:juppaal |
Diff against target: |
166 lines (+54/-10) 5 files modified
src/uppaal/Automaton.java (+11/-1) src/uppaal/Location.java (+2/-1) src/uppaal/SystemDeclaration.java (+5/-2) src/uppaal/Transition.java (+6/-4) src/uppaal/UPPAALPrettyfy.java (+30/-2) |
To merge this branch: | bzr merge lp:~boegholm/juppaal/SARTS-sync |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Kasper Søe Luckow | Pending | ||
Review via email:
|
Description of the change
Sync with SARTS-juppaal
- replaced:
return automaton.
- with
return "id" + String.valueOf(id);
Which is correct?
To post a comment you must log in.
Unmerged revisions
- 5. By Thomas Bøgholm (<email address hidden>)
-
synced with SARTS-juppaal