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:
Kirill Likhodedov
2011-11-15 17:26:38 +03:00
parent 8024082e8e 98f53f7636
commit c849a847ea
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/sanselan-0.98-snapshot.jar
BIN
View File
Binary file not shown.
lib/src/sanselan-0.98-snapshot-src.jar
BIN
View File
Binary file not shown.
xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/CreateNSDeclarationIntentionFix.java
+6 -4
View File
@@ -90,7 +90,7 @@ public class CreateNSDeclarationIntentionFix implements HintAction, LocalQuickFi
public CreateNSDeclarationIntentionFix(final PsiElement element,
final String namespacePrefix,
final XmlToken token,
@Nullable final XmlToken token,
XmlFile containingFile) {
myNamespacePrefix = namespacePrefix;
myElement = element;
@@ -151,10 +151,12 @@ public class CreateNSDeclarationIntentionFix implements HintAction, LocalQuickFi
return;
} else {
prefix = ExtendedTagInsertHandler.suggestPrefix(xmlFile, namespace);
if (StringUtil.isNotEmpty(prefix)) {
ExtendedTagInsertHandler.qualifyWithPrefix(prefix, myElement);
PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(editor.getDocument());
if (StringUtil.isEmpty(prefix)) {
HintManager.getInstance().showInformationHint(editor, "Namespace not found");
return;
}
ExtendedTagInsertHandler.qualifyWithPrefix(prefix, myElement);
PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(editor.getDocument());
}
}
final int offset = editor.getCaretModel().getOffset();
xml/impl/src/com/intellij/psi/XmlElementFactoryImpl.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class XmlElementFactoryImpl extends XmlElementFactory {
}
@NotNull
public XmlAttribute createXmlAttribute(@NotNull String name, String value) throws IncorrectOperationException {
public XmlAttribute createXmlAttribute(@NotNull String name, @NotNull String value) throws IncorrectOperationException {
final char quoteChar;
if (!value.contains("\"")) {
quoteChar = '"';
xml/openapi/src/com/intellij/psi/XmlElementFactory.java
+1 -1
View File
@@ -86,5 +86,5 @@ public abstract class XmlElementFactory {
* @throws IncorrectOperationException if either <code>name</code> or <code>value</code> are not valid.
*/
@NotNull
public abstract XmlAttribute createXmlAttribute(@NotNull @NonNls String name, String value) throws IncorrectOperationException;
public abstract XmlAttribute createXmlAttribute(@NotNull @NonNls String name, @NotNull String value) throws IncorrectOperationException;
}