Author: scabanovich
Date: 2011-07-29 16:15:54 -0400 (Fri, 29 Jul 2011)
New Revision: 33365
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/resources/XModelObjectEditorInput.java
Log:
Code improved.
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/resources/XModelObjectEditorInput.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/resources/XModelObjectEditorInput.java 2011-07-29
20:06:57 UTC (rev 33364)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/resources/XModelObjectEditorInput.java 2011-07-29
20:15:54 UTC (rev 33365)
@@ -182,10 +182,8 @@
if(input instanceof IURIEditorInput) {
URI uri = ((IURIEditorInput)input).getURI();
String f = uri.getPath();
- XModelObject o = null;
- o = EclipseResourceUtil.createObjectForLocation(f);
- if(o != null && o.getFileType() != XModelObject.FILE) o = null;
- return (o == null) ? (IEditorInput)input : new
ModelObjectLocationEditorInput(getMainObject(o), new Path(f));
+ XModelObject o = EclipseResourceUtil.createObjectForLocation(f);
+ return (o == null || o.getFileType() != XModelObject.FILE) ? (IEditorInput)input : new
ModelObjectLocationEditorInput(getMainObject(o), new Path(f));
}
return input;
}
@@ -203,16 +201,13 @@
XModelObject o = EclipseResourceUtil.getObjectByResource(f);
if(o == null) {
o = EclipseResourceUtil.createObjectForResource(f);
- if(o != null && o.getFileType() != XModelObject.FILE) o = null;
}
- return (o == null) ? input : new XModelObjectEditorInput(getMainObject(o));
+ return (o == null || o.getFileType() != XModelObject.FILE) ? input : new
XModelObjectEditorInput(getMainObject(o));
}
private static IEditorInput convertExternalInput(ILocationProvider input) {
- XModelObject o = null;
- o = EclipseResourceUtil.createObjectForLocation(input.getPath(input).toString());
- if(o != null && o.getFileType() != XModelObject.FILE) o = null;
- return (o == null) ? (IEditorInput)input : new
ModelObjectLocationEditorInput(getMainObject(o), input.getPath(input));
+ XModelObject o =
EclipseResourceUtil.createObjectForLocation(input.getPath(input).toString());
+ return (o == null || o.getFileType() != XModelObject.FILE) ? (IEditorInput)input : new
ModelObjectLocationEditorInput(getMainObject(o), input.getPath(input));
}
private static IEditorInput convertStorageEditorInput(IStorageEditorInput input) {