Author: scabanovich Date: 2008-11-20 11:20:12 -0500 (Thu, 20 Nov 2008) New Revision: 11913 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java Log: JBIDE-3085 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java 2008-11-20 16:18:37 UTC (rev 11912) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/FacesConfigLoader.java 2008-11-20 16:20:12 UTC (rev 11913) @@ -25,12 +25,17 @@ import org.jboss.tools.jsf.JSFModelPlugin; import org.jboss.tools.jst.web.model.*; -public class FacesConfigLoader implements WebProcessLoader, JSFConstants { +public class FacesConfigLoader extends AbstractWebDiagramLoader implements WebProcessLoader, JSFConstants { public static String AUXILIARY_FILE_EXTENSION = "jsfdia"; - private FileAuxiliary aux = new FileAuxiliary(AUXILIARY_FILE_EXTENSION, false); - XModelObjectLoaderUtil util = new SFUtil(); - boolean isLight = false; + protected FileAuxiliary createFileAuxiliary() { + return new FileAuxiliary(AUXILIARY_FILE_EXTENSION, false); + } + + protected XModelObjectLoaderUtil createUtil() { + return new SFUtil(); + } + public void load(XModelObject object) { // String entity = object.getModelEntity().getName(); @@ -58,7 +63,6 @@ } Element element = doc.getDocumentElement(); util.load(element, object); - String loadingError = util.getError(); ((FileFacesConfigImpl)object).updateRuleIndices(); @@ -76,9 +80,10 @@ } } } + String loadingError = util.getError(); reloadProcess(object); + object.set("actualBodyTimeStamp", "" + object.getTimeStamp()); - ((AbstractXMLFileImpl)object).setLoaderError(loadingError); if(!hasErrors && loadingError != null) { object.setAttributeValue("isIncorrect", "yes"); @@ -87,12 +92,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) { FacesProcessImpl process = (FacesProcessImpl)object.getChildByPath(ELM_PROCESS); if(process == null) return; @@ -111,36 +110,7 @@ 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; - String text = file.getAsText(); - XModelObjectLoaderUtil.setTempBody(object, text); - if("yes".equals(object.get("isIncorrect"))) { - return true; - } - return saveLayout(object); - } - public boolean saveLayout(XModelObject object) { - if(isLight) return true; if(object == null || !object.isActive()) return false; XModelObjectLoaderUtil util = new XModelObjectLoaderUtil(); try { @@ -194,18 +164,6 @@ } } - public String mainObjectToString(XModelObject object) { - return "" + serializeMainObject(object); - } - - public String serializeObject(XModelObject object) { - return serializeMainObject(object); - } - - public void loadFragment(XModelObject object, Element element) { - util.load(element, object); - } - } class SFUtil extends XModelObjectLoaderUtil {