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 branch 'master' of git@git.labs.intellij.net:idea/community

Browse Source
This commit is contained in:
Kirill Kalishev
2010-03-05 14:04:01 +03:00
parent acdd761335 be0531ddac
commit a12e7ffd44
4 changed files with 52 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenConstants.java
-3
View File
@@ -27,9 +27,6 @@ public class MavenConstants {
public static final String TYPE_TEST_JAR = "test-jar";
public static final String TYPE_WAR = "war";
public static final String CLASSIFIER_JAVADOC = "javadoc";
public static final String CLASSIFIER_SOURCES = "sources";
public static final String SCOPE_COMPILE = "compile";
public static final String SCOPE_PROVIDEED = "provided";
public static final String SCOPE_RUNTIME = "runtime";
plugins/maven/src/main/resources/META-INF/plugin.xml
+2 -2
View File
@@ -166,12 +166,12 @@
</action>
<action id="Maven.DownloadArtifacts" class="org.jetbrains.idea.maven.project.actions.DownloadArtifactsAction"
text="Download Sources And Javadoc For All Projects" description="Download sources and javadoc for all dependencies"
text="Download Sources And Documentation For All Projects" description="Download sources and documentation for all dependencies"
icon="/images/download.png">
</action>
<action id="Maven.DownloadArtifactsForProject" class="org.jetbrains.idea.maven.project.actions.DownloadArtifactsForProjectAction"
text="Download Sources And Javadoc" description="Download sources and javadoc for all dependencies for selected projects"
text="Download Sources And Documentation" description="Download sources and documentation for all dependencies for selected projects"
icon="/images/download.png">
</action>
plugins/maven/src/main/resources/ProjectBundle.properties
+1 -1
View File
@@ -12,7 +12,7 @@ maven.updating.folders.finished=Finished Generating sources
maven.updating.folders.pom=Generating sources for {0}
maven.downloading.plugins=Downloading Maven plugins
maven.downloading.pom.plugins=Downloading plugins for {0}
maven.downloading=Downloading Maven sources and javadocs
maven.downloading=Downloading Maven sources and documentation
maven.downloading.finished=Finished downloading artifacts
maven.transfer.progress={0}/{1}K [{2}] {3}
maven.transfer.start=Checking [{0}] {1}
xml/impl/src/com/intellij/psi/impl/source/xml/XmlAttributeImpl.java
+49 -28
View File
@@ -88,16 +88,16 @@ public class XmlAttributeImpl extends XmlElementImpl implements XmlAttribute {
return (XmlAttributeValue)XmlChildRole.ATTRIBUTE_VALUE_FINDER.findChild(this);
}
public void setValue(String valueText) throws IncorrectOperationException{
public void setValue(String valueText) throws IncorrectOperationException {
final ASTNode value = XmlChildRole.ATTRIBUTE_VALUE_FINDER.findChild(this);
final PomModel model = PomManager.getModel(getProject());
final XmlAttribute attribute = XmlElementFactory.getInstance(getProject()).createXmlAttribute("a", valueText);
final ASTNode newValue = XmlChildRole.ATTRIBUTE_VALUE_FINDER.findChild((ASTNode)attribute);
final XmlAspect aspect = model.getModelAspect(XmlAspect.class);
model.runTransaction(new PomTransactionBase(this, aspect) {
public PomModelEvent runInner(){
public PomModelEvent runInner() {
final XmlAttributeImpl att = XmlAttributeImpl.this;
if(value != null){
if (value != null) {
if (newValue != null) {
att.replaceChild(value, newValue.copyElement());
}
@@ -124,7 +124,7 @@ public class XmlAttributeImpl extends XmlElementImpl implements XmlAttribute {
final String name = getName();
final String prefixByQualifiedName = XmlUtil.findPrefixByQualifiedName(name);
// The namespace name for an unprefixed attribute name always has no value. Namespace recommendation section 6.2, third paragraph
if(prefixByQualifiedName.length() == 0) return XmlUtil.EMPTY_URI;
if (prefixByQualifiedName.length() == 0) return XmlUtil.EMPTY_URI;
return getParent().getNamespaceByPrefix(prefixByQualifiedName);
}
@@ -134,7 +134,7 @@ public class XmlAttributeImpl extends XmlElementImpl implements XmlAttribute {
return XmlUtil.findPrefixByQualifiedName(getName());
}
public XmlTag getParent(){
public XmlTag getParent() {
final PsiElement parentTag = super.getParent();
return parentTag instanceof XmlTag ? (XmlTag)parentTag : null; // Invalid elements might belong to DummyHolder instead.
}
@@ -183,7 +183,8 @@ public class XmlAttributeImpl extends XmlElementImpl implements XmlAttribute {
final int start = buffer.length();
IElementType elementType = child.getElementType();
if (elementType == XmlTokenType.XML_ATTRIBUTE_VALUE_END_DELIMITER) {
valueTextRange = new TextRange(valueTextRange.getStartOffset(), child.getTextRange().getStartOffset() - value.getTextRange().getStartOffset());
valueTextRange =
new TextRange(valueTextRange.getStartOffset(), child.getTextRange().getStartOffset() - value.getTextRange().getStartOffset());
break;
}
if (elementType == XmlTokenType.XML_CHAR_ENTITY_REF) {
@@ -226,11 +227,17 @@ public class XmlAttributeImpl extends XmlElementImpl implements XmlAttribute {
final int bsResult = Arrays.binarySearch(myGapPhysicalStarts, physicalIndex);
final int gapIndex;
if(bsResult > 0) gapIndex = bsResult;
else if(bsResult < -1) gapIndex = -bsResult - 2;
else gapIndex = -1;
if (bsResult > 0) {
gapIndex = bsResult;
}
else if (bsResult < -1) {
gapIndex = -bsResult - 2;
}
else {
gapIndex = -1;
}
if(gapIndex < 0) return physicalIndex;
if (gapIndex < 0) return physicalIndex;
final int shift = myGapPhysicalStarts[gapIndex] - myGapDisplayStarts[gapIndex];
return Math.max(myGapDisplayStarts[gapIndex], physicalIndex - shift);
}
@@ -243,11 +250,17 @@ public class XmlAttributeImpl extends XmlElementImpl implements XmlAttribute {
final int bsResult = Arrays.binarySearch(myGapDisplayStarts, displayIndex);
final int gapIndex;
if(bsResult > 0) gapIndex = bsResult - 1;
else if(bsResult < -1) gapIndex = -bsResult - 2;
else gapIndex = -1;
if (bsResult > 0) {
gapIndex = bsResult - 1;
}
else if (bsResult < -1) {
gapIndex = -bsResult - 2;
}
else {
gapIndex = -1;
}
if(gapIndex < 0) return displayIndex;
if (gapIndex < 0) return displayIndex;
final int shift = myGapPhysicalStarts[gapIndex] - myGapDisplayStarts[gapIndex];
return displayIndex + shift;
}
@@ -284,7 +297,7 @@ public class XmlAttributeImpl extends XmlElementImpl implements XmlAttribute {
final ASTNode newName = XmlChildRole.ATTRIBUTE_NAME_FINDER.findChild((ASTNode)attribute);
final XmlAspect aspect = model.getModelAspect(XmlAspect.class);
model.runTransaction(new PomTransactionBase(getParent(), aspect) {
public PomModelEvent runInner(){
public PomModelEvent runInner() {
final PomModelEvent event = new PomModelEvent(model);
final XmlAspectChangeSetImpl xmlAspectChangeSet = new XmlAspectChangeSetImpl(model, (XmlFile)getContainingFile());
xmlAspectChangeSet.add(new XmlAttributeSetImpl(getParent(), oldName, null));
@@ -314,15 +327,18 @@ public class XmlAttributeImpl extends XmlElementImpl implements XmlAttribute {
refs = new PsiReference[referencesFromProviders.length + 1];
final String localName = getLocalName();
final String prefix = XmlUtil.findPrefixByQualifiedName(getName());
final TextRange range = prefix.length() == 0 ? TextRange.from(getName().length(), 0) : TextRange.from(prefix.length() + 1, localName.length());
refs[0] = new SchemaPrefixReference(this, range,localName);
} else {
final TextRange range =
prefix.length() == 0 ? TextRange.from(getName().length(), 0) : TextRange.from(prefix.length() + 1, localName.length());
refs[0] = new SchemaPrefixReference(this, range, localName);
}
else {
final String prefix = getNamespacePrefix();
if (prefix.length() > 0 && getLocalName().length() > 0) {
refs = new PsiReference[referencesFromProviders.length + 2];
refs[0] = new SchemaPrefixReference(this, TextRange.from(0, prefix.length()), prefix);
refs[1] = new MyPsiReference();
} else {
}
else {
refs = new PsiReference[referencesFromProviders.length + 1];
refs[0] = new MyPsiReference();
}
@@ -348,7 +364,7 @@ public class XmlAttributeImpl extends XmlElementImpl implements XmlAttribute {
protected XmlAttributeDescriptor compute() {
final PsiElement parentElement = getParent();
final XmlElementDescriptor descr = ((XmlTag)parentElement).getDescriptor();
if (descr != null){
if (descr != null) {
return descr.getAttributeDescriptor(XmlAttributeImpl.this);
}
return null;
@@ -362,7 +378,7 @@ public class XmlAttributeImpl extends XmlElementImpl implements XmlAttribute {
public TextRange getRangeInElement() {
final int parentOffset = getNameElement().getStartOffsetInParent();
int nsLen = getNamespacePrefix().length();
nsLen+= nsLen > 0 && getRealLocalName().length() > 0 ? 1 : -nsLen;
nsLen += nsLen > 0 && getRealLocalName().length() > 0 ? 1 : -nsLen;
return new TextRange(parentOffset + nsLen, parentOffset + getNameElement().getTextLength());
}
@@ -389,10 +405,11 @@ public class XmlAttributeImpl extends XmlElementImpl implements XmlAttribute {
}
// TODO[ik]: namespace support
public PsiElement bindToElement(@NotNull PsiElement element) throws IncorrectOperationException {
if (element instanceof PsiMetaOwner){
if (element instanceof PsiMetaOwner) {
final PsiMetaOwner owner = (PsiMetaOwner)element;
if (owner.getMetaData() instanceof XmlElementDescriptor){
if (owner.getMetaData() instanceof XmlElementDescriptor) {
setName(owner.getMetaData().getName());
}
}
@@ -409,7 +426,7 @@ public class XmlAttributeImpl extends XmlElementImpl implements XmlAttribute {
final XmlTag declarationTag = getParent();
LOG.assertTrue(declarationTag.isValid());
final XmlElementDescriptor parentDescriptor = declarationTag.getDescriptor();
if (parentDescriptor != null){
if (parentDescriptor != null) {
final XmlAttribute[] attributes = declarationTag.getAttributes();
XmlAttributeDescriptor[] descriptors = parentDescriptor.getAttributesDescriptors(declarationTag);
@@ -420,7 +437,9 @@ public class XmlAttributeImpl extends XmlElementImpl implements XmlAttribute {
return variants.toArray();
}
private void addVariants(final Collection<MutableLookupElement<String>> variants, final XmlAttribute[] attributes, final XmlAttributeDescriptor[] descriptors) {
private void addVariants(final Collection<MutableLookupElement<String>> variants,
final XmlAttribute[] attributes,
final XmlAttributeDescriptor[] descriptors) {
final XmlTag tag = getParent();
final XmlExtension extension = XmlExtension.getExtension(tag.getContainingFile());
final String prefix = getName().contains(":") && getRealLocalName().length() > 0 ? getNamespacePrefix() + ":" : null;
@@ -436,6 +455,10 @@ public class XmlAttributeImpl extends XmlElementImpl implements XmlAttribute {
if (descriptor instanceof PsiPresentableMetaData) {
element.setIcon(((PsiPresentableMetaData)descriptor).getIcon());
}
final int separator = name.indexOf(':');
if (separator > 0) {
element.addLookupStrings(name.substring(separator + 1));
}
element.setInsertHandler(XmlAttributeInsertHandler.INSTANCE);
variants.add(element);
}
@@ -469,8 +492,6 @@ public class XmlAttributeImpl extends XmlElementImpl implements XmlAttribute {
private String getRealLocalName() {
final String name = getLocalName();
return name.endsWith(DUMMY_IDENTIFIER_TRIMMED)
? name.substring(0, name.length() - DUMMY_IDENTIFIER_TRIMMED.length())
: name;
return name.endsWith(DUMMY_IDENTIFIER_TRIMMED) ? name.substring(0, name.length() - DUMMY_IDENTIFIER_TRIMMED.length()) : name;
}
}