Skip to content
Permalink
Browse files

Improve locations export

  • Loading branch information...
danielboudreau danielboudreau
danielboudreau authored and danielboudreau committed Sep 25, 2018
1 parent 1622955 commit d573b436fcdde72159b5b504a78e857fe97fa2b9
@@ -118,7 +118,17 @@ public void writeFile(String name) {
del +
Bundle.getMessage("ScheduleName") +
del +
Bundle.getMessage("AlternateTrack");
Bundle.getMessage("ScheduleMode") +
del +
Bundle.getMessage("AlternateTrack") +
del +
Bundle.getMessage("Comment") +
del +
Bundle.getMessage("CommentBoth") +
del +
Bundle.getMessage("CommentPickup") +
del +
Bundle.getMessage("CommentSetout");

fileOut.println(header);

@@ -149,14 +159,14 @@ public void writeFile(String name) {
StringBuffer loadNames = new StringBuffer();
if (!track.getLoadOption().equals(Track.ALL_LOADS)) {
for (String loadName : track.getLoadNames()) {
loadNames.append(loadNames + loadName + "; ");
loadNames.append(loadName + "; ");
}
}

StringBuffer shipNames = new StringBuffer();
if (!track.getShipLoadOption().equals(Track.ALL_LOADS)) {
for (String shipName : track.getShipLoadNames()) {
shipNames.append(shipNames + shipName + "; ");
shipNames.append(shipName + "; ");
}
}

@@ -260,7 +270,18 @@ public void writeFile(String name) {
del +
track.getScheduleName() +
del +
alternateTrackName;
(track.getScheduleMode() == Track.MATCH ? Bundle.getMessage("Match")
: Bundle.getMessage("Sequential")) +
del +
alternateTrackName +
del +
ESC + track.getComment() + ESC +
del +
ESC + track.getCommentBoth() + ESC +
del +
ESC + track.getCommentPickup() + ESC +
del +
ESC + track.getCommentSetout() + ESC;

fileOut.println(line);
}
@@ -1,8 +1,5 @@
package jmri.jmrit.operations;

import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JRadioButton;
import jmri.InstanceManager;
import jmri.jmrit.operations.locations.Location;
import jmri.jmrit.operations.locations.LocationManager;
@@ -17,8 +14,6 @@
import jmri.jmrit.operations.trains.TrainManager;
import jmri.util.JUnitOperationsUtil;
import jmri.util.JUnitUtil;
import jmri.util.JmriJFrame;
import jmri.util.swing.JemmyUtil;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -5,7 +5,6 @@
import jmri.jmrit.operations.OperationsSwingTestCase;
import jmri.util.JUnitUtil;
import jmri.util.JmriJFrame;
import jmri.util.swing.JemmyUtil;
import org.junit.After;
import org.junit.Assert;
import org.junit.Assume;
@@ -4,7 +4,6 @@
import jmri.jmrit.operations.OperationsSwingTestCase;
import jmri.util.JUnitUtil;
import jmri.util.JmriJFrame;
import jmri.util.swing.JemmyUtil;
import org.junit.After;
import org.junit.Assert;
import org.junit.Assume;
@@ -4,7 +4,6 @@
import java.awt.GraphicsEnvironment;
import jmri.jmrit.operations.OperationsSwingTestCase;
import jmri.util.JUnitUtil;
import jmri.util.swing.JemmyUtil;
import org.junit.After;
import org.junit.Assume;
import org.junit.Before;

0 comments on commit d573b43

Please sign in to comment.
You can’t perform that action at this time.