From: <ba...@us...> - 2006-10-25 16:55:45
|
Revision: 166 http://svn.sourceforge.net/obo/?rev=166&view=rev Author: balhoff Date: 2006-10-25 09:55:41 -0700 (Wed, 25 Oct 2006) Log Message: ----------- Modified phenosyntax and phenoxml data adapters to use save dialog when saving (instead of open dialog). File choosing should probably be moved out of the PhenoXmlAdapter class, but I haven't done this. Modified Paths: -------------- phenote/trunk/src/java/phenote/dataadapter/phenosyntax/PhenoSyntaxFileAdapter.java phenote/trunk/src/java/phenote/dataadapter/phenoxml/PhenoXmlAdapter.java Modified: phenote/trunk/src/java/phenote/dataadapter/phenosyntax/PhenoSyntaxFileAdapter.java =================================================================== --- phenote/trunk/src/java/phenote/dataadapter/phenosyntax/PhenoSyntaxFileAdapter.java 2006-10-19 13:06:15 UTC (rev 165) +++ phenote/trunk/src/java/phenote/dataadapter/phenosyntax/PhenoSyntaxFileAdapter.java 2006-10-25 16:55:41 UTC (rev 166) @@ -35,7 +35,7 @@ public void load() { if (file == null) - file = getFileFromUser(previousFile); + file = getFileFromUserForOpen(previousFile); if (file == null) return; previousFile = file; @@ -62,14 +62,22 @@ } /** returns null if user fails to pick a file */ - private File getFileFromUser(File dir) { - return PhenoXmlAdapter.getFileFromUser(dir); // perhaps a util class + // private File getFileFromUser(File dir) { + // return PhenoXmlAdapter.getFileFromUser(dir); // perhaps a util class + // } + + private File getFileFromUserForSave(File dir) { + return PhenoXmlAdapter.getFileFromUserForSave(dir); } + + private File getFileFromUserForOpen(File dir) { + return PhenoXmlAdapter.getFileFromUserForOpen(dir); + } public void commit(CharacterListI charList) { if (file == null) - file = getFileFromUser(previousFile); + file = getFileFromUserForSave(previousFile); if (file == null) return; previousFile = file; Modified: phenote/trunk/src/java/phenote/dataadapter/phenoxml/PhenoXmlAdapter.java =================================================================== --- phenote/trunk/src/java/phenote/dataadapter/phenoxml/PhenoXmlAdapter.java 2006-10-19 13:06:15 UTC (rev 165) +++ phenote/trunk/src/java/phenote/dataadapter/phenoxml/PhenoXmlAdapter.java 2006-10-25 16:55:41 UTC (rev 166) @@ -48,7 +48,7 @@ public void load() { try { if (file == null) { - file = getFileFromUser(previousFile); + file = getFileFromUserForOpen(previousFile); } if (file == null) return; previousFile = file; @@ -159,7 +159,7 @@ public void commit(CharacterListI charList) { if (file == null) - file = getFileFromUser(previousFile); + file = getFileFromUserForSave(previousFile); if (file == null) return; previousFile = file; @@ -183,18 +183,31 @@ } } - public static File getFileFromUser(File dir) { + public static File getFileFromUserIsSave(File dir, boolean isSave) { // todo - remember last accessed dir JFileChooser fileChooser = new JFileChooser(dir); // todo - file filter - only .xml or .phenoxml? - int returnVal = fileChooser.showOpenDialog(null); - if(returnVal == JFileChooser.APPROVE_OPTION) + int returnVal; + if (isSave) { + returnVal = fileChooser.showSaveDialog(null); + } else { + returnVal = fileChooser.showOpenDialog(null); + } + if (returnVal == JFileChooser.APPROVE_OPTION) return fileChooser.getSelectedFile(); else { System.out.println("no file chosen"); return null; } } + + public static File getFileFromUserForSave(File dir) { + return getFileFromUserIsSave(dir, true); + } + + public static File getFileFromUserForOpen(File dir) { + return getFileFromUserIsSave(dir, false); + } private XmlOptions getXmlOptions() { XmlOptions options = new XmlOptions(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |