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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Vassiliy Kudryashov
2013-02-28 13:57:06 +04:00
parent de6f16f4fb 7536898a11
commit 3d912884cd
12 changed files with 146 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/scripts/libLicenses.gant
+1
View File
@@ -254,6 +254,7 @@ libraryLicense(name: "proxy-vole", libraryName: "proxy-vole", version: "20120920
libraryLicense(name: "Rhino JavaScript Engine", libraryName: "rhino-js-1_7R4", version: "1.7R4", license: "MPL 1.1", url: "http://www.mozilla.org/rhino/", licenseUrl: "http://www.mozilla.org/MPL/MPL-1.1.html")
libraryLicense(name: "asm-4.0-all", libraryName: "asm-4.0-all", version: "4.0", attachedTo: "ByteCodeViewer", license: "BSD", url: "http://asm.objectweb.org/", licenseUrl: "http://asm.objectweb.org/license.html")
libraryLicense(name: "jsr305", libraryName: "jsr305", version: "snapshot", license: "BSD", url: "http://code.google.com/p/jsr-305/", licenseUrl: "http://code.google.com/p/jsr-305/source/browse/trunk/ri/LICENSE")
libraryLicense(name: "jzlib", libraryName: "jzlib", version: "1.1.1", license: "BSD", url: "http://www.jcraft.com/jzlib/", licenseUrl: "http://www.jcraft.com/jzlib/LICENSE.txt")
jetbrainsLibrary("JPS")
jetbrainsLibrary("Maven Embedder")
jetbrainsLibrary("tcServiceMessages")
lib/jzlib-1.1.1.jar
BIN
View File
Binary file not shown.
lib/src/jzlib-1.1.1.zip
BIN
View File
Binary file not shown.
platform/lang-api/src/com/intellij/execution/filters/CompositeInputFilter.java
+2 -2
View File
@@ -39,13 +39,13 @@ public class CompositeInputFilter implements InputFilter {
@Override
@Nullable
public Pair<String, ConsoleViewContentType> applyFilter(final String text, final ConsoleViewContentType contentType) {
public List<Pair<String, ConsoleViewContentType>> applyFilter(final String text, final ConsoleViewContentType contentType) {
boolean dumb = myDumbService.isDumb();
for (Pair<InputFilter, Boolean> pair : myFilters) {
if (!dumb || pair.second == Boolean.TRUE) {
long t0 = System.currentTimeMillis();
InputFilter filter = pair.first;
Pair<String, ConsoleViewContentType> result = filter.applyFilter(text, contentType);
List<Pair<String, ConsoleViewContentType>> result = filter.applyFilter(text, contentType);
t0 = System.currentTimeMillis() - t0;
if (t0 > 100) {
LOG.warn(filter.getClass().getSimpleName() + ".applyFilter() took " + t0 + " ms on '''" + text + "'''");
platform/lang-api/src/com/intellij/execution/filters/InputFilter.java
+4 -2
View File
@@ -19,14 +19,16 @@ import com.intellij.execution.ui.ConsoleViewContentType;
import com.intellij.openapi.util.Pair;
import org.jetbrains.annotations.Nullable;
import java.util.List;
public interface InputFilter {
/**
* @param text the text to be filtered.
* @param contentType the content type of filtered text
* @return <tt>null</tt>, if there was no match, otherwise, a pair of ('string to use', 'content type to use')
* @return <tt>null</tt>, if there was no match, otherwise, a list of pairs like ('string to use', 'content type to use')
*/
@Nullable
Pair<String, ConsoleViewContentType> applyFilter(String text, ConsoleViewContentType contentType);
List<Pair<String, ConsoleViewContentType>> applyFilter(String text, ConsoleViewContentType contentType);
}
platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
+6 -4
View File
@@ -531,18 +531,20 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo
return;
}
Pair<String, ConsoleViewContentType> result = myInputMessageFilter.applyFilter(s, contentType);
List<Pair<String, ConsoleViewContentType>> result = myInputMessageFilter.applyFilter(s, contentType);
if (result == null) {
printHyperlink(s, contentType, null);
}
else {
if (result.first != null) {
printHyperlink(result.first, result.second == null ? contentType : result.second, null);
for (Pair<String, ConsoleViewContentType> pair : result) {
if (pair.first != null) {
printHyperlink(pair.first, pair.second == null ? contentType : pair.second, null);
}
}
}
}
private void printHyperlink(String s, ConsoleViewContentType contentType, HyperlinkInfo info) {
private void printHyperlink(String s, ConsoleViewContentType contentType, @Nullable HyperlinkInfo info) {
synchronized (LOCK) {
Pair<String, Integer> pair = myBuffer.print(s, contentType, info);
s = pair.first;
platform/platform-api/src/com/intellij/execution/configurations/PathEnvironmentVariableUtil.java
+16 -5
View File
@@ -5,6 +5,8 @@ import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.EnvironmentUtil;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.text.CaseInsensitiveStringHashingStrategy;
import gnu.trove.THashMap;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -20,10 +22,20 @@ public class PathEnvironmentVariableUtil {
public static final String PATH_ENV_VAR_NAME = "PATH";
private static final String ourFixedMacPathEnvVarValue;
private static final Map<String, String> ENVIRONMENT_VARIABLES;
private static final String FIXED_MAC_PATH_VALUE;
static {
ourFixedMacPathEnvVarValue = calcFixedMacPathEnvVarValue();
Map<String, String> envVars = EnvironmentUtil.getEnvironmentProperties();
if (SystemInfo.isWindows) {
THashMap<String, String> map = new THashMap<String, String>(CaseInsensitiveStringHashingStrategy.INSTANCE);
map.putAll(envVars);
ENVIRONMENT_VARIABLES = map;
}
else {
ENVIRONMENT_VARIABLES = envVars;
}
FIXED_MAC_PATH_VALUE = calcFixedMacPathEnvVarValue();
}
private PathEnvironmentVariableUtil() {
@@ -35,7 +47,7 @@ public class PathEnvironmentVariableUtil {
*/
@Nullable
public static String getFixedPathEnvVarValueOnMac() {
return ourFixedMacPathEnvVarValue;
return FIXED_MAC_PATH_VALUE;
}
private static String calcFixedMacPathEnvVarValue() {
@@ -67,8 +79,7 @@ public class PathEnvironmentVariableUtil {
@Nullable
private static String getOriginalPathEnvVarValue() {
Map<String, String> originalEnvVars = EnvironmentUtil.getEnvironmentProperties();
return originalEnvVars.get(PATH_ENV_VAR_NAME);
return ENVIRONMENT_VARIABLES.get(PATH_ENV_VAR_NAME);
}
@NotNull
plugins/gradle/src/org/jetbrains/plugins/gradle/manage/GradleDependencyManager.java
+35 -2
View File
@@ -6,6 +6,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.*;
import com.intellij.openapi.roots.libraries.Library;
import com.intellij.openapi.roots.libraries.LibraryTable;
import com.intellij.util.Consumer;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.gradle.config.PlatformFacade;
import org.jetbrains.plugins.gradle.model.gradle.*;
@@ -181,23 +182,55 @@ public class GradleDependencyManager {
}
}
@SuppressWarnings("MethodMayBeStatic")
public void setScope(@NotNull final DependencyScope scope, @NotNull final ExportableOrderEntry dependency, boolean synchronous) {
Project project = dependency.getOwnerModule().getProject();
GradleUtil.executeProjectChangeAction(project, dependency, synchronous, new Runnable() {
@Override
public void run() {
dependency.setScope(scope);
doForDependency(dependency, new Consumer<ExportableOrderEntry>() {
@Override
public void consume(ExportableOrderEntry entry) {
entry.setScope(scope);
}
});
}
});
}
@SuppressWarnings("MethodMayBeStatic")
public void setExported(final boolean exported, @NotNull final ExportableOrderEntry dependency, boolean synchronous) {
Project project = dependency.getOwnerModule().getProject();
GradleUtil.executeProjectChangeAction(project, dependency, synchronous, new Runnable() {
@Override
public void run() {
dependency.setExported(exported);
doForDependency(dependency, new Consumer<ExportableOrderEntry>() {
@Override
public void consume(ExportableOrderEntry entry) {
entry.setExported(exported);
}
});
}
});
}
private static void doForDependency(@NotNull ExportableOrderEntry entry, @NotNull Consumer<ExportableOrderEntry> consumer) {
// We need to get an up-to-date modifiable model to work with.
ModuleRootManager moduleRootManager = ModuleRootManager.getInstance(entry.getOwnerModule());
final ModifiableRootModel moduleRootModel = moduleRootManager.getModifiableModel();
try {
// The thing is that intellij created order entry objects every time new modifiable model is created,
// that's why we can't use target dependency object as is but need to get a reference to the current
// entry object from the model instead.
for (OrderEntry e : moduleRootModel.getOrderEntries()) {
if (e instanceof ExportableOrderEntry && e.getPresentableName().equals(entry.getPresentableName())) {
consumer.consume((ExportableOrderEntry)e);
break;
}
}
}
finally {
moduleRootModel.commit();
}
}
}
plugins/hg4idea/testSrc/hg4idea/test/HgExecutor.java
+2 -18
View File
@@ -29,29 +29,13 @@ public class HgExecutor extends Executor {
private static final String HG_EXECUTABLE_ENV = "IDEA_TEST_HG_EXECUTABLE";
//private static final String TEAMCITY_HG_EXECUTABLE_ENV = "TEAMCITY_HG_PATH"; //todo var for server testing
private static boolean myVersionPrinted;
private static final String HG_EXECUTABLE = findHgExecutable();
private static String findHgExecutable() {
return findExecutable("hg", "hg", "hg.exe", Arrays.asList(HG_EXECUTABLE_ENV));
}
private static final String HG_EXECUTABLE = findExecutable("hg", "hg", "hg.exe", Arrays.asList(HG_EXECUTABLE_ENV));
public static String hg(String command) {
printVersionTheFirstTime();
List<String> split = StringUtil.split(command, " ");
split.add(0, HG_EXECUTABLE);
log("hg " + command);
for(int attempt = 0; attempt < 3; attempt++) {
return run(split);
}
throw new RuntimeException("fatal error during execution of Hg command: " + command);
return run(split);
}
private static void printVersionTheFirstTime() {
if (!myVersionPrinted) {
myVersionPrinted = true;
hg("version");
}
}
}
plugins/hg4idea/testSrc/hg4idea/test/HgPlatformTest.java
+3 -5
View File
@@ -55,6 +55,9 @@ public abstract class HgPlatformTest extends LightPlatformTestCase {
@Override
protected void setUp() throws Exception {
cd(FileUtil.getTempDirectory());
hg("version");
super.setUp();
myProject = getProject();
@@ -65,11 +68,6 @@ public abstract class HgPlatformTest extends LightPlatformTestCase {
setUpHgrc(myRepository);
}
@Override
protected void tearDown() throws Exception {
super.tearDown();
}
private static void setUpHgrc(VirtualFile repository) {
cd(".hg");
File pluginRoot = new File(PluginPathManager.getPluginHomePath("hg4idea"));
plugins/tasks/tasks-core/src/com/intellij/tasks/context/WorkingContextManager.java
+66 -13
View File
@@ -16,6 +16,9 @@
package com.intellij.tasks.context;
import com.intellij.notification.Notification;
import com.intellij.notification.NotificationType;
import com.intellij.notification.Notifications;
import com.intellij.openapi.application.PathManager;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.diagnostic.Logger;
@@ -36,6 +39,7 @@ import org.jdom.output.XMLOutputter;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import java.io.File;
import java.io.IOException;
@@ -112,7 +116,7 @@ public class WorkingContextManager {
saveContext(entryName, CONTEXT_ZIP_POSTFIX, comment);
}
private void saveContext(@Nullable String entryName, String zipPostfix, @Nullable String comment) {
private synchronized void saveContext(@Nullable String entryName, String zipPostfix, @Nullable String comment) {
try {
JBZipFile archive = getTasksArchive(zipPostfix);
if (entryName == null) {
@@ -128,7 +132,7 @@ public class WorkingContextManager {
Element element = new Element("context");
saveContext(element);
String s = new XMLOutputter().outputString(element);
entry.setData(s.getBytes());
entry.setData(s.getBytes("UTF-8"));
archive.close();
}
catch (IOException e) {
@@ -137,6 +141,27 @@ public class WorkingContextManager {
}
private JBZipFile getTasksArchive(String postfix) throws IOException {
File file = getArchiveFile(postfix);
try {
return new JBZipFile(file);
}
catch (IOException e) {
file.delete();
JBZipFile zipFile = null;
try {
zipFile = new JBZipFile(file);
Notifications.Bus.notify(new Notification("Tasks", "Context Data Corrupted",
"Context information history for " + myProject.getName() + " was corrupted.\n" +
"The history was replaced with empty one.", NotificationType.ERROR), myProject);
}
catch (IOException e1) {
LOG.error("Can't repair form context data corruption", e1);
}
return zipFile;
}
}
private File getArchiveFile(String postfix) {
String configPath = PathManager.getConfigPath(true);
File tasksFolder = new File(configPath, TASKS_FOLDER);
if (!tasksFolder.exists()) {
@@ -144,39 +169,54 @@ public class WorkingContextManager {
tasksFolder.mkdir();
}
String projectName = myProject.getName();
return new JBZipFile(new File(tasksFolder, projectName + postfix));
return new File(tasksFolder, projectName + postfix);
}
public void restoreContext(@NotNull Task task) {
loadContext(TASKS_ZIP_POSTFIX, task.getId() + TASK_XML_POSTFIX);
}
private boolean loadContext(String zipPostfix, String entryName) {
private synchronized boolean loadContext(String zipPostfix, String entryName) {
JBZipFile archive = null;
try {
JBZipFile archive = getTasksArchive(zipPostfix);
archive = getTasksArchive(zipPostfix);
JBZipEntry entry = archive.getEntry(StringUtil.startsWithChar(entryName, '/') ? entryName : "/" + entryName);
if (entry != null) {
byte[] bytes = entry.getData();
Document document = JDOMUtil.loadDocument(new String(bytes));
Element rootElement = document.getRootElement();
loadContext(rootElement);
archive.close();
return true;
}
}
catch (Exception e) {
LOG.error(e);
}
finally {
closeArchive(archive);
}
return false;
}
private static void closeArchive(JBZipFile archive) {
if (archive != null) {
try {
archive.close();
}
catch (IOException e) {
LOG.error(e);
}
}
}
public List<ContextInfo> getContextHistory() {
return getContextHistory(CONTEXT_ZIP_POSTFIX);
}
private List<ContextInfo> getContextHistory(String zipPostfix) {
private synchronized List<ContextInfo> getContextHistory(String zipPostfix) {
JBZipFile archive = null;
try {
JBZipFile archive = getTasksArchive(zipPostfix);
archive = getTasksArchive(zipPostfix);
List<JBZipEntry> entries = archive.getEntries();
return ContainerUtil.mapNotNull(entries, new NullableFunction<JBZipEntry, ContextInfo>() {
public ContextInfo fun(JBZipEntry entry) {
@@ -188,6 +228,9 @@ public class WorkingContextManager {
LOG.error(e);
return Collections.emptyList();
}
finally {
closeArchive(archive);
}
}
public boolean loadContext(String name) {
@@ -203,17 +246,20 @@ public class WorkingContextManager {
}
private void removeContext(String name, String postfix) {
JBZipFile archive = null;
try {
JBZipFile archive = getTasksArchive(postfix);
archive = getTasksArchive(postfix);
JBZipEntry entry = archive.getEntry(name);
if (entry != null) {
archive.eraseEntry(entry);
}
archive.close();
}
catch (IOException e) {
LOG.error(e);
}
finally {
closeArchive(archive);
}
}
public void pack(int max, int delta) {
@@ -221,9 +267,10 @@ public class WorkingContextManager {
pack(max, delta, TASKS_ZIP_POSTFIX);
}
private void pack(int max, int delta, String zipPostfix) {
private synchronized void pack(int max, int delta, String zipPostfix) {
JBZipFile archive = null;
try {
JBZipFile archive = getTasksArchive(zipPostfix);
archive = getTasksArchive(zipPostfix);
List<JBZipEntry> entries = archive.getEntries();
if (entries.size() > max + delta) {
JBZipEntry[] array = entries.toArray(new JBZipEntry[entries.size()]);
@@ -232,11 +279,17 @@ public class WorkingContextManager {
archive.eraseEntry(array[i]);
}
}
archive.close();
}
catch (IOException e) {
LOG.error(e);
}
finally {
closeArchive(archive);
}
}
@TestOnly
public File getContextFile() throws IOException {
return getArchiveFile(CONTEXT_ZIP_POSTFIX);
}
}
plugins/tasks/tasks-tests/test/com/intellij/tasks/context/ContextTest.java
+11
View File
@@ -16,8 +16,10 @@
package com.intellij.tasks.context;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.tasks.TaskManagerTestCase;
import java.io.File;
import java.util.List;
/**
@@ -55,6 +57,15 @@ public class ContextTest extends TaskManagerTestCase {
assertEquals("/context2", history.get(0).name);
}
public void testContextFileRepair() throws Exception {
WorkingContextManager manager = getContextManager();
manager.saveContext("foo", "bar");
File file = manager.getContextFile();
assertTrue(file.length() > 0);
FileUtil.writeToFile(file, "123"); // corrupt it
manager.saveContext("foo", "bar");
}
private WorkingContextManager getContextManager() {
return WorkingContextManager.getInstance(getProject());
}