Changeset 12542 in josm for trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java
- Timestamp:
- 2017-07-30T17:07:42+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java
r12537 r12542 42 42 * @since 4869 43 43 */ 44 private static final ArrayList<FileImporter> IMPORTERS;44 private static final ArrayList<FileImporter> importers; 45 45 46 46 /** … … 48 48 * @since 4869 49 49 */ 50 private static final ArrayList<FileExporter> EXPORTERS;50 private static final ArrayList<FileExporter> exporters; 51 51 52 52 // add some file types only if the relevant classes are there. … … 56 56 static { 57 57 58 IMPORTERS= new ArrayList<>();58 importers = new ArrayList<>(); 59 59 60 60 final List<Class<? extends FileImporter>> importerNames = Arrays.asList( … … 73 73 try { 74 74 FileImporter importer = importerClass.getConstructor().newInstance(); 75 IMPORTERS.add(importer);75 importers.add(importer); 76 76 } catch (ReflectiveOperationException e) { 77 77 Main.debug(e); … … 95 95 } 96 96 97 EXPORTERS= new ArrayList<>();97 exporters = new ArrayList<>(); 98 98 99 99 final List<Class<? extends FileExporter>> exporterClasses = Arrays.asList( … … 110 110 try { 111 111 FileExporter exporter = exporterClass.getConstructor().newInstance(); 112 EXPORTERS.add(exporter);112 exporters.add(exporter); 113 113 Main.getLayerManager().addAndFireActiveLayerChangeListener(exporter); 114 114 } catch (ReflectiveOperationException e) { … … 147 147 public static void addImporter(FileImporter importer) { 148 148 if (importer != null) { 149 IMPORTERS.add(importer);149 importers.add(importer); 150 150 } 151 151 } … … 158 158 public static void addImporterFirst(FileImporter importer) { 159 159 if (importer != null) { 160 IMPORTERS.add(0, importer);160 importers.add(0, importer); 161 161 } 162 162 } … … 169 169 public static void addExporter(FileExporter exporter) { 170 170 if (exporter != null) { 171 EXPORTERS.add(exporter);171 exporters.add(exporter); 172 172 } 173 173 } … … 180 180 public static void addExporterFirst(FileExporter exporter) { 181 181 if (exporter != null) { 182 EXPORTERS.add(0, exporter);182 exporters.add(0, exporter); 183 183 } 184 184 } … … 190 190 */ 191 191 public static List<FileImporter> getImporters() { 192 return Collections.unmodifiableList( IMPORTERS);192 return Collections.unmodifiableList(importers); 193 193 } 194 194 … … 199 199 */ 200 200 public static List<FileExporter> getExporters() { 201 return Collections.unmodifiableList( EXPORTERS);201 return Collections.unmodifiableList(exporters); 202 202 } 203 203 … … 213 213 */ 214 214 public static void updateAllFormatsImporter() { 215 for (int i = 0; i < IMPORTERS.size(); i++) {216 if ( IMPORTERS.get(i) instanceof AllFormatsImporter) {217 IMPORTERS.set(i, new AllFormatsImporter());215 for (int i = 0; i < importers.size(); i++) { 216 if (importers.get(i) instanceof AllFormatsImporter) { 217 importers.set(i, new AllFormatsImporter()); 218 218 } 219 219 } … … 231 231 updateAllFormatsImporter(); 232 232 List<ExtensionFileFilter> filters = new LinkedList<>(); 233 for (FileImporter importer : IMPORTERS) {233 for (FileImporter importer : importers) { 234 234 filters.add(importer.filter); 235 235 } … … 248 248 public static List<ExtensionFileFilter> getExportExtensionFileFilters() { 249 249 List<ExtensionFileFilter> filters = new LinkedList<>(); 250 for (FileExporter exporter : EXPORTERS) {250 for (FileExporter exporter : exporters) { 251 251 if (filters.contains(exporter.filter) || !exporter.isEnabled()) { 252 252 continue; … … 267 267 public static ExtensionFileFilter getDefaultImportExtensionFileFilter(String extension) { 268 268 if (extension == null) return new AllFormatsImporter().filter; 269 for (FileImporter importer : IMPORTERS) {269 for (FileImporter importer : importers) { 270 270 if (extension.equals(importer.filter.getDefaultExtension())) 271 271 return importer.filter; … … 283 283 public static ExtensionFileFilter getDefaultExportExtensionFileFilter(String extension) { 284 284 if (extension == null) return new AllFormatsImporter().filter; 285 for (FileExporter exporter : EXPORTERS) {285 for (FileExporter exporter : exporters) { 286 286 if (extension.equals(exporter.filter.getDefaultExtension())) 287 287 return exporter.filter; … … 290 290 // scan all supported extensions 291 291 File file = new File("file." + extension); 292 for (FileExporter exporter : EXPORTERS) {292 for (FileExporter exporter : exporters) { 293 293 if (exporter.filter.accept(file)) 294 294 return exporter.filter;
Note:
See TracChangeset
for help on using the changeset viewer.