Merge lp:~yrke/tapaal/removedUnusedcode-arcpathsplit into lp:tapaal/dev

Proposed by Kenneth Yrke Jørgensen on 2019-06-12
Status: Merged
Merged at revision: 1022
Proposed branch: lp:~yrke/tapaal/removedUnusedcode-arcpathsplit
Merge into: lp:tapaal/dev
Diff against target: 46 lines (+2/-9)
2 files modified
src/pipe/gui/GuiFrame.java (+2/-2)
src/pipe/gui/graphicElements/Arc.java (+0/-7)
To merge this branch: bzr merge lp:~yrke/tapaal/removedUnusedcode-arcpathsplit
Reviewer Review Type Date Requested Status
Kenneth Yrke Jørgensen Approve on 2019-06-13
Review via email: mp+368707@code.launchpad.net
To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/pipe/gui/GuiFrame.java'
2--- src/pipe/gui/GuiFrame.java 2019-05-03 10:24:24 +0000
3+++ src/pipe/gui/GuiFrame.java 2019-06-12 12:49:06 +0000
4@@ -1564,7 +1564,7 @@
5 } else {
6 path = appTab.getTitleAt(index);
7 }
8- String filename = FileBrowser.constructor("Timed-Arc Petri Net", "tapn", path).saveFile();
9+ String filename = FileBrowser.constructor("Timed-Arc Petri Net", "tapn", path).saveFile(path);
10 if (filename != null) {
11 modelFile = new File(filename);
12 saveNet(index, modelFile);
13@@ -1584,7 +1584,7 @@
14 try {
15 saveNet(index, outFile, (List<TAPNQuery>) CreateGui.getTab(index).queries());
16
17- CreateGui.getCurrentTab().setFile(outFile);
18+ CreateGui.getTab(index).setFile(outFile);
19
20 CreateGui.getDrawingSurface(index).setNetChanged(false);
21 appTab.setTitleAt(index, outFile.getName());
22
23=== modified file 'src/pipe/gui/graphicElements/Arc.java'
24--- src/pipe/gui/graphicElements/Arc.java 2019-05-09 12:33:03 +0000
25+++ src/pipe/gui/graphicElements/Arc.java 2019-06-12 12:49:06 +0000
26@@ -13,8 +13,6 @@
27 import pipe.gui.Pipe;
28 import pipe.gui.Zoomer;
29 import pipe.gui.handler.LabelHandler;
30-import pipe.gui.undo.AddArcPathPointEdit;
31-import dk.aau.cs.gui.undo.Command;
32 import dk.aau.cs.model.tapn.Weight;
33
34 /**
35@@ -375,11 +373,6 @@
36 myPath.setTransitionAngle(angle);
37 }
38
39- public Command split(Point2D.Float mouseposition) {
40- ArcPathPoint newPoint = myPath.splitSegment(mouseposition);
41- return new AddArcPathPointEdit(this, newPoint);
42- }
43-
44 public Transition getTransition() {
45 if (getTarget() instanceof Transition) {
46 return (Transition) getTarget();

Subscribers

People subscribed via source and target branches

to all changes: