Merge remote-tracking branch 'origin/master'

This commit is contained in:
Alexander Lobas
2012-04-23 14:36:34 +04:00
2 changed files with 3 additions and 3 deletions
@@ -81,12 +81,12 @@ public class SmartRefElementPointerImpl implements SmartRefElementPointer {
Element element = new Element(ENTRY_POINT);
element.setAttribute(TYPE_ATTR, myType);
element.setAttribute(FQNAME_ATTR, getFQName());
if (myRefElement != null) {
/*if (myRefElement != null) {
final RefEntity entity = myRefElement.getOwner();
if (entity != null) {
new SmartRefElementPointerImpl(entity, myIsPersistent).writeExternal(element);
}
}
}*/
parentNode.addContent(element);
}
@@ -216,6 +216,6 @@ ide.use.nautilus3.description=Use Nautilus if available
ide.goto.implementation.show.interfaces=false
ide.goto.implementation.show.interfaces.description=Whether to show sub-interfaces when invoking Goto Implementation (Ctrl+Alt+B) on an interface
ide.open.editors.asynchronously=false
ide.open.editors.asynchronously=true
ide.open.editors.asynchronously.description=Prepare editors in background thread
jeka=false