[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/gui WindowManager.java,1.2,
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
From: Colin B. <co...@us...> - 2004-08-17 21:40:39
|
Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14002/app/src/net/sourceforge/squirrel_sql/client/gui Modified Files: WindowManager.java Log Message: Now that we can have multiple windows open for a session we need smarter window titles. This is not yet complete. Index: WindowManager.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/WindowManager.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WindowManager.java 17 Aug 2004 12:13:59 -0000 1.2 --- WindowManager.java 17 Aug 2004 12:53:55 -0000 1.3 *************** *** 27,31 **** import java.util.List; import java.util.Map; - import javax.swing.Action; import javax.swing.JDesktopPane; --- 27,30 ---- *************** *** 34,38 **** import javax.swing.event.InternalFrameEvent; import javax.swing.event.InternalFrameListener; - import net.sourceforge.squirrel_sql.fw.gui.GUIUtils; import net.sourceforge.squirrel_sql.fw.id.IIdentifier; --- 33,36 ---- *************** *** 40,44 **** import net.sourceforge.squirrel_sql.fw.util.log.ILogger; import net.sourceforge.squirrel_sql.fw.util.log.LoggerController; - import net.sourceforge.squirrel_sql.client.IApplication; import net.sourceforge.squirrel_sql.client.mainframe.MainFrame; --- 38,41 ---- *************** *** 98,101 **** --- 95,100 ---- private final SessionWindowListener _windowListener = new SessionWindowListener(); + private int _lastSessionIdx = 1; + // JASON: Mow that multiple object trees exist storing the edit // where by objectInfo within session won't work. It needs to be objectinfo *************** *** 182,185 **** --- 181,186 ---- public synchronized void registerSessionSheet(BaseSessionSheet sheet) { + s_log.debug("Registering " + sheet.getClass().getName() + " in WindowManager"); + // sheet.setTitle(createTitleForChild(sheet)); final IIdentifier sessionIdentifier = sheet.getSession().getIdentifier(); List windowList = (List)_sessionWindows.get(sessionIdentifier); *************** *** 189,192 **** --- 190,199 ---- _sessionWindows.put(sessionIdentifier, windowList); } + + final int idx = windowList.size(); + if ( idx > 0) + { + sheet.setTitle(sheet.getTitle() + " (" + idx + ")"); + } windowList.add(sheet); sheet.addInternalFrameListener(_windowListener); *************** *** 629,632 **** --- 636,660 ---- // } + // private String createTitleForChild(BaseSessionSheet child) + // { + // // TODO: Remove instanceof + // if (child instanceof SessionInternalFrame) + // { + // return child.getTitle();// + " (" + _lastSessionIdx++ + ")"; + // } + // + // if (child instanceof SQLInternalFrame) + // { + // return child.getTitle();// + " (" + _lastSessionIdx++ + ")"; + // } + // + // if (child instanceof ObjectTreeInternalFrame) + // { + // return child.getTitle();// + " (" + _lastSessionIdx++ + ")"; + // } + // + // return "???????????????";// TODO: + // } + private void positionSheet(JInternalFrame jif) { *************** *** 835,837 **** --- 863,866 ---- } } + } |