Skip to content

Commit

Permalink
adjust to latest matsim, change to matsim 12
Browse files Browse the repository at this point in the history
  • Loading branch information
nkuehnel committed Feb 26, 2021
1 parent d17c110 commit 16bbb45
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 7 deletions.
17 changes: 12 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,13 @@ repositories {
}
}
maven {
url("https://maven.conveyal.com")
url("https://artifacts.unidata.ucar.edu/repository/unidata-all")
content {
includeGroup("edu.ucar")
}
}
maven {
url("http://nexus.onebusaway.org/nexus/content/repositories/public/")
content {
includeGroup("com.conveyal")
}
Expand All @@ -38,9 +44,9 @@ dependencies {
if (openjfxClasspath != null) {
implementation(files(openjfxClasspath))
}
packIntoJar ('org.matsim:matsim:11.0') {changing = true}
packIntoJar ('org.matsim.contrib:otfvis:11.0') {changing = true}
packIntoJar ('org.matsim.contrib:emissions:11.0') {changing = true}
packIntoJar ('org.matsim:matsim:12.0') {changing = true}
packIntoJar ('org.matsim.contrib:otfvis:12.0') {changing = true}
packIntoJar ('org.matsim.contrib:emissions:12.0') {changing = true}
packIntoJar ('com.conveyal:gtfs-lib:5.0.7')

def junitVersion = "5.5.2"
Expand All @@ -55,7 +61,7 @@ dependencies {
sourceCompatibility = 1.8
archivesBaseName = "matsim"
josm {
josmCompileVersion = 17023
josmCompileVersion = 17428
manifest {
author = "Nico Kuehnel"
description = "Allows to edit and extract network information for the traffic simulation MATSim"
Expand All @@ -64,6 +70,7 @@ josm {
mainClass = "org.matsim.contrib.josm.MATSimPlugin"
pluginDependencies << 'jts' << 'javafx' << 'geotools'
website = new URL("http://www.matsim.org")
oldVersionDownloadLink 17023, 'v1.0.7', new URL('https://github.com/matsim-org/josm-matsim-plugin/releases/download/v1.0.7/matsim.jar')
oldVersionDownloadLink 16392, 'v1.0.6', new URL('https://github.com/matsim-org/josm-matsim-plugin/releases/download/v1.0.6/matsim.jar')
oldVersionDownloadLink 16239, 'v1.0.5', new URL('https://github.com/matsim-org/josm-matsim-plugin/releases/download/v1.0.5/matsim.jar')
oldVersionDownloadLink 15007, 'v1.0.3', new URL('https://github.com/matsim-org/josm-matsim-plugin/releases/download/v1.0.3/matsim.jar')
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/matsim/contrib/josm/gui/ImportDialog.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ public class ImportDialog extends JPanel {
*/
final JLabel networkHeading = new JLabel("Network:");
final JLabel networkPath = new JLabel("...");
final JButton networkPathButton = new JButton(new ImageProvider("open.png").getResource().getImageIcon(new Dimension(10, 10)));
final JButton networkPathButton = new JButton(ImageProvider.get("open.svg", ImageProvider.ImageSizes.SMALLICON));
final JLabel schedulePathHeading = new JLabel("Transit Schedule:");
final JLabel schedulePath = new JLabel("...");
final JButton schedulePathButton = new JButton(new ImageProvider("open.png").getResource().getImageIcon(new Dimension(10, 10)));
final JButton schedulePathButton = new JButton(ImageProvider.get("open.svg", ImageProvider.ImageSizes.SMALLICON));
final JLabel importSystemLabel = new JLabel("Origin System:");

final JComboBox<ProjectionChoice> importSystemCB = new JComboBox<>(ProjectionPreference.getProjectionChoices().toArray(new ProjectionChoice[] {}));
Expand Down

0 comments on commit 16bbb45

Please sign in to comment.