[Ejtools-cvs] applications/jndi.browser/src/main/org/ejtools/jndi/browser Browser.java,1.3,1.4
Brought to you by:
letiemble
Menu
▾
▴
[Ejtools-cvs] applications/jndi.browser/src/main/org/ejtools/jndi/browser Browser.java,1.3,1.4
|
From: <let...@us...> - 2003-12-14 09:49:37
|
Update of /cvsroot/ejtools/applications/jndi.browser/src/main/org/ejtools/jndi/browser
In directory sc8-pr-cvs1:/tmp/cvs-serv20500/jndi.browser/src/main/org/ejtools/jndi/browser
Modified Files:
Browser.java
Log Message:
Add more javadocs.
Adjust workspace persistence.
Index: Browser.java
===================================================================
RCS file: /cvsroot/ejtools/applications/jndi.browser/src/main/org/ejtools/jndi/browser/Browser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Browser.java 27 Nov 2003 01:30:28 -0000 1.3
--- Browser.java 13 Dec 2003 22:29:07 -0000 1.4
***************
*** 18,22 ****
import javax.swing.JFileChooser;
import javax.swing.JOptionPane;
- import javax.swing.filechooser.FileFilter;
import org.apache.log4j.Logger;
--- 18,21 ----
***************
*** 38,43 ****
--- 37,44 ----
import org.ejtools.jndi.browser.model.service.ConnectionMetaData;
import org.ejtools.jndi.browser.state.WorkbenchState;
+ import org.ejtools.util.FileTools;
import org.ejtools.util.service.Profile;
import org.ejtools.util.service.ProfileServiceProvider;
+ import org.ejtools.util.state.WorkspaceFileTools;
/**
***************
*** 50,78 ****
public class Browser extends BeanContextServicesSupport implements HistoryService.Holder
{
protected AboutServiceProvider aboutService;
protected ProfileServiceProvider factoryProvider;
protected MDIFrameServiceProvider frameService;
protected MenuBarServiceProvider menuBarService;
! protected ToolBarServiceProvider toolBarService;
protected WorkbenchState stateManager;
- protected HistoryServiceProvider historyService;
-
/** Description of the Field */
! private FileFilter WORKSPACE_FILE_FILTER =
! new FileFilter()
! {
! public boolean accept(File file)
! {
! return file.getName().endsWith(".xml");
! }
!
!
! public String getDescription()
! {
! return Browser.resources.getString("file.dialog.extension.description");
! }
! };
! /** Default logger */
private static Logger logger = Logger.getLogger(Browser.class);
/** Bundle for I18N */
--- 51,70 ----
public class Browser extends BeanContextServicesSupport implements HistoryService.Holder
{
+ /** Description of the Field */
protected AboutServiceProvider aboutService;
+ /** Description of the Field */
protected ProfileServiceProvider factoryProvider;
+ /** Description of the Field */
protected MDIFrameServiceProvider frameService;
+ /** Description of the Field */
+ protected HistoryServiceProvider historyService;
+ /** Description of the Field */
protected MenuBarServiceProvider menuBarService;
! /** Description of the Field */
protected WorkbenchState stateManager;
/** Description of the Field */
! protected ToolBarServiceProvider toolBarService;
! /** Default logger */
private static Logger logger = Logger.getLogger(Browser.class);
/** Bundle for I18N */
***************
*** 93,98 ****
this.toolBarService = new ToolBarServiceProvider();
this.factoryProvider = new ProfileServiceProvider(new ConnectionMetaData());
! this.historyService = new HistoryServiceProvider(this, 4);
! this.stateManager = new WorkbenchState(this);
try
--- 85,90 ----
this.toolBarService = new ToolBarServiceProvider();
this.factoryProvider = new ProfileServiceProvider(new ConnectionMetaData());
! this.historyService = new HistoryServiceProvider(this, 4);
! this.stateManager = new WorkbenchState(this);
try
***************
*** 127,135 ****
if (idx >= 0)
{
! Profile profile = Browser.this.factoryProvider.getProfile(idx);
! ServerInternalFrame frame = new ServerInternalFrame();
! frame.setProfile(profile);
! frame.setServer(new Server());
! Browser.this.add(frame);
}
}
--- 119,127 ----
if (idx >= 0)
{
! Profile profile = Browser.this.factoryProvider.getProfile(idx);
! ServerInternalFrame frame = new ServerInternalFrame();
! frame.setProfile(profile);
! frame.setServer(new Server());
! Browser.this.add(frame);
}
}
***************
*** 137,215 ****
));
! this.add(this.stateManager);
! this.add(new OpenWorkspaceAction(
! new Command()
! {
! public void execute()
! {
! try
! {
! URL selectedURL = selectWorkspaceFile(resources.getString("file.dialog.title.load"), JFileChooser.OPEN_DIALOG);
! if (selectedURL != null)
! {
! loadResource(selectedURL, null);
! }
! }
! catch (Exception e)
! {
! // JOptionPane.showMessageDialog(null, "Could not load file:" + e.getMessage(), "Error", JOptionPane.ERROR_MESSAGE);
! logger.error("Error while loading workspace", e);
! }
! }
! }
! ));
! this.add(new SaveWorkspaceAction(
! new Command()
! {
! public void execute()
! {
! try
! {
! if (Browser.this.stateManager.getWorkbenchURL() == null)
! {
! URL selectedURL = selectWorkspaceFile(resources.getString("file.dialog.title.save"), JFileChooser.SAVE_DIALOG);
! if (selectedURL != null)
! {
! Browser.this.stateManager.setWorkbenchURL(selectedURL);
! }
! }
! if (Browser.this.stateManager.getWorkbenchURL() != null)
! {
! Browser.this.stateManager.store();
! }
! }
! catch (Exception e)
! {
! logger.error("Error while saving workspace", e);
! }
! }
! }
! ));
! this.add(new SaveAsWorkspaceAction(
! new Command()
! {
! public void execute()
! {
! try
! {
! URL selectedURL = selectWorkspaceFile(resources.getString("file.dialog.title.save"), JFileChooser.SAVE_DIALOG);
! if (selectedURL != null)
! {
! Browser.this.stateManager.setWorkbenchURL(selectedURL);
! Browser.this.stateManager.store();
! }
! }
! catch (Exception e)
! {
! logger.error("Error while saving workspace", e);
! }
! }
! }
! ));
! this.add(this.historyService);
this.add(new ExitAction(
--- 129,207 ----
));
! this.add(this.stateManager);
! this.add(new OpenWorkspaceAction(
! new Command()
! {
! public void execute()
! {
! try
! {
! File selectedFile = FileTools.selectFile(resources.getString("file.dialog.title.load"), resources.getString("file.dialog.button.load"), JFileChooser.OPEN_DIALOG, WorkspaceFileTools.WORKSPACE_FILE_FILTER);
! if (selectedFile != null)
! {
! Browser.this.loadResource(selectedFile.toURL(), null);
! }
! }
! catch (Exception e)
! {
! // JOptionPane.showMessageDialog(null, "Could not load file:" + e.getMessage(), "Error", JOptionPane.ERROR_MESSAGE);
! logger.error("Error while loading workspace", e);
! }
! }
! }
! ));
! this.add(new SaveWorkspaceAction(
! new Command()
! {
! public void execute()
! {
! try
! {
! if (Browser.this.stateManager.getWorkbenchURL() == null)
! {
! File selectedFile = FileTools.selectFile(resources.getString("file.dialog.title.save"), resources.getString("file.dialog.button.save"), JFileChooser.SAVE_DIALOG, WorkspaceFileTools.WORKSPACE_FILE_FILTER);
! if (selectedFile != null)
! {
! Browser.this.stateManager.setWorkbenchURL(selectedFile.toURL());
! }
! }
! if (Browser.this.stateManager.getWorkbenchURL() != null)
! {
! Browser.this.stateManager.store();
! }
! }
! catch (Exception e)
! {
! logger.error("Error while saving workspace", e);
! }
! }
! }
! ));
! this.add(new SaveAsWorkspaceAction(
! new Command()
! {
! public void execute()
! {
! try
! {
! File selectedFile = FileTools.selectFile(resources.getString("file.dialog.title.save"), resources.getString("file.dialog.button.save"), JFileChooser.SAVE_DIALOG, WorkspaceFileTools.WORKSPACE_FILE_FILTER);
! if (selectedFile != null)
! {
! Browser.this.stateManager.setWorkbenchURL(selectedFile.toURL());
! Browser.this.stateManager.store();
! }
! }
! catch (Exception e)
! {
! logger.error("Error while saving workspace", e);
! }
! }
! }
! ));
! this.add(this.historyService);
this.add(new ExitAction(
***************
*** 251,264 ****
/**
! * Description of the Method
! *
! * @param url Description of the Parameter
! * @param context Description of the Parameter
! */
public void loadResource(URL url, Object context)
{
! this.stateManager.setWorkbenchURL(url);
! this.stateManager.load();
! this.historyService.push(url, context);
}
--- 243,256 ----
/**
! * Description of the Method
! *
! * @param url Description of the Parameter
! * @param context Description of the Parameter
! */
public void loadResource(URL url, Object context)
{
! this.stateManager.setWorkbenchURL(url);
! this.stateManager.load();
! this.historyService.push(url, context);
}
***************
*** 269,304 ****
System.exit(0);
}
-
-
- /**
- * Description of the Method
- *
- * @param title Description of the Parameter
- * @param type Description of the Parameter
- * @return Description of the Return Value
- * @exception Exception Description of the Exception
- */
- private URL selectWorkspaceFile(String title, int type)
- throws Exception
- {
- // Fix for JFileChooser/SecurityManager bug (#4264750)
- SecurityManager s = System.getSecurityManager();
- System.setSecurityManager(null);
-
- // Choose file
- JFileChooser chooser = new JFileChooser(System.getProperty("user.dir"));
- chooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
- chooser.setDialogTitle(title);
- chooser.setDialogType(type);
- chooser.setFileFilter(WORKSPACE_FILE_FILTER);
-
- int returnVal = chooser.showDialog(null, title);
- System.setSecurityManager(s);
- if (returnVal != JFileChooser.APPROVE_OPTION)
- {
- return null;
- }
-
- return chooser.getSelectedFile().toURL();
- }
}
--- 261,263 ----
|
