Menu
▾
▴
[Motu-dev] CVS: cocaine/src/coca/base/version ConflictPool.java,1.3,1.4 Log.java,1.1,1.2 LogManager.java,1.2,1.3 TileAction.java,1.1,NONE
|
From: OSTER G. <go...@us...> - 2001-03-26 15:22:50
|
Update of /cvsroot/motu/cocaine/src/coca/base/version
In directory usw-pr-cvs1:/tmp/cvs-serv5792
Modified Files:
ConflictPool.java Log.java LogManager.java
Removed Files:
TileAction.java
Log Message:
fixed a little serializing bug on conflictpool and logs...
Index: ConflictPool.java
===================================================================
RCS file: /cvsroot/motu/cocaine/src/coca/base/version/ConflictPool.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ConflictPool.java 2001/03/22 15:18:32 1.3
--- ConflictPool.java 2001/03/26 15:22:45 1.4
***************
*** 23,29 ****
--- 23,34 ----
transient private Component view = null;
+ private ConflictPool() {
+ listeners = new Vector();
+ }
+
public ConflictPool(int Id) {
this.Id = Id;
conflictObjects = new Vector();
+ listeners = new Vector();
}
***************
*** 84,89 ****
public Component display() {
! if (view == null)
! view = new ConflictPool.UI();
return view;
}
--- 89,94 ----
public Component display() {
! if (view == null)
! view = new ConflictPool.UI();
return view;
}
***************
*** 104,109 ****
// TreeModel Interface
! private Vector listeners = new Vector();
public void addTreeModelListener(TreeModelListener l) {
listeners.add(l);
}
--- 109,116 ----
// TreeModel Interface
! transient private Vector listeners = null;
public void addTreeModelListener(TreeModelListener l) {
+ if (listeners == null)
+ listeners = new Vector();
listeners.add(l);
}
Index: Log.java
===================================================================
RCS file: /cvsroot/motu/cocaine/src/coca/base/version/Log.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Log.java 2001/03/19 15:05:36 1.1
--- Log.java 2001/03/26 15:22:45 1.2
***************
*** 16,20 ****
private WorkSpace ws;
private Vector operations;
! private Component view = null;
private String fakeRoot = null;
--- 16,20 ----
private WorkSpace ws;
private Vector operations;
! transient private Component view = null;
private String fakeRoot = null;
***************
*** 22,25 ****
--- 22,26 ----
public Log() {
operations = new Vector();
+ listeners = new Vector();
fakeRoot = "Integration Log";
}
***************
*** 27,30 ****
--- 28,32 ----
public Log(WorkSpace ws) {
operations = new Vector();
+ listeners = new Vector();
this.ws = ws;
fakeRoot = "Log of "+ws.getName();
***************
*** 95,100 ****
// TreeModel Interface
! private Vector listeners = new Vector();
public void addTreeModelListener(TreeModelListener l) {
listeners.add(l);
}
--- 97,104 ----
// TreeModel Interface
! transient private Vector listeners = null;
public void addTreeModelListener(TreeModelListener l) {
+ if (listeners == null)
+ listeners = new Vector();
listeners.add(l);
}
Index: LogManager.java
===================================================================
RCS file: /cvsroot/motu/cocaine/src/coca/base/version/LogManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** LogManager.java 2001/03/22 15:18:32 1.2
--- LogManager.java 2001/03/26 15:22:45 1.3
***************
*** 1,4 ****
--- 1,7 ----
package coca.base.version;
+
+ import coca.server.NamingServer;
+
import coca.base.event.listener.FSObjectListener;
import coca.base.event.listener.LObjectListener;
***************
*** 12,15 ****
--- 15,19 ----
import java.util.Enumeration;
+ // UI import...
import java.awt.Component;
import javax.swing.JFrame;
***************
*** 19,24 ****
import javax.swing.JMenu;
import java.awt.BorderLayout;
- import coca.server.NamingServer;
// Singleton !
--- 23,31 ----
import javax.swing.JMenu;
import java.awt.BorderLayout;
+ import java.awt.Dimension;
+ import javax.swing.AbstractAction;
+ import java.awt.event.ActionEvent;
+ import java.beans.PropertyVetoException;
// Singleton !
***************
*** 45,55 ****
private ConflictPoolVersioner cpVersioner;
private LogManager() {
! // need to be fixed...
! cpVersioner = (ConflictPoolVersioner) NamingServer.getInstance().lookup(ConflictPoolVersioner.getName());
! if (cpVersioner == null) {
! System.out.println("normally you will see only one time this message just after a 'Cant find ... null'");
cpVersioner = new ConflictPoolVersioner();
- }
}
--- 52,62 ----
private ConflictPoolVersioner cpVersioner;
+ //private transient JFrame view = null;
+
private LogManager() {
! if (NamingServer.getInstance().contains(ConflictPoolVersioner.getName()))
! cpVersioner = (ConflictPoolVersioner) NamingServer.getInstance().lookup(ConflictPoolVersioner.getName());
! else
cpVersioner = new ConflictPoolVersioner();
}
***************
*** 140,164 ****
}
-
- /*
- * UI for debug only !
- */
public void display() {
! JFrame frame = new JFrame("Log Manager Debug");
! JDesktopPane jdp = new JDesktopPane();
! frame.getContentPane().setLayout(new BorderLayout());
! frame.getContentPane().add(jdp,BorderLayout.CENTER);
! JMenuBar menuBar = new JMenuBar();
! JMenu menu = new JMenu("Window");
! menuBar.add(menu);
! menu.add(new TileAction(jdp)); // add tiling capability
! frame.setJMenuBar(menuBar);
! JInternalFrame jif;
- for (Enumeration e=Base.getInstance().getAllWorkSpaces(); e.hasMoreElements() ;) {
- WorkSpace ws = (WorkSpace) e.nextElement();
jif = new JInternalFrame("Workspace :"+ws.getName(),true,true,true,true);
jif.getContentPane().add(ws.getLog().display());
--- 147,197 ----
}
public void display() {
! //if (view == null)
! JFrame view;
! view = new LogManager.UI();
! view.show();
! view.toFront();
! }
!
+ class UI extends JFrame {
+ JDesktopPane jdp;
+
+ public UI() {
+ super("Log Manager Debug");
+ jdp = new JDesktopPane();
+ this.getContentPane().setLayout(new BorderLayout());
+ this.getContentPane().add(jdp,BorderLayout.CENTER);
+
+ JMenuBar menuBar = new JMenuBar();
+ JMenu menu = new JMenu("Window");
+ menuBar.add(menu);
+ menu.add(new UI.TileAction(jdp)); // add tiling capability
+ this.setJMenuBar(menuBar);
+ for (Enumeration e=Base.getInstance().getAllWorkSpaces(); e.hasMoreElements() ;) {
+ WorkSpace ws = (WorkSpace) e.nextElement();
+ this.addWorkspaceView(ws);
+ }
! JInternalFrame jif;
! jif = new JInternalFrame("Integration Space",true,true,true,true);
! jif.getContentPane().add(getiLog().display());
! jif.setSize(350,200);
! jif.show();
! jdp.add(jif);
!
! jif = new JInternalFrame("Last Conflict Pool",true,true,true,true);
! jif.getContentPane().add(cpVersioner.display());
! jif.setSize(350,200);
! jif.show();
! jdp.add(jif);
!
! this.setSize(800,600);
! }
+ private void addWorkspaceView(WorkSpace ws) {
+ JInternalFrame jif = null;
jif = new JInternalFrame("Workspace :"+ws.getName(),true,true,true,true);
jif.getContentPane().add(ws.getLog().display());
***************
*** 167,185 ****
jdp.add(jif);
}
! jif = new JInternalFrame("Integration Space",true,true,true,true);
! jif.getContentPane().add(getiLog().display());
! jif.setSize(350,200);
! jif.show();
! jdp.add(jif);
!
! jif = new JInternalFrame("Conflict Pool Versions",true,true,true,true);
! jif.getContentPane().add(cpVersioner.display());
! jif.setSize(350,200);
! jif.show();
! jdp.add(jif);
!
! frame.setSize(800,600);
! frame.show();
! frame.toFront();
}
}
--- 200,263 ----
jdp.add(jif);
}
!
!
!
! // An action that tiles all internal frames when requested.
! class TileAction extends AbstractAction {
! private JDesktopPane desk; // the desktop to work with
!
! public TileAction(JDesktopPane desk) {
! super("Tile Frames");
! this.desk = desk;
! }
!
! public void actionPerformed(ActionEvent ev) {
!
! // How many frames do we have?
! JInternalFrame[] allframes = desk.getAllFrames();
! int count = allframes.length;
! if (count == 0) return;
!
! // Determine the necessary grid size
! int sqrt = (int)Math.sqrt(count);
! int rows = sqrt;
! int cols = sqrt;
! if (rows*cols < count) {
! cols++;
! if (rows*cols < count) {
! rows++;
! }
! }
!
! // Define some initial values for size & location
! Dimension size = desk.getSize();
!
! int w = size.width/cols;
! int h = size.height/rows;
! int x = 0;
! int y = 0;
!
! // Iterate over the frames, deiconifying any iconified frames and then
! // relocating & resizing each
! for (int i=0; i<rows; i++) {
! for (int j=0; j<cols && ((i*cols)+j<count); j++) {
! JInternalFrame f = allframes[(i*cols)+j];
!
! if ((f.isClosed() == false) && (f.isIcon() == true)) {
!
! try {
! f.setIcon(false);
! }
! catch (PropertyVetoException ex) {}
! }
!
! desk.getDesktopManager().resizeFrame(f, x, y, w, h);
! x += w;
! }
! y += h; // start the next row
! x = 0;
! }
! }
! }
}
}
--- TileAction.java DELETED ---
|
