From b5faeadb8b94487be1ede919a0aa7d7993eeb70d Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Thu, 16 Aug 2012 15:51:46 +0200 Subject: [PATCH] removed unused methods --- .../src/de/schildbach/pte/BahnProvider.java | 21 ------------------- enabler/src/de/schildbach/pte/PlProvider.java | 19 ----------------- 2 files changed, 40 deletions(-) diff --git a/enabler/src/de/schildbach/pte/BahnProvider.java b/enabler/src/de/schildbach/pte/BahnProvider.java index 21a62444..10f00e06 100644 --- a/enabler/src/de/schildbach/pte/BahnProvider.java +++ b/enabler/src/de/schildbach/pte/BahnProvider.java @@ -25,7 +25,6 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import de.schildbach.pte.dto.Line; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; @@ -228,24 +227,4 @@ public final class BahnProvider extends AbstractHafasProvider return 0; } - - private static final Pattern P_LINE_NUMBER = Pattern.compile("\\d{2,5}"); - - @Override - protected final Line parseLineWithoutType(final String line) - { - if ("Schw-B".equals(line)) // Schwebebahn, gilt als "Straßenbahn besonderer Bauart" - return newLine('T', line); - - if (P_LINE_RUSSIA.matcher(line).matches()) - return newLine('R', line); - - if (P_LINE_NUMBER.matcher(line).matches()) - return newLine('?', line); - - if ("---".equals(line)) - return newLine('?', line); - - return super.parseLineWithoutType(line); - } } diff --git a/enabler/src/de/schildbach/pte/PlProvider.java b/enabler/src/de/schildbach/pte/PlProvider.java index bce97b1f..c79a256e 100644 --- a/enabler/src/de/schildbach/pte/PlProvider.java +++ b/enabler/src/de/schildbach/pte/PlProvider.java @@ -19,10 +19,7 @@ package de.schildbach.pte; import java.io.IOException; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import de.schildbach.pte.dto.Line; import de.schildbach.pte.dto.Location; import de.schildbach.pte.dto.LocationType; import de.schildbach.pte.dto.NearbyStationsResult; @@ -197,22 +194,6 @@ public class PlProvider extends AbstractHafasProvider return xmlMLcReq(constraint); } - private static final Pattern P_NORMALIZE_LINE_RUSSIA = Pattern.compile("(?:D\\s*)?(\\d{1,3}(?:[A-Z]{2}|Y))"); - private static final Pattern P_NORMALIZE_LINE_NUMBER = Pattern.compile("\\d{2,5}"); - - @Override - protected Line parseLineWithoutType(final String line) - { - final Matcher mRussia = P_NORMALIZE_LINE_RUSSIA.matcher(line); - if (mRussia.matches()) - return newLine('R', mRussia.group(1)); - - if (P_NORMALIZE_LINE_NUMBER.matcher(line).matches()) - return newLine('R', line); - - return super.parseLineWithoutType(line); - } - @Override protected char normalizeType(final String type) {