[jbosstools-commits] JBoss Tools SVN: r11914 - trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model.

Author: scabanovich Date: 2008-11-20 11:20:42 -0500 (Thu, 20 Nov 2008) New Revision: 11914 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/FileTilesLoader.java Log: JBIDE-3085 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/FileTilesLoader.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/FileTilesLoader.java 2008-11-20 16:20:12 UTC (rev 11913) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/FileTilesLoader.java 2008-11-20 16:20:42 UTC (rev 11914) @@ -14,19 +14,15 @@ import java.io.StringWriter; import org.jboss.tools.common.meta.XModelEntity; -import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; -import org.jboss.tools.common.model.XModelObjectConstants; import org.jboss.tools.common.model.filesystems.FileAuxiliary; -import org.jboss.tools.common.model.filesystems.impl.AbstractExtendedXMLFileImpl; import org.jboss.tools.common.model.filesystems.impl.AbstractXMLFileImpl; -import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl; -import org.jboss.tools.common.model.filesystems.impl.FolderLoader; import org.jboss.tools.common.model.loaders.impl.SimpleWebFileLoader; import org.jboss.tools.common.model.plugin.ModelPlugin; import org.jboss.tools.common.model.util.EntityXMLRegistration; import org.jboss.tools.common.model.util.XMLUtil; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; +import org.jboss.tools.jst.web.model.AbstractWebDiagramLoader; import org.jboss.tools.jst.web.model.WebProcessLoader; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; @@ -34,10 +30,16 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; -public class FileTilesLoader implements WebProcessLoader, TilesConstants { - private FileAuxiliary aux = new FileAuxiliary("l4t", false); - XModelObjectLoaderUtil util = createUtil(); +public class FileTilesLoader extends AbstractWebDiagramLoader implements WebProcessLoader, TilesConstants { + protected FileAuxiliary createFileAuxiliary() { + return new FileAuxiliary("l4t", false); + } + + protected XModelObjectLoaderUtil createUtil() { + return new FTLoaderUtil(); + } + public void load(XModelObject object) { String body = XModelObjectLoaderUtil.getTempBody(object); int resolution = EntityXMLRegistration.getInstance().resolve(object.getModelEntity()); @@ -49,8 +51,6 @@ object.setAttributeValue("isIncorrect", "yes"); object.setAttributeValue("incorrectBody", body); object.set("actualBodyTimeStamp", "-1"); -// XModelObjectLoaderUtil.addRequiredChildren(object); -// return; } else { object.setAttributeValue("isIncorrect", "no"); object.set("correctBody", body); @@ -64,7 +64,6 @@ } Element element = doc.getDocumentElement(); util.load(element, object); - String loadingError = util.getError(); setEncoding(object, body); NodeList nl = doc.getChildNodes(); @@ -75,9 +74,10 @@ object.setAttributeValue("systemId", dt.getSystemId()); } } + String loadingError = util.getError(); reloadProcess(object); - object.set("actualBodyTimeStamp", "" + object.getTimeStamp()); + object.set("actualBodyTimeStamp", "" + object.getTimeStamp()); ((AbstractXMLFileImpl)object).setLoaderError(loadingError); if(!hasErrors && loadingError != null) { object.setAttributeValue("isIncorrect", "yes"); @@ -86,12 +86,6 @@ } } - protected void setEncoding(XModelObject object, String body) { - String encoding = XModelObjectLoaderUtil.getEncoding(body); - if(encoding == null) encoding = ""; - object.setAttributeValue(XModelObjectConstants.ATTR_NAME_ENCODING, encoding); - } - public void reloadProcess(XModelObject object) { TilesProcessImpl process = (TilesProcessImpl)object.getChildByPath(ELM_PROCESS); if(process == null) return; @@ -109,33 +103,6 @@ process.firePrepared(); } - public boolean update(XModelObject object) throws XModelException { - XModelObject p = object.getParent(); - if (p == null) return true; - FolderLoader fl = (FolderLoader)p; - String body = fl.getBodySource(FileAnyImpl.toFileName(object)).get(); - AbstractExtendedXMLFileImpl f = (AbstractExtendedXMLFileImpl)object; - f.setUpdateLock(); - try { - f.edit(body, true); - } finally { - f.releaseUpdateLock(); - } - object.setModified(false); - XModelObjectLoaderUtil.updateModifiedOnSave(object); - return true; - } - - public boolean save(XModelObject object) { - if (!object.isModified()) return true; - FileAnyImpl file = (FileAnyImpl)object; - XModelObjectLoaderUtil.setTempBody(object, file.getAsText()); - if("yes".equals(object.get("isIncorrect"))) { - return true; - } - return saveLayout(object); - } - static boolean DO_NOT_SAVE = true; public boolean saveLayout(XModelObject object) { @@ -178,22 +145,6 @@ } } - public String mainObjectToString(XModelObject object) { - return "" + serializeMainObject(object); - } - - public String serializeObject(XModelObject object) { - return serializeMainObject(object); - } - - protected XModelObjectLoaderUtil createUtil() { - return new FTLoaderUtil(); - } - - public void loadFragment(XModelObject object, Element element) { - util.load(element, object); - } - } class FTLoaderUtil extends XModelObjectLoaderUtil {