Project

General

Profile

« Previous | Next » 

Revision c195f4fb

Added by Andreas Müller over 4 years ago

fix #8513 adapt some Activators to missing CdmUtils method

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/app/caryophyllales/CaryoSppIdentifierActivator.java
17 17
import org.apache.log4j.Logger;
18 18

  
19 19
import eu.etaxonomy.cdm.app.common.CdmDestinations;
20
import eu.etaxonomy.cdm.common.CdmUtils;
21 20
import eu.etaxonomy.cdm.database.DbSchemaValidation;
22 21
import eu.etaxonomy.cdm.database.ICdmDataSource;
23 22
import eu.etaxonomy.cdm.io.common.CdmDefaultImport;
......
68 67

  
69 68
//        URI.create("file:////BGBM-PESIHPC/FloraMalesianaXml/fmvol14_final2.xml")
70 69
        String path = "C://opt//data//Caryophyllales";
71
        File file = new File(path + CdmUtils.getFolderSeperator() + filename);
70
        File file = new File(path + File.separator + filename);
72 71
        if (!file.exists()){
73 72
            System.exit(-1);
74 73
            return null;
app-import/src/main/java/eu/etaxonomy/cdm/app/caryophyllales/NepenthesIdentifierActivator.java
16 16
import org.apache.log4j.Logger;
17 17

  
18 18
import eu.etaxonomy.cdm.app.common.CdmDestinations;
19
import eu.etaxonomy.cdm.common.CdmUtils;
20 19
import eu.etaxonomy.cdm.database.DbSchemaValidation;
21 20
import eu.etaxonomy.cdm.database.ICdmDataSource;
22 21
import eu.etaxonomy.cdm.io.common.CdmDefaultImport;
......
63 62

  
64 63
//        URI.create("file:////BGBM-PESIHPC/FloraMalesianaXml/fmvol14_final2.xml")
65 64
        String path = "C://opt//data//Caryophyllales";
66
        File file = new File(path + CdmUtils.getFolderSeperator() + filename);
65
        File file = new File(path + File.separator + filename);
67 66
        if (!file.exists()){
68 67
            System.exit(-1);
69 68
            return null;
app-import/src/main/java/eu/etaxonomy/cdm/app/caryophyllales/PlumbaginaceaeIdentifierActivator.java
17 17
import org.apache.log4j.Logger;
18 18

  
19 19
import eu.etaxonomy.cdm.app.common.CdmDestinations;
20
import eu.etaxonomy.cdm.common.CdmUtils;
21 20
import eu.etaxonomy.cdm.database.DbSchemaValidation;
22 21
import eu.etaxonomy.cdm.database.ICdmDataSource;
23 22
import eu.etaxonomy.cdm.io.common.CdmDefaultImport;
......
68 67

  
69 68
//        URI.create("file:////BGBM-PESIHPC/FloraMalesianaXml/fmvol14_final2.xml")
70 69
        String path = "C://opt//data//Caryophyllales";
71
        File file = new File(path + CdmUtils.getFolderSeperator() + filename);
70
        File file = new File(path + File.separator + filename);
72 71
        if (!file.exists()){
73 72
            System.exit(-1);
74 73
            return null;
......
87 86
        String filename = "WFONamesInCDM_Plumbaginaceae_IPNI.csv";
88 87

  
89 88
        String path = "C://opt//data//Caryophyllales";
90
        File file = new File(path + CdmUtils.getFolderSeperator() + filename);
89
        File file = new File(path + File.separator + filename);
91 90
        if (!file.exists()){
92 91
            System.exit(-1);
93 92
            return null;
app-import/src/main/java/eu/etaxonomy/cdm/app/edaphobase/EdaphobaseRankActivator.java
8 8
*/
9 9
package eu.etaxonomy.cdm.app.edaphobase;
10 10

  
11
import java.io.File;
11 12
import java.io.IOException;
12 13
import java.io.InputStreamReader;
13 14

  
......
58 59

  
59 60
    private InputStreamReader getGermanRanks() {
60 61
        String filename = "Rank_de.csv";
61
        String path = "terms" + CdmUtils.getFolderSeperator() + filename;
62
        String path = "terms" + File.separator + filename;
62 63
        try {
63 64
            InputStreamReader input = CdmUtils.getUtf8ResourceReader(path);
64 65
            return input;
......
71 72

  
72 73
    private InputStreamReader getLatinRanks() {
73 74
        String filename = "Rank_la.csv";
74
        String path = "terms" + CdmUtils.getFolderSeperator() + filename;
75
        String path = "terms" + File.separator + filename;
75 76
        try {
76 77
            InputStreamReader input = CdmUtils.getUtf8ResourceReader(path);
77 78
            return input;
app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelFactsImport.java
9 9

  
10 10
package eu.etaxonomy.cdm.io.berlinModel.in;
11 11

  
12
import java.io.File;
12 13
import java.io.IOException;
13 14
import java.net.URI;
14 15
import java.net.URISyntaxException;
......
850 851
        if (salvadorImages == null){
851 852
            salvadorImages = new HashMap<>();
852 853
            try {
853
                CSVReader reader = new CSVReader(CdmUtils.getUtf8ResourceReader("salvador" + CdmUtils.getFolderSeperator() + "SalvadorImages.csv"),';');
854
                CSVReader reader = new CSVReader(CdmUtils.getUtf8ResourceReader("salvador" + File.separator + "SalvadorImages.csv"),';');
854 855
                List<String[]> lines = reader.readAll();
855 856
                for (String[] line : lines){
856 857
                    String first = line[0];

Also available in: Unified diff