MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

use getResourceAsBytes API

Browse Source 
GitOrigin-RevId: 0603d6b86a3cb2fce087837a001aab0f0fc6dc37
This commit is contained in:
Vladimir Krivosheev
2021-12-09 13:31:39 +00:00
committed by intellij-monorepo-bot
parent 8897af34d8
commit 0f156b27f4
2 changed files with 39 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/featureStatistics/ProductivityFeaturesProvider.java
+3 -18
View File
@@ -1,18 +1,4 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.featureStatistics;
import com.intellij.openapi.extensions.ExtensionPointName;
@@ -22,7 +8,7 @@ import java.util.Collection;
import java.util.Collections;
public abstract class ProductivityFeaturesProvider {
public static final ExtensionPointName<ProductivityFeaturesProvider> EP_NAME = ExtensionPointName.create("com.intellij.productivityFeaturesProvider");
public static final ExtensionPointName<ProductivityFeaturesProvider> EP_NAME = new ExtensionPointName<>("com.intellij.productivityFeaturesProvider");
public abstract FeatureDescriptor[] getFeatureDescriptors();
@@ -33,8 +19,7 @@ public abstract class ProductivityFeaturesProvider {
/**
* @return list of xml file urls with features configurations
*/
@NotNull
public Collection<String> getXmlFilesUrls() {
public @NotNull Collection<String> getXmlFilesUrls() {
return Collections.emptyList();
}
}
platform/platform-impl/src/com/intellij/featureStatistics/ProductivityFeaturesRegistryImpl.java
+36 -31
View File
@@ -1,11 +1,14 @@
// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.featureStatistics;
import com.intellij.diagnostic.PluginException;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.JDOMUtil;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.text.Strings;
import com.intellij.util.Function;
import com.intellij.util.ResourceUtil;
import org.jdom.Element;
import org.jdom.JDOMException;
import org.jetbrains.annotations.NonNls;
@@ -13,19 +16,19 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.*;
public final class ProductivityFeaturesRegistryImpl extends ProductivityFeaturesRegistry {
private static final Logger LOG = Logger.getInstance(ProductivityFeaturesRegistry.class);
private static final Logger LOG = Logger.getInstance(ProductivityFeaturesRegistryImpl.class);
private final Map<String, FeatureDescriptor> myFeatures = new HashMap<>();
private final List<FeatureUsageEvent.Action> myActionEvents = new ArrayList<>();
private final List<FeatureUsageEvent.Intention> myIntentionEvents = new ArrayList<>();
private final Map<String, GroupDescriptor> myGroups = new HashMap<>();
private final List<Pair<String, ApplicabilityFilter>> myApplicabilityFilters = new ArrayList<>();
private boolean myAdditionalFeaturesLoaded = false;
private boolean myAdditionalFeaturesLoaded;
@NonNls public static final String WELCOME = "features.welcome";
@@ -41,38 +44,43 @@ public final class ProductivityFeaturesRegistryImpl extends ProductivityFeatures
}
private void reloadFromXml() {
String path = "ProductivityFeaturesRegistry.xml";
boolean found;
try {
readFromXml("/ProductivityFeaturesRegistry.xml");
}
catch (FileNotFoundException e) {
if (!ApplicationManager.getApplication().isUnitTestMode()) {
LOG.error(e);
}
found = readFromXml(path);
}
catch (Throwable e) {
LOG.error(e);
found = false;
}
if (!found && !ApplicationManager.getApplication().isUnitTestMode()) {
LOG.error(path + " not found");
}
try {
readFromXml("/IdeSpecificFeatures.xml");
}
catch (FileNotFoundException ignore) {
readFromXml("IdeSpecificFeatures.xml");
}
catch (Throwable e) {
LOG.error(e);
}
}
private void readFromXml(@NotNull @NonNls String path) throws JDOMException, IOException {
readFromXml(path, ProductivityFeaturesRegistryImpl.class);
private boolean readFromXml(@NotNull @NonNls String path) throws JDOMException, IOException {
return readFromXml(path, ProductivityFeaturesRegistryImpl.class.getClassLoader());
}
private void readFromXml(@NotNull String path, @NotNull Class<?> clazz) throws JDOMException, IOException {
Element root = JDOMUtil.load(clazz, path);
private boolean readFromXml(@NotNull String path, @NotNull ClassLoader classLoader) throws JDOMException, IOException {
byte[] data = ResourceUtil.getResourceAsBytes(path, classLoader, true);
if (data == null) {
return false;
}
Element root = JDOMUtil.load(data);
for (Element groupElement : root.getChildren(TAG_GROUP)) {
readGroup(groupElement);
}
readFilters(root);
readFilters(root, classLoader);
return true;
}
private void lazyLoadFromPluginsFeaturesProviders() {
@@ -81,17 +89,14 @@ public final class ProductivityFeaturesRegistryImpl extends ProductivityFeatures
}
myAdditionalFeaturesLoaded = true;
loadFeaturesFromProviders(ProductivityFeaturesProvider.EP_NAME.getExtensionList());
}
private void loadFeaturesFromProviders(@NotNull List<? extends ProductivityFeaturesProvider> providers) {
for (ProductivityFeaturesProvider provider : providers) {
ProductivityFeaturesProvider.EP_NAME.processWithPluginDescriptor((provider, pluginDescriptor) -> {
for (String xmlUrl : provider.getXmlFilesUrls()) {
try {
readFromXml(xmlUrl, provider.getClass());
readFromXml(Strings.trimStart(xmlUrl, "/"), pluginDescriptor.getClassLoader());
}
catch (Exception e) {
LOG.error("Error while reading " + xmlUrl + " from " + provider + ": " + e.getMessage());
LOG.error(new PluginException("Error while reading " + xmlUrl + " from " + provider + ": " + e.getMessage(),
pluginDescriptor.getPluginId()));
}
}
@@ -118,21 +123,21 @@ public final class ProductivityFeaturesRegistryImpl extends ProductivityFeatures
myApplicabilityFilters.add(Pair.create(applicabilityFilter.getPrefix(), applicabilityFilter));
}
}
}
});
}
private void readFilters(Element element) {
private void readFilters(Element element, @NotNull ClassLoader classLoader) {
for (Element filterElement : element.getChildren(TAG_FILTER)) {
String className = filterElement.getAttributeValue(CLASS_ATTR);
try {
Class klass = Class.forName(className);
if (!ApplicabilityFilter.class.isAssignableFrom(klass)) {
Class<?> aClass = classLoader.loadClass(className);
if (!ApplicabilityFilter.class.isAssignableFrom(aClass)) {
LOG.error("filter class must implement com.intellij.featureStatistics.ApplicabilityFilter");
continue;
}
ApplicabilityFilter filter = (ApplicabilityFilter)klass.newInstance();
myApplicabilityFilters.add(Pair.create(filterElement.getAttributeValue(PREFIX_ATTR), filter));
ApplicabilityFilter filter = (ApplicabilityFilter)aClass.getDeclaredConstructor().newInstance();
myApplicabilityFilters.add(new Pair<>(filterElement.getAttributeValue(PREFIX_ATTR), filter));
}
catch (Exception e) {
LOG.error("Cannot instantiate filter " + className, e);