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 branch 'origin/master'

Browse Source
This commit is contained in:
Ekaterina.Tuzova
2012-02-06 16:11:51 +04:00
parent 551f5cb797 a95ecad613
commit 15381ffa3c
8 changed files with 47 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/libraries/Mac.xml
Generated
+11 -11
View File
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="Mac">
<CLASSES>
<root url="jar://$PROJECT_DIR$/build/conf/mac/lib/quaqua.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/eawtstub.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/src/eawtstub_src.zip!/eawtstub_src/src" />
</SOURCES>
</library>
<component name="libraryTable">
<library name="Mac">
<CLASSES>
<root url="jar://$PROJECT_DIR$/build/conf/mac/lib/quaqua.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/eawtstub.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/src/eawtstub_src.zip!/src" />
</SOURCES>
</library>
</component>
.idea/libraries/Mocks.xml
Generated
+1 -1
View File
@@ -6,7 +6,7 @@
<root url="jar://$PROJECT_DIR$/lib/dev/jmock-cglib-1.0.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/dev/easymockclassextension.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/dev/objenesis-1.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/dev/mockobjects-core-0.09.jar!/ " />
<root url="jar://$PROJECT_DIR$/lib/dev/mockobjects-core-0.09.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/dev/hamcrest-core-1.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/dev/hamcrest-library-1.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/dev/jmock-2.5.1.jar!/" />
.idea/libraries/tcServiceMessages.xml
Generated
+10 -10
View File
@@ -1,11 +1,11 @@
<component name="libraryTable">
<library name="tcServiceMessages">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/serviceMessages.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/src/serviceMessages_279xxx_src.zip!/" />
</SOURCES>
</library>
<component name="libraryTable">
<library name="tcServiceMessages">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/serviceMessages.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/src/serviceMessages_279xxx_src.jar!/" />
</SOURCES>
</library>
</component>
plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcFramework.java
+4
View File
@@ -102,6 +102,10 @@ public abstract class MvcFramework {
return module.getName().endsWith(getCommonPluginSuffix());
}
public List<Module> reorderModulesForMvcView(List<Module> modules) {
return modules;
}
public abstract String getApplicationDirectoryName();
public void syncSdkAndLibrariesInPluginsModule(@NotNull Module module) {
plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/projectView/MvcProjectNode.java
+4 -1
View File
@@ -43,7 +43,10 @@ public class MvcProjectNode extends AbstractProjectNode {
@NotNull
public Collection<? extends AbstractTreeNode> getChildren() {
final List<Module> modules = MvcModuleStructureUtil.getAllModulesWithSupport(myProject, myDescriptor.getFramework());
List<Module> modules = MvcModuleStructureUtil.getAllModulesWithSupport(myProject, myDescriptor.getFramework());
modules = myDescriptor.getFramework().reorderModulesForMvcView(modules);
final ArrayList<AbstractTreeNode> nodes = new ArrayList<AbstractTreeNode>();
for (Module module : modules) {
nodes.add(new MvcModuleNode(module, getSettings(), myDescriptor));
plugins/svn4ideaOld/svn4idea-testsOld.iml
+2
View File
@@ -34,6 +34,8 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module" module-name="platform-resources" scope="TEST" />
<orderEntry type="module" module-name="dom-impl" scope="TEST" />
</component>
</module>
xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitor.java
+14 -12
View File
@@ -136,21 +136,23 @@ public class XmlHighlightVisitor extends XmlElementVisitor implements HighlightV
}
} else if (tokenType == XmlTokenType.XML_DATA_CHARACTERS && token.getParent() instanceof XmlText) {
if (token.textContains(']') && token.textContains('>')) {
String s = token.getText();
String marker = "]]>";
int i = s.indexOf(marker);
if (i != -1) { // TODO: fix
TextRange textRange = token.getTextRange();
int start = textRange.getStartOffset() + i;
HighlightInfoType type = PsiTreeUtil.getParentOfType(token, XmlTag.class) instanceof HtmlTag ?
HighlightInfoType.WARNING : HighlightInfoType.ERROR;
HighlightInfo info = HighlightInfo.createHighlightInfo(
type,
start, start + marker.length(),
XmlErrorMessages.message("cdata.end.should.not.appear.in.content.unless.to.mark.end.of.cdata.section")
);
addToResults(info);
if (i != -1 ) { // TODO: fix
XmlTag tag = PsiTreeUtil.getParentOfType(token, XmlTag.class);
if (tag != null && XmlExtension.getExtensionByElement(tag).shouldBeHighlightedAsTag(tag) && !skipValidation(tag)) {
TextRange textRange = token.getTextRange();
int start = textRange.getStartOffset() + i;
HighlightInfo info = HighlightInfo.createHighlightInfo(
tag instanceof HtmlTag ? HighlightInfoType.WARNING : HighlightInfoType.ERROR,
start, start + marker.length(),
XmlErrorMessages.message("cdata.end.should.not.appear.in.content.unless.to.mark.end.of.cdata.section")
);
addToResults(info);
}
}
}
}
xml/impl/src/com/intellij/xml/XmlExtension.java
+1 -1
View File
@@ -59,7 +59,7 @@ public abstract class XmlExtension {
return DEFAULT_EXTENSION;
}
@Nullable
@SuppressWarnings("ConstantConditions")
public static XmlExtension getExtensionByElement(PsiElement element) {
final PsiFile psiFile = element.getContainingFile();
if (psiFile != null) {