Changeset 31564 in osm for applications/editors/josm/plugins/OSMRecPlugin

Timestamp:

2015-09-16T12:38:19+02:00 (9 years ago)

Author:

nkaragiannakis

Message:

check windows path

Location:

applications/editors/josm/plugins/OSMRecPlugin

Files:

• nbproject/private/private.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/core/TrainWorker.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/osmrec/OSMRecPluginHelper.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/osmrec/personalization/TrainByUser.java (modified) (1 diff)

applications/editors/josm/plugins/OSMRecPlugin/nbproject/private/private.xml

@@ -4 +4 @@
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/home/imis-nkarag/software/josm_svn/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/parsers/Mapper.java</file>
-            <file>file:/home/imis-nkarag/software/josm_svn/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/osmrec/OSMRecPlugin.java</file>
-            <file>file:/home/imis-nkarag/software/josm_svn/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/osmrec/OSMRecPluginHelper.java</file>
-            <file>file:/home/imis-nkarag/software/josm_svn/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/osmrec/personalization/HistoryParser.java</file>
-            <file>file:/home/imis-nkarag/software/josm_svn/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/osmrec/personalization/TrainByUser.java</file>
-            <file>file:/home/imis-nkarag/software/josm_svn/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/core/TrainWorker.java</file>
-            <file>file:/home/imis-nkarag/software/josm_svn/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/extractor/SampleModelsExtractor.java</file>
+            <file>file:/C:/Users/pandaimonio/Documents/software/josm_svn/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/osmrec/OSMRecPlugin.java</file>
+            <file>file:/C:/Users/pandaimonio/Documents/software/josm_svn/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/osmrec/OSMRecPluginHelper.java</file>
+            <file>file:/C:/Users/pandaimonio/Documents/software/josm_svn/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/osmrec/personalization/TrainByUser.java</file>
+            <file>file:/C:/Users/pandaimonio/Documents/software/josm_svn/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/osmrec/MenuExportAction.java</file>
+            <file>file:/C:/Users/pandaimonio/Documents/software/josm_svn/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/core/TrainWorker.java</file>
         </group>
     </open-files>

applications/editors/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/core/TrainWorker.java

@@ -105 +105 @@
         this.frequency = frequency;
         this.topKIsSelected = topKIsSelected;
-        
-        inputFileName = inputFilePath.substring(inputFilePath.lastIndexOf("/"));
+        if(System.getProperty("os.name").contains("ux")){
+            inputFileName = inputFilePath.substring(inputFilePath.lastIndexOf("/"));
+        }
+        else{
+            inputFileName = inputFilePath.substring(inputFilePath.lastIndexOf("\\"));
+        }
         System.out.println("find parent directory, create osmrec dir for models: " + new File(inputFilePath).getParentFile());
         modelDirectoryPath = new File(inputFilePath).getParentFile() + "/OSMRec_models";

applications/editors/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/osmrec/OSMRecPluginHelper.java

@@ -1495 +1495 @@
                     String svmModelPath = fileChooser.getSelectedFile().getAbsolutePath();
                     String svmModelText;
-                    if(svmModelPath.contains("/")){
-                        svmModelText = svmModelPath.substring(svmModelPath.lastIndexOf("/"));
+                    if(System.getProperty("os.name").contains("ux")){
+                        if(svmModelPath.contains("/")){
+                            svmModelText = svmModelPath.substring(svmModelPath.lastIndexOf("/"));
+                        }
+                        else{
+                            svmModelText = svmModelPath;
+                        }
                     }
                     else{
-                        svmModelText = svmModelPath;
+                         if(svmModelPath.contains("\\")){
+                            svmModelText = svmModelPath.substring(svmModelPath.lastIndexOf("/"));
+                        }
+                        else{
+                            svmModelText = svmModelPath;
+                        }                       
                     }
                     combinationDefaultListModel.addElement(svmModelText);

applications/editors/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/osmrec/personalization/TrainByUser.java

@@ -100 +100 @@
         System.out.println("find parent directory, create osmrec dir for models: " + new File(inputFilePath).getParentFile());
         
-        inputFileName = inputFilePath.substring(inputFilePath.lastIndexOf("/"));
+        if(System.getProperty("os.name").contains("ux")){
+            inputFileName = inputFilePath.substring(inputFilePath.lastIndexOf("/"));
+        }
+        else{
+            inputFileName = inputFilePath.substring(inputFilePath.lastIndexOf("\\"));
+        }
+        
         modelDirectoryPath = new File(inputFilePath).getParentFile() + "/OSMRec_models";
         //textualDirectoryPath = new File(inputFilePath).getParentFile() + "/OSMRec_models/textualList.txt";