Author: DartPeng Date: 2009-04-23 23:14:36 -0400 (Thu, 23 Apr 2009) New Revision: 14878 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/actions/OpenEditorEditInnerContentsAction.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java Log: JBIDE-4175 Modify the resourcelistener to handle changes pf "temp file"; Change the editor's title. Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/actions/OpenEditorEditInnerContentsAction.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/actions/OpenEditorEditInnerContentsAction.java 2009-04-23 18:32:23 UTC (rev 14877) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/actions/OpenEditorEditInnerContentsAction.java 2009-04-24 03:14:36 UTC (rev 14878) @@ -9,6 +9,7 @@ import java.io.FileReader; import java.io.IOException; +import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -202,29 +203,19 @@ private class TempFileChangeListener implements IResourceChangeListener { public void resourceChanged(IResourceChangeEvent event) { - IResource res = event.getResource(); try { switch (event.getType()) { case IResourceChangeEvent.PRE_CLOSE: - System.out.print("Project "); - System.out.print(res.getFullPath()); - System.out.println(" is about to close."); break; case IResourceChangeEvent.PRE_DELETE: - System.out.print("Project "); - System.out.print(res.getFullPath()); - System.out.println(" is about to be deleted."); break; case IResourceChangeEvent.POST_CHANGE: - System.out.println("Resources have changed."); - event.getDelta().accept(new DeltaPrinter()); + event.getDelta().accept(new DeltaPrinter(), IContainer.INCLUDE_HIDDEN); break; case IResourceChangeEvent.PRE_BUILD: - System.out.println("Build about to run."); - event.getDelta().accept(new DeltaPrinter()); + event.getDelta().accept(new DeltaPrinter(), IContainer.INCLUDE_HIDDEN); break; case IResourceChangeEvent.POST_BUILD: - System.out.println("Build complete."); event.getDelta().accept(new DeltaPrinter()); break; } @@ -261,9 +252,6 @@ System.out.print("Resource "); System.out.print(res.getFullPath()); System.out.println(" was removed."); - if (res == resource) { - return false; - } break; case IResourceDelta.CHANGED: System.out.print("Resource "); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java 2009-04-23 18:32:23 UTC (rev 14877) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java 2009-04-24 03:14:36 UTC (rev 14878) @@ -328,19 +328,20 @@ */ @Override public void doSave(IProgressMonitor monitor) { - IEditorPart activeEditor = getActiveEditor(); - if (activeEditor != null && activeEditor == textEditor) { - textEditor.doSave(monitor); - ((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone(); - firePropertyChange(PROP_DIRTY); - } else { - Map<?, ?> options = Collections.emptyMap(); - initSaveOptions(options); - if (editingDomain != null) { - ResourceSet resourceSet = editingDomain.getResourceSet(); - List<Resource> resourceList = resourceSet.getResources(); - monitor.beginTask("Saving Smooks config file", resourceList.size()); - try { + try { + IEditorPart activeEditor = getActiveEditor(); + if (activeEditor != null && activeEditor == textEditor) { + textEditor.doSave(monitor); + ((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone(); + firePropertyChange(PROP_DIRTY); + } else { + Map<?, ?> options = Collections.emptyMap(); + initSaveOptions(options); + if (editingDomain != null) { + ResourceSet resourceSet = editingDomain.getResourceSet(); + List<Resource> resourceList = resourceSet.getResources(); + monitor.beginTask("Saving Smooks config file", resourceList.size()); + for (Iterator<Resource> iterator = resourceList.iterator(); iterator.hasNext();) { Resource resource = (Resource) iterator.next(); resource.save(options); @@ -349,19 +350,19 @@ ((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone(); textEditor.doRevertToSaved(); firePropertyChange(PROP_DIRTY); - } catch (IOException e) { - SmooksConfigurationActivator.getDefault().log(e); - } finally { - monitor.done(); } } + if (this.smooksModel != null) { + List<Object> lists = new ArrayList<Object>(); + lists.add(smooksModel); + SmooksModelValidator validator = new SmooksModelValidator(lists, getEditingDomain()); + validator.validate(monitor); + } + } catch (IOException e) { + SmooksConfigurationActivator.getDefault().log(e); + } finally { + monitor.done(); } - if(this.smooksModel != null){ - List<Object> lists = new ArrayList<Object>(); - lists.add(smooksModel); - SmooksModelValidator validator = new SmooksModelValidator(lists,getEditingDomain()); - validator.validate(monitor); - } } @Override @@ -380,6 +381,7 @@ // if success to open editor , check if there isn't ext file and create // a new one String extFileName = file.getName() + SmooksConstants.SMOOKS_GRAPHICSEXT_EXTENTION_NAME_WITHDOT; + setPartName(file.getName()); IContainer container = file.getParent(); if (container != null && container.exists()) { IFile extFile = container.getFile(new Path(extFileName));