Jan Lahoda avatar Jan Lahoda committed d5a151f

When constructing id category, strip additional non-alphanumeric characters.

Comments (0)

Files changed (1)

cmdline/tool/src/org/netbeans/modules/jackpot30/cmdline/Main.java

             idDisplayName = "unknown";
         }
 
-        idDisplayName = "[" + idDisplayName.replace(' ', '_').replace('.', '_').replace("(", "").replace(")", "") + "] ";
+        for (Entry<String, String> remap : toIdRemap.entrySet()) {
+            idDisplayName.replace(remap.getKey(), remap.getValue());
+        }
+
+        idDisplayName = "[" + idDisplayName.replaceAll("_+", "_") + "] ";
 
         System.out.println(FileUtil.getFileDisplayName(error.getFile()) + ":" + (lineNumber + 1) + ": warning: " + idDisplayName + error.getDescription());
         System.out.println(line);
         System.out.println(b);
     }
 
+    private static final Map<String, String> toIdRemap = new HashMap<String, String>() {{
+        put(" ", "_");
+        put("-", "_");
+        put(".", "_");
+        put("(", "");
+        put(")", "");
+        put("==", "equals");
+        put("!=", "not_equals");
+    }};
+
     private static void apply(Iterable<? extends HintDescription> descs, Folder[] sourceRoot, ProgressHandleWrapper progress, File out) throws IOException {
         ProgressHandleWrapper w = progress.startNextPartWithEmbedding(1, 1);
         BatchResult occurrences = BatchSearch.findOccurrences(descs, Scopes.specifiedFoldersScope(sourceRoot), w);
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.