Comments remove

Former-commit-id: 30cc0145

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenArtifact.java

@@ -169,10 +169,6 @@ public class MavenArtifact
         return lastUpdate;
     }
 
-    public List<MavenArtifactVersion> getLocalVersions() {
-        return localVersions;
-    }
-
     private String getArtifactURL() {
         String dir = groupId.replace('.', '/') + "/" + artifactId;
         return repository.getUrl() + dir + "/";
@@ -207,36 +203,14 @@ public class MavenArtifact
         return null;
     }
 
-    public void addVersion(MavenArtifactVersion version) {
-        localVersions.add(version);
-    }
-
     private MavenArtifactVersion makeLocalVersion(DBRProgressMonitor monitor, String versionStr, boolean setActive) throws IllegalArgumentException, IOException {
         MavenArtifactVersion version = getVersion(versionStr);
         if (version == null) {
             version = new MavenArtifactVersion(monitor, this, versionStr);
             localVersions.add(version);
         }
-//        if (setActive) {
-//            activeVersion = versionStr;
-//            repository.flushCache();
-//        }
-        return version;
-    }
-
-/*
-    public MavenArtifactVersion resolveActiveVersion(DBRProgressMonitor monitor) throws IOException {
-        if (CommonUtils.isEmpty(activeVersion)) {
-            return null;
-        }
-        MavenArtifactVersion version = getVersion(activeVersion);
-        if (version == null) {
-            version = new MavenArtifactVersion(context, this, activeVersion);
-            localVersions.add(version);
-        }
         return version;
     }
-*/
 
     public MavenArtifactVersion resolveVersion(DBRProgressMonitor monitor, String versionRef) throws IOException {
         if (CommonUtils.isEmpty(versionRef)) {

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenRegistry.java

@@ -196,26 +196,4 @@ public class MavenRegistry
         return null;
     }
 
-/*
-    private class ConfigSaver extends AbstractJob {
-
-        public static final int SAVE_PERIOD = 1000;
-
-        protected ConfigSaver() {
-            super("Maven local cache persister");
-            setSystem(true);
-        }
-
-        @Override
-        protected IStatus run(DBRProgressMonitor monitor) {
-            for (MavenRepository repository : repositories) {
-                repository.saveCacheIfNeeded();
-            }
-
-            schedule(SAVE_PERIOD);
-            return Status.OK_STATUS;
-        }
-    }
-*/
-
 }

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenRepository.java

@@ -142,106 +142,6 @@ public class MavenRepository
         return homeFolder;
     }
 
-/*
-    synchronized void loadCache() {
-        File cacheFile = new File(getLocalCacheDir(), METADATA_CACHE_FILE);
-        if (!cacheFile.exists()) {
-            return;
-        }
-        try (final DBRProgressMonitor monitor = new DBPDriverContext(VoidProgressMonitor.INSTANCE)) {
-            InputStream mdStream = new FileInputStream(cacheFile);
-            try {
-                SAXReader reader = new SAXReader(mdStream);
-                reader.parse(new SAXListener() {
-                    MavenArtifact lastArtifact;
-                    @Override
-                    public void saxStartElement(SAXReader reader, String namespaceURI, String localName, Attributes atts) throws XMLException {
-                        if (TAG_ARTIFACT.equals(localName)) {
-                            lastArtifact = new MavenArtifact(
-                                MavenRepository.this,
-                                atts.getValue(ATTR_GROUP_ID),
-                                atts.getValue(ATTR_ARTIFACT_ID));
-                            cachedArtifacts.put(
-                                MavenArtifactReference.makeId(lastArtifact.getGroupId(), lastArtifact.getArtifactId()),
-                                lastArtifact);
-                        } else if (TAG_VERSION.equals(localName) && lastArtifact != null) {
-                            String versionNumber = atts.getValue(ATTR_VERSION);
-                            try {
-                                MavenArtifactVersion version = new MavenArtifactVersion(
-                                    context,
-                                    lastArtifact,
-                                    versionNumber
-                                );
-                                lastArtifact.addVersion(version);
-                            } catch (IOException e) {
-                                log.warn("Error loading cached artifact version " + lastArtifact + ":" + versionNumber, e);
-                            }
-                        }
-                    }
-                    @Override
-                    public void saxText(SAXReader reader, String data) throws XMLException {
-                    }
-
-                    @Override
-                    public void saxEndElement(SAXReader reader, String namespaceURI, String localName) throws XMLException {
-                        if (TAG_ARTIFACT.equals(localName)) {
-                            lastArtifact = null;
-                        }
-                    }
-                });
-            } catch (XMLException e) {
-                log.warn("Error parsing cached Maven repository '" + id + "'", e);
-            } finally {
-                IOUtils.close(mdStream);
-            }
-        } catch (IOException e) {
-            log.warn("IO error while reading cached Maven repository '" + id + "'", e);
-        }
-    }
-
-    void saveCacheIfNeeded() {
-        if (needsToSave) {
-            saveCache();
-            needsToSave = false;
-        }
-    }
-
-    synchronized void saveCache() {
-        try {
-            File cacheDir = getLocalCacheDir();
-            if (!cacheDir.exists()) {
-                if (!cacheDir.mkdirs()) {
-                    throw new IOException("Can't create cache directory '" + cacheDir.getAbsolutePath() + "'");
-                }
-            }
-            File cacheFile = new File(cacheDir, METADATA_CACHE_FILE);
-            OutputStream out = new FileOutputStream(cacheFile);
-            try {
-                XMLBuilder xml = new XMLBuilder(out, "utf-8");
-                xml.setButify(true);
-                try (XMLBuilder.Element e = xml.startElement(TAG_CACHE)) {
-                    xml.addAttribute(ATTR_ID, id);
-                    xml.addAttribute(ATTR_NAME, name);
-                    xml.addAttribute(ATTR_URL, url);
-
-                    for (MavenArtifact artifact : cachedArtifacts.values()) {
-                        try (XMLBuilder.Element e1 = xml.startElement(TAG_ARTIFACT)) {
-                            xml.addAttribute(ATTR_GROUP_ID, artifact.getGroupId());
-                            xml.addAttribute(ATTR_ARTIFACT_ID, artifact.getArtifactId());
-                        }
-                    }
-                }
-
-                xml.flush();
-            } finally {
-                IOUtils.close(out);
-            }
-        } catch (IOException e) {
-            log.warn("Error saving local Maven cache", e);
-        }
-    }
-*/
-
     @Override
     public String toString() {
         return url;