Menu
▾
▴
cdchamber-cvscommit — Mailing list for CVS commit messages.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(111) |
Jul
(258) |
Aug
(21) |
Sep
|
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <cry...@us...> - 2002-07-19 01:59:58
|
Update of /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber In directory usw-pr-cvs1:/tmp/cvs-serv4561 Removed Files: Main.java Log Message: a solution with ajc --- Main.java DELETED --- |
|
From: <cry...@us...> - 2002-07-19 01:59:30
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/parser In directory usw-pr-cvs1:/tmp/cvs-serv4454/parser Removed Files: FileParseException.java Log Message: a solution with ajc --- FileParseException.java DELETED --- |
|
From: <cry...@us...> - 2002-07-19 01:59:30
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/elements In directory usw-pr-cvs1:/tmp/cvs-serv4454/elements Removed Files: FileTypeFactory.java Log Message: a solution with ajc --- FileTypeFactory.java DELETED --- |
|
From: <cry...@us...> - 2002-07-19 01:52:56
|
Update of /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/parser In directory usw-pr-cvs1:/tmp/cvs-serv2768/parser Log Message: Directory /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/parser added to the repository |
Update of /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv10162/aspect/src/org/cdchamber/gui
Modified Files:
CDCMainFrameController.java FileTreeModel.java
FilesTableModel.java XmlFileFilter.java
Log Message:
Bug fix for import xml files.
Index: CDCMainFrameController.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/gui/CDCMainFrameController.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CDCMainFrameController.java 18 Jul 2002 08:44:09 -0000 1.2
--- CDCMainFrameController.java 18 Jul 2002 13:02:40 -0000 1.3
***************
*** 4,9 ****
* Date: Jul 18, 2002
* Time: 11:05:00 AM
! * To change template for new class use
! * Code Style | Class Templates options (Tools | IDE Options).
*/
package org.cdchamber.gui;
--- 4,8 ----
* Date: Jul 18, 2002
* Time: 11:05:00 AM
! * $Id$
*/
package org.cdchamber.gui;
***************
*** 93,96 ****
--- 92,96 ----
JFileChooser chooser = new JFileChooser();
+ chooser.setFileSelectionMode( JFileChooser.FILES_ONLY);
chooser.setFileFilter( new XmlFileFilter());
int retvalue = chooser.showOpenDialog( frame);
Index: FileTreeModel.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/gui/FileTreeModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FileTreeModel.java 18 Jul 2002 08:22:26 -0000 1.1
--- FileTreeModel.java 18 Jul 2002 13:02:40 -0000 1.2
***************
*** 4,9 ****
* Date: Jul 17, 2002
* Time: 6:24:07 PM
! * To change template for new class use
! * Code Style | Class Templates options (Tools | IDE Options).
*/
package org.cdchamber.gui;
--- 4,8 ----
* Date: Jul 17, 2002
* Time: 6:24:07 PM
! * $Id$
*/
package org.cdchamber.gui;
Index: FilesTableModel.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/gui/FilesTableModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FilesTableModel.java 18 Jul 2002 08:22:26 -0000 1.1
--- FilesTableModel.java 18 Jul 2002 13:02:40 -0000 1.2
***************
*** 4,9 ****
* Date: Jul 17, 2002
* Time: 9:06:20 PM
! * To change template for new class use
! * Code Style | Class Templates options (Tools | IDE Options).
*/
package org.cdchamber.gui;
--- 4,8 ----
* Date: Jul 17, 2002
* Time: 9:06:20 PM
! * $Id$
*/
package org.cdchamber.gui;
Index: XmlFileFilter.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/gui/XmlFileFilter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XmlFileFilter.java 18 Jul 2002 08:44:09 -0000 1.1
--- XmlFileFilter.java 18 Jul 2002 13:02:40 -0000 1.2
***************
*** 4,9 ****
* Date: Jul 18, 2002
* Time: 4:38:19 PM
! * To change template for new class use
! * Code Style | Class Templates options (Tools | IDE Options).
*/
package org.cdchamber.gui;
--- 4,8 ----
* Date: Jul 18, 2002
* Time: 4:38:19 PM
! * $Id$
*/
package org.cdchamber.gui;
***************
*** 14,17 ****
--- 13,17 ----
public class XmlFileFilter extends FileFilter {
public boolean accept(File f) {
+ if ( f.isDirectory()) return true;
if ( f.getName().toLowerCase().endsWith( ".xml")) return true;
return false;
|
|
From: <sim...@us...> - 2002-07-18 08:44:17
|
Update of /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv700/aspect/src/org/cdchamber/gui
Modified Files:
CDCMainFrame.java CDCMainFrameController.java
Added Files:
XmlFileFilter.java
Log Message:
Import other data files into data directory.
--- NEW FILE: XmlFileFilter.java ---
/*
* Created by IntelliJ IDEA.
* User: Administrator
* Date: Jul 18, 2002
* Time: 4:38:19 PM
* To change template for new class use
* Code Style | Class Templates options (Tools | IDE Options).
*/
package org.cdchamber.gui;
import javax.swing.filechooser.FileFilter;
import java.io.File;
public class XmlFileFilter extends FileFilter {
public boolean accept(File f) {
if ( f.getName().toLowerCase().endsWith( ".xml")) return true;
return false;
}
public String getDescription() {
return "*.xml files";
}
public XmlFileFilter() {
super();
}
}
Index: CDCMainFrame.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/gui/CDCMainFrame.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CDCMainFrame.java 18 Jul 2002 08:22:26 -0000 1.1
--- CDCMainFrame.java 18 Jul 2002 08:44:09 -0000 1.2
***************
*** 19,23 ****
JMenu cdromMenu = new JMenu();
JMenuItem cdromCreateMenuItem = new JMenuItem();
! JMenuItem cdromShowMenuItem = new JMenuItem();
JMenu helpMenu = new JMenu();
JMenuItem helpAboutMenuItem = new JMenuItem();
--- 19,23 ----
JMenu cdromMenu = new JMenu();
JMenuItem cdromCreateMenuItem = new JMenuItem();
! JMenuItem cdromImportMenuItem = new JMenuItem();
JMenu helpMenu = new JMenu();
JMenuItem helpAboutMenuItem = new JMenuItem();
***************
*** 52,57 ****
mainPane.setBorder( new EtchedBorder());
! mainPane.add( JSplitPane.LEFT, new JScrollPane().getViewport().add( directoryTree));
! mainPane.add( JSplitPane.RIGHT, new JScrollPane().getViewport().add( filesTable));
directoryTree.addTreeSelectionListener( controller);
--- 52,61 ----
mainPane.setBorder( new EtchedBorder());
! JScrollPane jScrollPaneTree = new JScrollPane();
! jScrollPaneTree.getViewport().add( directoryTree);
! mainPane.add( JSplitPane.LEFT, jScrollPaneTree);
! JScrollPane jScrollPaneTable = new JScrollPane();
! jScrollPaneTable.getViewport().add( filesTable);
! mainPane.add( JSplitPane.RIGHT, jScrollPaneTable);
directoryTree.addTreeSelectionListener( controller);
***************
*** 62,70 ****
cdromMenu.setMnemonic('C');
cdromMenu.setText("CDrom");
- cdromCreateMenuItem.setMnemonic('C');
- cdromCreateMenuItem.setText("Create");
cdromCreateMenuItem.setAction( controller.new CreateNewCDRomAction());
! cdromShowMenuItem.setMnemonic('I');
! cdromShowMenuItem.setText("Import");
helpMenu.setMnemonic('H');
helpMenu.setText("Help");
--- 66,71 ----
cdromMenu.setMnemonic('C');
cdromMenu.setText("CDrom");
cdromCreateMenuItem.setAction( controller.new CreateNewCDRomAction());
! cdromImportMenuItem.setAction( controller.new ImportCDRomAction());
helpMenu.setMnemonic('H');
helpMenu.setText("Help");
***************
*** 81,85 ****
mainMenu.add(helpMenu);
cdromMenu.add(cdromCreateMenuItem);
! cdromMenu.add(cdromShowMenuItem);
helpMenu.add(helpAboutMenuItem);
cdromMenu.addSeparator();
--- 82,86 ----
mainMenu.add(helpMenu);
cdromMenu.add(cdromCreateMenuItem);
! cdromMenu.add(cdromImportMenuItem);
helpMenu.add(helpAboutMenuItem);
cdromMenu.addSeparator();
Index: CDCMainFrameController.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/gui/CDCMainFrameController.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CDCMainFrameController.java 18 Jul 2002 08:22:26 -0000 1.1
--- CDCMainFrameController.java 18 Jul 2002 08:44:09 -0000 1.2
***************
*** 76,81 ****
--- 76,106 ----
dirType.parse( dir.getAbsolutePath());
dirType.marshal( new FileWriter( DirPath.DataDir + DirPath.SEP + System.currentTimeMillis() + ".xml"));
+ frame.directoryTree.setModel( new FileTreeModel( loadDataFiles()));
} catch (Exception e1) {
JOptionPane.showMessageDialog( frame, "Can't save file.");
+ }
+
+ }
+ }
+
+ public class ImportCDRomAction extends AbstractAction {
+ public ImportCDRomAction() {
+ putValue( Action.NAME, "Import");
+ putValue( Action.MNEMONIC_KEY, new Integer('I'));
+ }
+
+ public void actionPerformed(ActionEvent e) {
+
+ JFileChooser chooser = new JFileChooser();
+ chooser.setFileFilter( new XmlFileFilter());
+ int retvalue = chooser.showOpenDialog( frame);
+ if ( retvalue != JFileChooser.APPROVE_OPTION) return;
+ File file = chooser.getSelectedFile();
+ try {
+ DirectoryType dirType = DirectoryType.unmarshalDirectoryType( new FileReader( file.getAbsolutePath()));
+ dirType.marshal( new FileWriter( DirPath.DataDir + DirPath.SEP + System.currentTimeMillis() + ".xml"));
+ frame.directoryTree.setModel( new FileTreeModel( loadDataFiles()));
+ } catch (Exception e1) {
+ JOptionPane.showMessageDialog( frame, "Can't import file.");
}
}
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui In directory usw-pr-cvs1:/tmp/cvs-serv24925/src/org/cdchamber/gui Removed Files: CDCMainFrame.java CDCMainFrameController.java CDChamber.java FileTreeModel.java FilesTableModel.java Log Message: Refactoring. --- CDCMainFrame.java DELETED --- --- CDCMainFrameController.java DELETED --- --- CDChamber.java DELETED --- --- FileTreeModel.java DELETED --- --- FilesTableModel.java DELETED --- |
Update of /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv23856/aspect/src/org/cdchamber/gui
Added Files:
CDCMainFrame.java CDCMainFrameController.java CDChamber.java
FileTreeModel.java FilesTableModel.java
Log Message:
Refactor the gui package to aspectj directory.
Can create new cdrom info now.
--- NEW FILE: CDCMainFrame.java ---
/*
* User: Simon
* Date: 2002-6-29
* Time: 20:20:49
* $Id: CDCMainFrame.java,v 1.1 2002/07/18 08:22:26 simon_lei Exp $
*/
package org.cdchamber.gui;
import javax.swing.*;
import javax.swing.border.EtchedBorder;
import java.awt.event.*;
import java.awt.*;
public class CDCMainFrame extends JFrame {
JPanel contentPane;
BorderLayout borderLayout1 = new BorderLayout();
JMenuBar mainMenu = new JMenuBar();
JMenu cdromMenu = new JMenu();
JMenuItem cdromCreateMenuItem = new JMenuItem();
JMenuItem cdromShowMenuItem = new JMenuItem();
JMenu helpMenu = new JMenu();
JMenuItem helpAboutMenuItem = new JMenuItem();
JMenuItem cdromExitMenuItem = new JMenuItem();
JTree directoryTree = new JTree();
JTable filesTable = new JTable();
JSplitPane mainPane = new JSplitPane();
CDCMainFrameController controller;
public CDCMainFrame() {
controller = new CDCMainFrameController(this);
enableEvents(AWTEvent.WINDOW_EVENT_MASK);
try {
jbInit();
} catch(Exception e) {
e.printStackTrace();
}
}
//Component initialization
private void jbInit() throws Exception {
//setIconImage(Toolkit.getDefaultToolkit().createImage(Frame3.class.getResource("[Your Icon]")));
this.setSize(new Dimension(640, 480));
this.setTitle("CDChamber");
initMenuBar();
contentPane = (JPanel) this.getContentPane();
contentPane.setLayout(borderLayout1);
contentPane.add( BorderLayout.CENTER, mainPane);
mainPane.setBorder( new EtchedBorder());
mainPane.add( JSplitPane.LEFT, new JScrollPane().getViewport().add( directoryTree));
mainPane.add( JSplitPane.RIGHT, new JScrollPane().getViewport().add( filesTable));
directoryTree.addTreeSelectionListener( controller);
}
private void initMenuBar() {
this.setJMenuBar(mainMenu);
cdromMenu.setMnemonic('C');
cdromMenu.setText("CDrom");
cdromCreateMenuItem.setMnemonic('C');
cdromCreateMenuItem.setText("Create");
cdromCreateMenuItem.setAction( controller.new CreateNewCDRomAction());
cdromShowMenuItem.setMnemonic('I');
cdromShowMenuItem.setText("Import");
helpMenu.setMnemonic('H');
helpMenu.setText("Help");
helpAboutMenuItem.setMnemonic('A');
helpAboutMenuItem.setText("About");
cdromExitMenuItem.setMnemonic('X');
cdromExitMenuItem.setText("Exit");
cdromExitMenuItem.addActionListener( new ActionListener() {
public void actionPerformed(ActionEvent e) {
cdromExit_actionPerformed();
}
});
mainMenu.add(cdromMenu);
mainMenu.add(helpMenu);
cdromMenu.add(cdromCreateMenuItem);
cdromMenu.add(cdromShowMenuItem);
helpMenu.add(helpAboutMenuItem);
cdromMenu.addSeparator();
cdromMenu.add(cdromExitMenuItem);
}
private void cdromExit_actionPerformed() {
System.exit(0);
}
protected void processWindowEvent(WindowEvent e) {
super.processWindowEvent(e);
if (e.getID() == WindowEvent.WINDOW_CLOSING) {
cdromExit_actionPerformed();
}
}
}
--- NEW FILE: CDCMainFrameController.java ---
/*
* Created by IntelliJ IDEA.
* User: Administrator
* Date: Jul 18, 2002
* Time: 11:05:00 AM
* To change template for new class use
* Code Style | Class Templates options (Tools | IDE Options).
*/
package org.cdchamber.gui;
import org.cdchamber.elements.DirectoryType;
import org.cdchamber.util.DirPath;
import org.cdchamber.Main;
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreeSelectionModel;
import javax.swing.*;
import java.io.*;
import java.awt.event.ActionEvent;
public class CDCMainFrameController implements TreeSelectionListener {
CDCMainFrame frame;
public CDCMainFrameController( CDCMainFrame frame) {
this.frame = frame;
frame.directoryTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
frame.directoryTree.setModel( new FileTreeModel( loadDataFiles()));
frame.filesTable.setModel( new FilesTableModel( (DefaultMutableTreeNode)frame.directoryTree.getModel().getRoot()));
}
private DirectoryType loadDataFiles() {
DirectoryType root = new DirectoryType();
File dataDir = new File( DirPath.DataDir);
File[] rootFiles = dataDir.listFiles();
for ( int i=0; i<rootFiles.length; i++) {
try {
root.addFiles( DirectoryType.unmarshalDirectoryType( new FileReader( rootFiles[i])));
} catch (org.exolab.castor.xml.MarshalException e) {
} catch (org.exolab.castor.xml.ValidationException e) {
} catch (FileNotFoundException e) {
}
}
root.setName( "CDRoms");
return root;
}
public void valueChanged(TreeSelectionEvent e) {
DefaultMutableTreeNode node = (DefaultMutableTreeNode)
frame.directoryTree.getLastSelectedPathComponent();
if (node == null) return;
if (!node.isLeaf()) frame.directoryTree.expandPath(e.getNewLeadSelectionPath());
frame.filesTable.setModel( new FilesTableModel(node));
}
public class CreateNewCDRomAction extends AbstractAction {
public CreateNewCDRomAction() {
putValue( Action.NAME, "Create");
putValue( Action.MNEMONIC_KEY, new Integer('C'));
}
public void actionPerformed(ActionEvent e) {
JFileChooser chooser = new JFileChooser();
chooser.setFileSelectionMode( JFileChooser.DIRECTORIES_ONLY);
int retvalue = chooser.showOpenDialog( frame);
if ( retvalue != JFileChooser.APPROVE_OPTION) return;
File dir = chooser.getSelectedFile();
DirectoryType dirType = new DirectoryType();
try {
dirType.parse( dir.getAbsolutePath());
dirType.marshal( new FileWriter( DirPath.DataDir + DirPath.SEP + System.currentTimeMillis() + ".xml"));
} catch (Exception e1) {
JOptionPane.showMessageDialog( frame, "Can't save file.");
}
}
}
}
--- NEW FILE: CDChamber.java ---
/*
* User: Simon
* Date: 2002-6-29
* Time: 20:17:41
* $Id: CDChamber.java,v 1.1 2002/07/18 08:22:26 simon_lei Exp $
*/
package org.cdchamber.gui;
import javax.swing.*;
import java.awt.*;
public class CDChamber {
public static void main(String[] args) {
try {
UIManager.setLookAndFeel( UIManager.getCrossPlatformLookAndFeelClassName());
} catch(Exception e) {
e.printStackTrace();
}
CDCMainFrame mainFrame = new CDCMainFrame();
showWinowAtCenter( mainFrame);
}
static void showWinowAtCenter( Window window) {
Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
Dimension windowSize = window.getSize();
if (windowSize.height > screenSize.height) {
windowSize.height = screenSize.height;
}
if (windowSize.width > screenSize.width) {
windowSize.width = screenSize.width;
}
window.setLocation((screenSize.width - windowSize.width) / 2, (screenSize.height - windowSize.height) / 2);
window.setVisible(true);
}
}
--- NEW FILE: FileTreeModel.java ---
/*
* Created by IntelliJ IDEA.
* User: Administrator
* Date: Jul 17, 2002
* Time: 6:24:07 PM
* To change template for new class use
* Code Style | Class Templates options (Tools | IDE Options).
*/
package org.cdchamber.gui;
import org.cdchamber.elements.DirectoryType;
import org.cdchamber.elements.FileType;
import javax.swing.tree.*;
public class FileTreeModel extends DefaultTreeModel {
public FileTreeModel( DirectoryType roots) {
super( new DefaultMutableTreeNode( roots));
DefaultMutableTreeNode troots = (DefaultMutableTreeNode)this.getRoot();
addFilesToNode( roots.getFiles(), troots);
this.setRoot( troots);
}
public static void addFilesToNode( FileType []files, DefaultMutableTreeNode pnode ) {
for ( int i=0; i<files.length; i++) {
if ( !(files[i] instanceof DirectoryType)) continue;
DefaultMutableTreeNode node = new DefaultMutableTreeNode( files[i]);
addFilesToNode( ((DirectoryType)files[i]).getFiles(), node);
pnode.add( node);
}
}
}
--- NEW FILE: FilesTableModel.java ---
/*
* Created by IntelliJ IDEA.
* User: Administrator
* Date: Jul 17, 2002
* Time: 9:06:20 PM
* To change template for new class use
* Code Style | Class Templates options (Tools | IDE Options).
*/
package org.cdchamber.gui;
import org.cdchamber.elements.DirectoryType;
import org.cdchamber.elements.FileType;
import javax.swing.table.AbstractTableModel;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.*;
import java.text.NumberFormat;
import java.text.DateFormat;
import java.util.Date;
public class FilesTableModel extends AbstractTableModel {
public FilesTableModel() {
}
DirectoryType dir;
public DirectoryType getDir() {
return this.dir;
}
public FilesTableModel( DefaultMutableTreeNode node) {
dir = (DirectoryType)node.getUserObject();
}
public int getRowCount() {
return dir.getFilesCount();
}
public int getColumnCount() {
return columnHeads.length;
}
public String getColumnName(int column) {
return columnHeads[ column].title;
}
static final public ColumnData columnHeads[] = {
new ColumnData( "Name", 200, JLabel.LEFT ),
new ColumnData( "Size", 100, JLabel.RIGHT ),
new ColumnData( "Date", 200, JLabel.LEFT ),
new ColumnData( "Describe", 200, JLabel.LEFT ),
};
public static final int NAME = 0;
public static final int SIZE = 1;
public static final int DATE = 2;
public static final int DESC = 3;
public Object getValueAt(int rowIndex, int columnIndex) {
if ( rowIndex <0 || rowIndex > dir.getFilesCount()-1) return null;
FileType ft = (FileType) dir.getFiles( rowIndex);
switch ( columnIndex) {
case NAME:
return ft;
case SIZE:
return FilesTableModel.sizeToString( ft.getSize());
case DATE:
return FilesTableModel.longToDateString( ft.getDate());
case DESC:
return ft.getDesc();
}
return "";
}
private static long KB=1024;
private static NumberFormat nf = NumberFormat.getNumberInstance();
public static String sizeToString( long size) {
return nf.format((size+KB-1) / KB)+"KB";
}
private static DateFormat df = DateFormat.getDateTimeInstance( DateFormat.MEDIUM, DateFormat.MEDIUM);
public static String longToDateString( long date) {
return df.format( new Date( date));
}
}
class ColumnData {
public String title;
public int width;
public int alignment;
public ColumnData(String title, int width, int alignment) {
this.title = title;
this.width = width;
this.alignment = alignment;
}
}
|
|
From: <sim...@us...> - 2002-07-18 08:22:29
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv23856/test/src/org/cdchamber/gui
Modified Files:
CDCMainFrameTest.java
Log Message:
Refactor the gui package to aspectj directory.
Can create new cdrom info now.
Index: CDCMainFrameTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui/CDCMainFrameTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CDCMainFrameTest.java 18 Jul 2002 02:20:38 -0000 1.8
--- CDCMainFrameTest.java 18 Jul 2002 08:22:26 -0000 1.9
***************
*** 72,76 ****
public void testTreeNodeChanged() {
! frame.directoryTree.setSelectionRow(2);
TreePath path = frame.directoryTree.getSelectionPath();
Object selected = ((DefaultMutableTreeNode)path.getLastPathComponent()).getUserObject();
--- 72,76 ----
public void testTreeNodeChanged() {
! frame.directoryTree.setSelectionRow(1);
TreePath path = frame.directoryTree.getSelectionPath();
Object selected = ((DefaultMutableTreeNode)path.getLastPathComponent()).getUserObject();
|
|
From: <sim...@us...> - 2002-07-18 08:22:29
|
Update of /cvsroot/cdchamber/CDChamber/aspect In directory usw-pr-cvs1:/tmp/cvs-serv23856/aspect Modified Files: file.lst Log Message: Refactor the gui package to aspectj directory. Can create new cdrom info now. Index: file.lst =================================================================== RCS file: /cvsroot/cdchamber/CDChamber/aspect/file.lst,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** file.lst 1 Jul 2002 07:00:45 -0000 1.4 --- file.lst 18 Jul 2002 08:22:26 -0000 1.5 *************** *** 5,6 **** --- 5,7 ---- ../src/org/cdchamber/elements/FileType.java src/org/cdchamber/Main.java + src/org/cdchamber/gui/CDCMainFrameController.java |
|
From: <sim...@us...> - 2002-07-18 08:20:48
|
Update of /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/gui In directory usw-pr-cvs1:/tmp/cvs-serv22966/gui Log Message: Directory /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/gui added to the repository |
|
From: <cry...@us...> - 2002-07-18 08:04:23
|
Update of /cvsroot/cdchamber/CDChamber
In directory usw-pr-cvs1:/tmp/cvs-serv16090
Modified Files:
build.xml
Log Message:
ajc.notRequired fix
Index: build.xml
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/build.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** build.xml 18 Jul 2002 03:21:17 -0000 1.24
--- build.xml 18 Jul 2002 08:04:19 -0000 1.25
***************
*** 56,60 ****
<condition property="ajc.notRequired">
<uptodate targetfile="${aspect.classes}/org/cdchamber/elements/FileType.class">
! <srcfiles dir="${aspect.dir}" includes="*.*"/>
</uptodate>
</condition>
--- 56,60 ----
<condition property="ajc.notRequired">
<uptodate targetfile="${aspect.classes}/org/cdchamber/elements/FileType.class">
! <srcfiles dir="${aspect.dir}" includes="**/*.*"/>
</uptodate>
</condition>
|
|
From: <sim...@us...> - 2002-07-18 03:21:37
|
Update of /cvsroot/cdchamber/CDChamber/docs
In directory usw-pr-cvs1:/tmp/cvs-serv26706/docs
Modified Files:
storycard.txt
Log Message:
Storycard 2 finished, let begin the card2.1
And add one new card.
Index: storycard.txt
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/docs/storycard.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** storycard.txt 27 Jun 2002 03:15:28 -0000 1.3
--- storycard.txt 18 Jul 2002 03:21:35 -0000 1.4
***************
*** 11,15 ****
2.1
! Äܹ»½«ÆäËûÓû§Éú³ÉµÄ¼Ç¼ÎļþÌí¼Óµ½×Ô¼ºµÄcdÊý¾Ý¿âµ±ÖС£
3:
--- 11,15 ----
2.1
! Óû§Äܹ»Í¨¹ýGUIÀ´Éú³ÉеÄCDROMÐÅÏ¢¡£Äܹ»½«ÆäËûÓû§Éú³ÉµÄ¼Ç¼ÎļþÌí¼Óµ½×Ô¼ºµÄcdÊý¾Ý¿âµ±ÖС£
3:
***************
*** 29,31 ****
Äܹ»ºöÂÔһЩ³£¼ûµÄÎļþÃû/Ŀ¼Ãû£¬ÀýÈçCVS£¬*.bak£¬*~£¬etc
! ÕâЩÐÅÏ¢¶ÔÓû§²¢Ã»ÓÐÓô¦¡£
\ No newline at end of file
--- 29,35 ----
Äܹ»ºöÂÔһЩ³£¼ûµÄÎļþÃû/Ŀ¼Ãû£¬ÀýÈçCVS£¬*.bak£¬*~£¬etc
! ÕâЩÐÅÏ¢¶ÔÓû§²¢Ã»ÓÐÓô¦¡£
!
! 7:
!
! ÓÅ»¯GUI£¬Ê¹Ö®½çÃæ¸üÓѺ㬲Ù×÷¸ü·½±ã¡£
\ No newline at end of file
|
|
From: <cry...@us...> - 2002-07-18 03:21:21
|
Update of /cvsroot/cdchamber/CDChamber
In directory usw-pr-cvs1:/tmp/cvs-serv26641
Modified Files:
build.xml
Log Message:
add a uptodate about ajc, so it will not re-compile every time
Index: build.xml
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/build.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** build.xml 18 Jul 2002 01:13:44 -0000 1.23
--- build.xml 18 Jul 2002 03:21:17 -0000 1.24
***************
*** 54,57 ****
--- 54,62 ----
</and>
</condition>
+ <condition property="ajc.notRequired">
+ <uptodate targetfile="${aspect.classes}/org/cdchamber/elements/FileType.class">
+ <srcfiles dir="${aspect.dir}" includes="*.*"/>
+ </uptodate>
+ </condition>
</target>
***************
*** 71,75 ****
! <target name="compilewithajc" depends="compile">
<ajc destdir="${aspect.classes}" argfiles="${aspect.dir}/file.lst">
<src>
--- 76,80 ----
! <target name="compilewithajc" depends="compile" unless="ajc.notRequired">
<ajc destdir="${aspect.classes}" argfiles="${aspect.dir}/file.lst">
<src>
|
|
From: <sim...@us...> - 2002-07-18 03:11:42
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui In directory usw-pr-cvs1:/tmp/cvs-serv24436/src/org/cdchamber/gui Modified Files: CDCMainFrame.java FilesTableModel.java Added Files: CDCMainFrameController.java Log Message: Refactoring GUI codes, add controller. --- NEW FILE: CDCMainFrameController.java --- /* * Created by IntelliJ IDEA. * User: Administrator * Date: Jul 18, 2002 * Time: 11:05:00 AM * To change template for new class use * Code Style | Class Templates options (Tools | IDE Options). */ package org.cdchamber.gui; import org.cdchamber.elements.DirectoryType; import org.cdchamber.util.DirPath; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreeSelectionModel; import java.io.*; public class CDCMainFrameController implements TreeSelectionListener { CDCMainFrame frame; public CDCMainFrameController( CDCMainFrame frame) { this.frame = frame; frame.directoryTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION); frame.directoryTree.setModel( new FileTreeModel( loadDataFiles())); } private DirectoryType loadDataFiles() { DirectoryType root = new DirectoryType(); File dataDir = new File( DirPath.DataDir); File[] rootFiles = dataDir.listFiles(); for ( int i=0; i<rootFiles.length; i++) { try { root.addFiles( DirectoryType.unmarshalDirectoryType( new FileReader( rootFiles[i]))); } catch (org.exolab.castor.xml.MarshalException e) { } catch (org.exolab.castor.xml.ValidationException e) { } catch (FileNotFoundException e) { } } root.setName( "CDRoms"); return root; } public void valueChanged(TreeSelectionEvent e) { DefaultMutableTreeNode node = (DefaultMutableTreeNode) frame.directoryTree.getLastSelectedPathComponent(); if (node == null) return; if (!node.isLeaf()) frame.directoryTree.expandPath(e.getNewLeadSelectionPath()); FilesTableModel dataModel = new FilesTableModel(node); frame.filesTable.setModel( dataModel); } } Index: CDCMainFrame.java =================================================================== RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/CDCMainFrame.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CDCMainFrame.java 18 Jul 2002 02:20:36 -0000 1.8 --- CDCMainFrame.java 18 Jul 2002 03:11:37 -0000 1.9 *************** *** 7,25 **** package org.cdchamber.gui; - import org.cdchamber.elements.DirectoryType; - import org.cdchamber.elements.FileType; - import org.cdchamber.util.DirPath; - import javax.swing.*; - import javax.swing.event.TreeSelectionListener; - import javax.swing.event.TreeSelectionEvent; - import javax.swing.tree.TreeSelectionModel; - import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.border.EtchedBorder; import java.awt.event.*; import java.awt.*; - import java.io.*; - import java.util.Vector; - import java.util.Enumeration; public class CDCMainFrame extends JFrame { --- 7,14 ---- *************** *** 38,42 **** --- 27,34 ---- JSplitPane mainPane = new JSplitPane(); + CDCMainFrameController controller; + public CDCMainFrame() { + controller = new CDCMainFrameController(this); enableEvents(AWTEvent.WINDOW_EVENT_MASK); try { *************** *** 63,103 **** mainPane.add( JSplitPane.RIGHT, new JScrollPane().getViewport().add( filesTable)); ! directoryTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION); ! directoryTree.setModel( new FileTreeModel( loadDataFiles())); ! ! directoryTree.addTreeSelectionListener(new TreeSelectionListener() { ! public void valueChanged(TreeSelectionEvent e) { ! DefaultMutableTreeNode node = (DefaultMutableTreeNode) ! directoryTree.getLastSelectedPathComponent(); ! ! if (node == null) return; ! ! if (!node.isLeaf()) directoryTree.expandPath(e.getNewLeadSelectionPath()); ! FilesTableModel dataModel = new FilesTableModel(node); ! filesTable.setModel( dataModel); ! } ! }); ! ! ! } ! ! private DirectoryType loadDataFiles() { ! DirectoryType root = new DirectoryType(); ! ! File dataDir = new File( DirPath.DataDir); ! File[] rootFiles = dataDir.listFiles(); ! for ( int i=0; i<rootFiles.length; i++) { ! try { ! root.addFiles( DirectoryType.unmarshalDirectoryType( new FileReader( rootFiles[i]))); ! } catch (org.exolab.castor.xml.MarshalException e) { ! } catch (org.exolab.castor.xml.ValidationException e) { ! } catch (FileNotFoundException e) { ! } ! } ! ! root.setName( "CDRoms"); ! return root; } - private void initMenuBar() { --- 55,60 ---- mainPane.add( JSplitPane.RIGHT, new JScrollPane().getViewport().add( filesTable)); ! directoryTree.addTreeSelectionListener( controller); } private void initMenuBar() { Index: FilesTableModel.java =================================================================== RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/FilesTableModel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FilesTableModel.java 18 Jul 2002 02:20:36 -0000 1.2 --- FilesTableModel.java 18 Jul 2002 03:11:37 -0000 1.3 *************** *** 41,44 **** --- 41,48 ---- } + public String getColumnName(int column) { + return columnHeads[ column].title; + } + static final public ColumnData columnHeads[] = { new ColumnData( "Name", 200, JLabel.LEFT ), |
|
From: <sim...@us...> - 2002-07-18 03:11:42
|
Update of /cvsroot/cdchamber/CDChamber In directory usw-pr-cvs1:/tmp/cvs-serv24436 Modified Files: TODO.txt Log Message: Refactoring GUI codes, add controller. Index: TODO.txt =================================================================== RCS file: /cvsroot/cdchamber/CDChamber/TODO.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TODO.txt 17 Jul 2002 08:18:50 -0000 1.9 --- TODO.txt 18 Jul 2002 03:11:37 -0000 1.10 *************** *** 10,12 **** + : Code Standard should be wrote. + : Add filter to ignore files/dirs like CVS, *.bak, *~, etc. ! + : Add GUI Testcases \ No newline at end of file --- 10,13 ---- + : Code Standard should be wrote. + : Add filter to ignore files/dirs like CVS, *.bak, *~, etc. ! + : Add GUI Testcases ! + : GUI codes need refactored. \ No newline at end of file |
|
From: <sim...@us...> - 2002-07-18 02:20:42
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv13972/src/org/cdchamber/gui
Modified Files:
CDCMainFrame.java FilesTableModel.java
Log Message:
Add the selected tree node be the model of the files table.
And testcase.
Index: CDCMainFrame.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/CDCMainFrame.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CDCMainFrame.java 18 Jul 2002 01:39:55 -0000 1.7
--- CDCMainFrame.java 18 Jul 2002 02:20:36 -0000 1.8
***************
*** 66,69 ****
--- 66,83 ----
directoryTree.setModel( new FileTreeModel( loadDataFiles()));
+ directoryTree.addTreeSelectionListener(new TreeSelectionListener() {
+ public void valueChanged(TreeSelectionEvent e) {
+ DefaultMutableTreeNode node = (DefaultMutableTreeNode)
+ directoryTree.getLastSelectedPathComponent();
+
+ if (node == null) return;
+
+ if (!node.isLeaf()) directoryTree.expandPath(e.getNewLeadSelectionPath());
+ FilesTableModel dataModel = new FilesTableModel(node);
+ filesTable.setModel( dataModel);
+ }
+ });
+
+
}
Index: FilesTableModel.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/FilesTableModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FilesTableModel.java 18 Jul 2002 00:32:23 -0000 1.1
--- FilesTableModel.java 18 Jul 2002 02:20:36 -0000 1.2
***************
*** 9,26 ****
package org.cdchamber.gui;
import javax.swing.table.AbstractTableModel;
public class FilesTableModel extends AbstractTableModel {
public int getRowCount() {
! return 0;
}
public int getColumnCount() {
! return 0;
}
public Object getValueAt(int rowIndex, int columnIndex) {
! return null;
}
}
--- 9,96 ----
package org.cdchamber.gui;
+ import org.cdchamber.elements.DirectoryType;
+ import org.cdchamber.elements.FileType;
+
import javax.swing.table.AbstractTableModel;
+ import javax.swing.tree.DefaultMutableTreeNode;
+ import javax.swing.*;
+ import java.text.NumberFormat;
+ import java.text.DateFormat;
+ import java.util.Date;
public class FilesTableModel extends AbstractTableModel {
+ public FilesTableModel() {
+ }
+
+ DirectoryType dir;
+ public DirectoryType getDir() {
+ return this.dir;
+ }
+
+ public FilesTableModel( DefaultMutableTreeNode node) {
+ dir = (DirectoryType)node.getUserObject();
+ }
+
public int getRowCount() {
! return dir.getFilesCount();
}
public int getColumnCount() {
! return columnHeads.length;
}
+ static final public ColumnData columnHeads[] = {
+ new ColumnData( "Name", 200, JLabel.LEFT ),
+ new ColumnData( "Size", 100, JLabel.RIGHT ),
+ new ColumnData( "Date", 200, JLabel.LEFT ),
+ new ColumnData( "Describe", 200, JLabel.LEFT ),
+ };
+
+ public static final int NAME = 0;
+ public static final int SIZE = 1;
+ public static final int DATE = 2;
+ public static final int DESC = 3;
+
+
public Object getValueAt(int rowIndex, int columnIndex) {
! if ( rowIndex <0 || rowIndex > dir.getFilesCount()-1) return null;
! FileType ft = (FileType) dir.getFiles( rowIndex);
! switch ( columnIndex) {
! case NAME:
! return ft;
! case SIZE:
! return FilesTableModel.sizeToString( ft.getSize());
! case DATE:
! return FilesTableModel.longToDateString( ft.getDate());
! case DESC:
! return ft.getDesc();
! }
! return "";
! }
!
! private static long KB=1024;
! private static NumberFormat nf = NumberFormat.getNumberInstance();
! public static String sizeToString( long size) {
! return nf.format((size+KB-1) / KB)+"KB";
! }
!
! private static DateFormat df = DateFormat.getDateTimeInstance( DateFormat.MEDIUM, DateFormat.MEDIUM);
! public static String longToDateString( long date) {
! return df.format( new Date( date));
! }
!
! }
!
! class ColumnData {
!
! public String title;
! public int width;
! public int alignment;
!
! public ColumnData(String title, int width, int alignment) {
! this.title = title;
! this.width = width;
! this.alignment = alignment;
}
}
|
|
From: <sim...@us...> - 2002-07-18 02:20:41
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui In directory usw-pr-cvs1:/tmp/cvs-serv13972/test/src/org/cdchamber/gui Modified Files: CDCMainFrameTest.java Log Message: Add the selected tree node be the model of the files table. And testcase. Index: CDCMainFrameTest.java =================================================================== RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui/CDCMainFrameTest.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CDCMainFrameTest.java 17 Jul 2002 12:17:55 -0000 1.7 --- CDCMainFrameTest.java 18 Jul 2002 02:20:38 -0000 1.8 *************** *** 13,16 **** --- 13,17 ---- import javax.swing.tree.DefaultMutableTreeNode; + import javax.swing.tree.TreePath; import java.util.Vector; import java.io.*; *************** *** 68,71 **** --- 69,80 ---- return dirs; + } + + public void testTreeNodeChanged() { + frame.directoryTree.setSelectionRow(2); + TreePath path = frame.directoryTree.getSelectionPath(); + Object selected = ((DefaultMutableTreeNode)path.getLastPathComponent()).getUserObject(); + FilesTableModel tableModel = (FilesTableModel)frame.filesTable.getModel(); + if ( !selected.equals( tableModel.getDir())) fail( "The selected directory should be the table's directory"); } } |
|
From: <sim...@us...> - 2002-07-18 01:39:58
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv4518/src/org/cdchamber/gui
Modified Files:
CDCMainFrame.java
Log Message:
try fix mail.
Index: CDCMainFrame.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/CDCMainFrame.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CDCMainFrame.java 18 Jul 2002 01:32:52 -0000 1.6
--- CDCMainFrame.java 18 Jul 2002 01:39:55 -0000 1.7
***************
*** 66,92 ****
directoryTree.setModel( new FileTreeModel( loadDataFiles()));
- directoryTree.addTreeSelectionListener(new TreeSelectionListener() {
- public void valueChanged(TreeSelectionEvent e) {
- DefaultMutableTreeNode node = (DefaultMutableTreeNode)
- directoryTree.getLastSelectedPathComponent();
-
- if (node == null) return;
-
- Object nodeInfo = node.getUserObject();
- if (!node.isLeaf()) jTree.expandPath(e.getNewLeadSelectionPath());
- if (nodeInfo.equals("ROOT")) {
- Vector v = new Vector();
- Enumeration enu = node.children();
- while (enu.hasMoreElements()) {
- v.add((((Root) ((DefaultMutableTreeNode) enu.nextElement()).getUserObject())));
- }
- FilesTableModel.getTableModel(v.toArray(new FileType[0]));
- } else
- jTable.setModel(FilesTableModel.getTableModel(nodeInfo));
- ((FilesTableModel) jTable.getModel()).sortData();
- currentNode = node;
- }
- });
-
}
--- 66,69 ----
|
|
From: <sim...@us...> - 2002-07-18 01:32:56
|
Update of /cvsroot/cdchamber/CDChamber/data In directory usw-pr-cvs1:/tmp/cvs-serv2955/data Added Files: result.xml Log Message: Let the build fail, to test the continuous integrate. --- NEW FILE: result.xml --- <?xml version="1.0" encoding="UTF-8"?> <directory-type files-count="3" date="1025147775000" size="9525" valid="true"><name>testcase</name><files files-count="2" date="1025069812000" size="9525" valid="true" xsi:type="java:org.cdchamber.elements.DirectoryType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><name>testtools</name><files files-count="2" date="1025149792000" size="4763" valid="true" xsi:type="java:org.cdchamber.elements.DirectoryType"><name>difffiles</name><files date="1024728070000" size="2381" valid="true"><name>file1.txt</name></files><files date="1024728070000" size="2382" valid="true"><name>file2.txt</name></files><content></content></files><files files-count="2" date="1025069812000" size="4762" valid="true" xsi:type="java:org.cdchamber.elements.DirectoryType"><name>samefiles</name><files date="1024728070000" size="2381" valid="true"><name>file1.txt</name></files><files date="1024728070000" size="2381" valid="true"><name>file2.txt</name></files><content></content></files><content></content></files><files date="1024999342000" size="0" valid="true"><name>nullFile</name></files><files files-count="0" date="1025086602000" size="0" valid="true" xsi:type="java:org.cdchamber.elements.DirectoryType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><name>nulldir</name><content></content></files><content></content></directory-type> |
|
From: <sim...@us...> - 2002-07-18 01:32:56
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui In directory usw-pr-cvs1:/tmp/cvs-serv2955/src/org/cdchamber/gui Modified Files: CDCMainFrame.java Log Message: Let the build fail, to test the continuous integrate. Index: CDCMainFrame.java =================================================================== RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/CDCMainFrame.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CDCMainFrame.java 17 Jul 2002 12:17:55 -0000 1.5 --- CDCMainFrame.java 18 Jul 2002 01:32:52 -0000 1.6 *************** *** 8,18 **** --- 8,25 ---- import org.cdchamber.elements.DirectoryType; + import org.cdchamber.elements.FileType; import org.cdchamber.util.DirPath; import javax.swing.*; + import javax.swing.event.TreeSelectionListener; + import javax.swing.event.TreeSelectionEvent; + import javax.swing.tree.TreeSelectionModel; + import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.border.EtchedBorder; import java.awt.event.*; import java.awt.*; import java.io.*; + import java.util.Vector; + import java.util.Enumeration; public class CDCMainFrame extends JFrame { *************** *** 56,60 **** --- 63,92 ---- mainPane.add( JSplitPane.RIGHT, new JScrollPane().getViewport().add( filesTable)); + directoryTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION); directoryTree.setModel( new FileTreeModel( loadDataFiles())); + + directoryTree.addTreeSelectionListener(new TreeSelectionListener() { + public void valueChanged(TreeSelectionEvent e) { + DefaultMutableTreeNode node = (DefaultMutableTreeNode) + directoryTree.getLastSelectedPathComponent(); + + if (node == null) return; + + Object nodeInfo = node.getUserObject(); + if (!node.isLeaf()) jTree.expandPath(e.getNewLeadSelectionPath()); + if (nodeInfo.equals("ROOT")) { + Vector v = new Vector(); + Enumeration enu = node.children(); + while (enu.hasMoreElements()) { + v.add((((Root) ((DefaultMutableTreeNode) enu.nextElement()).getUserObject()))); + } + FilesTableModel.getTableModel(v.toArray(new FileType[0])); + } else + jTable.setModel(FilesTableModel.getTableModel(nodeInfo)); + ((FilesTableModel) jTable.getModel()).sortData(); + currentNode = node; + } + }); + } |
|
From: <sim...@us...> - 2002-07-18 01:13:47
|
Update of /cvsroot/cdchamber/CDChamber
In directory usw-pr-cvs1:/tmp/cvs-serv31577
Modified Files:
build.xml
Log Message:
let the src_gen executed everytime the xsd file and the properties file changed.
Index: build.xml
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/build.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** build.xml 18 Jul 2002 00:32:22 -0000 1.22
--- build.xml 18 Jul 2002 01:13:44 -0000 1.23
***************
*** 44,53 ****
<mkdir dir="${jar.dir}"/>
<mkdir dir="${junit.results}"/>
! <uptodate property="xmlBuild.notRequired" targetfile="${src.dir}/org/cdchamber/elements/FileType.java">
! <srcfiles dir="${basedir}">
! <includesfile name="src/cdchamber.xsd"/>
! <includesfile name="lib/castorbuilder.properties"/>
! </srcfiles>
! </uptodate>
</target>
--- 44,57 ----
<mkdir dir="${jar.dir}"/>
<mkdir dir="${junit.results}"/>
! <condition property="xmlBuild.notRequired">
! <and>
! <uptodate property="xsdUptodate" targetfile="${src.dir}/org/cdchamber/elements/FileType.java">
! <srcfiles dir="${src.dir}" includes="cdchamber.xsd"/>
! </uptodate>
! <uptodate property="propertiesUptodate" targetfile="${src.dir}/org/cdchamber/elements/FileType.java">
! <srcfiles dir="${basedir}/lib/" includes="castorbuilder.properties"/>
! </uptodate>
! </and>
! </condition>
</target>
|
|
From: <sim...@us...> - 2002-07-18 00:32:25
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv21392/src/org/cdchamber/gui
Added Files:
FilesTableModel.java
Log Message:
Add the table model. More functions needed.
--- NEW FILE: FilesTableModel.java ---
/*
* Created by IntelliJ IDEA.
* User: Administrator
* Date: Jul 17, 2002
* Time: 9:06:20 PM
* To change template for new class use
* Code Style | Class Templates options (Tools | IDE Options).
*/
package org.cdchamber.gui;
import javax.swing.table.AbstractTableModel;
public class FilesTableModel extends AbstractTableModel {
public int getRowCount() {
return 0;
}
public int getColumnCount() {
return 0;
}
public Object getValueAt(int rowIndex, int columnIndex) {
return null;
}
}
|
|
From: <sim...@us...> - 2002-07-18 00:32:25
|
Update of /cvsroot/cdchamber/CDChamber/data In directory usw-pr-cvs1:/tmp/cvs-serv21392/data Added Files: repository.xml Log Message: Add the table model. More functions needed. --- NEW FILE: repository.xml --- <?xml version="1.0" encoding="UTF-8"?> <directory-type files-count="2" date="1025685715000" size="2" valid="true"><name>foo</name><files files-count="1" date="1025685715000" size="1" valid="true" xsi:type="java:org.cdchamber.elements.DirectoryType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><name>bar</name><files date="1025685715000" size="1" valid="true"><name>world</name></files><content></content></files><files date="1025685715000" size="1" valid="true"><name>hello</name></files><content></content></directory-type> |
|
From: <sim...@us...> - 2002-07-18 00:32:25
|
Update of /cvsroot/cdchamber/CDChamber
In directory usw-pr-cvs1:/tmp/cvs-serv21392
Modified Files:
build.xml
Log Message:
Add the table model. More functions needed.
Index: build.xml
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/build.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** build.xml 2 Jul 2002 08:33:25 -0000 1.21
--- build.xml 18 Jul 2002 00:32:22 -0000 1.22
***************
*** 44,49 ****
<mkdir dir="${jar.dir}"/>
<mkdir dir="${junit.results}"/>
! <uptodate property="xmlBuild.notRequired" targetfile="${src.dir}/org/cdchamber/elements/FileType.java" >
! <srcfiles dir= "${src.dir}" includes="**/*.xsd"/>
</uptodate>
</target>
--- 44,52 ----
<mkdir dir="${jar.dir}"/>
<mkdir dir="${junit.results}"/>
! <uptodate property="xmlBuild.notRequired" targetfile="${src.dir}/org/cdchamber/elements/FileType.java">
! <srcfiles dir="${basedir}">
! <includesfile name="src/cdchamber.xsd"/>
! <includesfile name="lib/castorbuilder.properties"/>
! </srcfiles>
</uptodate>
</target>
|
