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: <sim...@us...> - 2002-07-21 11:20:15
|
Update of /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/elements
In directory usw-pr-cvs1:/tmp/cvs-serv15007/aspect/src/org/cdchamber/elements
Modified Files:
CDRomType.java
Log Message:
User can modify cdrom's name now.
Index: CDRomType.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/elements/CDRomType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CDRomType.java 20 Jul 2002 08:55:55 -0000 1.1
--- CDRomType.java 21 Jul 2002 11:20:12 -0000 1.2
***************
*** 6,12 ****
import org.exolab.castor.xml.*;
! import java.io.Writer;
! import java.io.File;
public class CDRomType extends DirectoryType {
--- 6,12 ----
import org.exolab.castor.xml.*;
+ import org.cdchamber.util.DirPath;
! import java.io.*;
public class CDRomType extends DirectoryType {
***************
*** 36,40 ****
}
! public void marshal(Writer out) throws MarshalException, ValidationException {
super.marshal(out);
}
--- 36,41 ----
}
! public void marshal() throws MarshalException, ValidationException, IOException {
! Writer out = new FileWriter( DirPath.DataDir + DirPath.SEP + getDataFileName());
super.marshal(out);
}
|
|
From: <sim...@us...> - 2002-07-21 11:20:15
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv15007/src/org/cdchamber/gui
Modified Files:
CDCMainFrame.java FileTree.java
Log Message:
User can modify cdrom's name now.
Index: CDCMainFrame.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/CDCMainFrame.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** CDCMainFrame.java 20 Jul 2002 08:55:56 -0000 1.15
--- CDCMainFrame.java 21 Jul 2002 11:20:12 -0000 1.16
***************
*** 10,14 ****
import javax.swing.table.TableModel;
import javax.swing.tree.TreeModel;
- import javax.swing.tree.TreeSelectionModel;
import javax.swing.border.EtchedBorder;
import java.awt.event.*;
--- 10,13 ----
***************
*** 27,31 ****
JMenuItem cdromExitMenuItem = new JMenuItem();
JSplitPane mainPane = new JSplitPane();
! JTree directoryTree = new JTree();
JTable filesTable = new JTable();
--- 26,30 ----
JMenuItem cdromExitMenuItem = new JMenuItem();
JSplitPane mainPane = new JSplitPane();
! JTree directoryTree = new FileTree();
JTable filesTable = new JTable();
***************
*** 65,69 ****
super();
- directoryTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
controller = new CDCMainFrameController(this);
--- 64,67 ----
Index: FileTree.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/FileTree.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FileTree.java 21 Jul 2002 10:28:42 -0000 1.1
--- FileTree.java 21 Jul 2002 11:20:12 -0000 1.2
***************
*** 5,8 ****
--- 5,10 ----
package org.cdchamber.gui;
+ import org.cdchamber.elements.CDRomType;
+
import javax.swing.*;
import javax.swing.tree.*;
***************
*** 11,14 ****
--- 13,28 ----
public FileTree() {
setEditable( true);
+ setInvokesStopCellEditing( true);
+ getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
+ this.setCellEditor( new DefaultTreeCellEditor( this, new DefaultTreeCellRenderer()) {
+ public Object getCellEditorValue() {
+ String cdromName = (String) realEditor.getCellEditorValue();;
+ DefaultMutableTreeNode cdromNode = (DefaultMutableTreeNode)this.lastPath.getLastPathComponent();
+ CDRomType cdrom = (CDRomType)cdromNode.getUserObject();
+ cdrom.setName( cdromName);
+ return cdrom;
+ }
+ });
+
}
|
|
From: <sim...@us...> - 2002-07-21 10:28:46
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv606/test/src/org/cdchamber/gui
Modified Files:
CDCMainFrameControllerTest.java
Added Files:
FileTreeTest.java
Log Message:
User can change the name of cdroms at the tree.
--- NEW FILE: FileTreeTest.java ---
/*
* User: Simon
* $Id: FileTreeTest.java,v 1.1 2002/07/21 10:28:42 simon_lei Exp $
*/
package org.cdchamber.gui;
import junit.framework.TestCase;
import javax.swing.tree.TreePath;
import javax.swing.tree.DefaultMutableTreeNode;
import org.cdchamber.elements.*;
public class FileTreeTest extends TestCase {
public FileTreeTest(String s) {
super(s);
DirectoryType root = new DirectoryType();
CDRomType cdrom = new CDRomType( new DirectoryType());
DirectoryType dir = new DirectoryType();
dir.addFiles( new FileType());
cdrom.addFiles( dir);
root.addFiles( cdrom);
tree = new FileTree();
tree.setModel( new FileTreeModel( root));
}
FileTree tree;
protected void setUp() throws Exception {
super.setUp();
}
protected void tearDown() throws Exception {
super.tearDown();
}
public void testRootNotEditable() throws Exception {
tree.startEditingAtPath( new TreePath( tree.getModel().getRoot()));
assertNull( "Root should not be editable", tree.getEditingPath());
}
public void testCDRomEditable() throws Exception {
tree.startEditingAtPath( new TreePath(
new Object[]{ tree.getModel().getRoot(),
((DefaultMutableTreeNode)tree.getModel().getRoot()).getChildAt(0)
}
));
assertNotNull( "Should be editable", tree.getEditingPath());
}
public void testDirectoryNotEditable() throws Exception {
DefaultMutableTreeNode root = (DefaultMutableTreeNode)tree.getModel().getRoot();
DefaultMutableTreeNode cdrom = (DefaultMutableTreeNode)root.getChildAt(0);
tree.startEditingAtPath( new TreePath(
new Object[]{ root,
cdrom,
cdrom.getChildAt(0)
}
));
assertNull( "Leaf should not be editable", tree.getEditingPath());
}
}
Index: CDCMainFrameControllerTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui/CDCMainFrameControllerTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CDCMainFrameControllerTest.java 20 Jul 2002 08:55:56 -0000 1.8
--- CDCMainFrameControllerTest.java 21 Jul 2002 10:28:42 -0000 1.9
***************
*** 31,40 ****
File dataDir = new File( DirPath.DataDir);
fileNames = dataDir.list( new XmlFilenameFilter());
- System.out.println( "Setuped.");
}
protected void tearDown() throws Exception {
super.tearDown();
- System.out.println( "teardowning...");
File dataDir = new File( DirPath.DataDir);
String[] newFiles = dataDir.list( new XmlFilenameFilter());
--- 31,38 ----
***************
*** 53,59 ****
}
! private void removeFile( String name) {
File file = new File( DirPath.DataDir + DirPath.SEP + name);
! file.delete();
}
--- 51,57 ----
}
! private void removeFile( String name) throws Exception{
File file = new File( DirPath.DataDir + DirPath.SEP + name);
! if ( !file.delete()) throw new Exception( "Can't remove file:" + name);
}
***************
*** 110,114 ****
public void testDeleteCDRomAction() throws Exception {
! /*
Action action = controller.getCreateNewCDRomAction();
frame.nullFile = false;
--- 108,112 ----
public void testDeleteCDRomAction() throws Exception {
!
Action action = controller.getCreateNewCDRomAction();
frame.nullFile = false;
***************
*** 116,130 ****
action.actionPerformed(null);
assertTrue( "add new data file for delete", hasNewerData());
- */
Object root = frame.treeModel.getRoot();
int cdromNumber = frame.treeModel.getChildCount( root);
- /*
- Object newCDRom = frame.treeModel.getChild( root, cdromNumber-1);
- System.out.println( "ROOT:" + root);
- System.out.println( "OBject:" + newCDRom);
- System.out.println( "Count:" + cdromNumber);
- */
-
JTree jTree = new JTree();
--- 114,120 ----
***************
*** 134,138 ****
jTree.setSelectionRow( cdromNumber);
! Action action = controller.getDeleteCDRomAction();
action.actionPerformed(null);
assertTrue( "Should delete the new data file", !hasNewerData());
--- 124,128 ----
jTree.setSelectionRow( cdromNumber);
! action = controller.getDeleteCDRomAction();
action.actionPerformed(null);
assertTrue( "Should delete the new data file", !hasNewerData());
***************
*** 167,171 ****
if ( nullFile) return null;
if ( wrongFile) return "/no/such/directory";
! return DirPath.BaseDir;
}
--- 157,161 ----
if ( nullFile) return null;
if ( wrongFile) return "/no/such/directory";
! return DirPath.TestCaseDir;
}
|
|
From: <sim...@us...> - 2002-07-21 10:28:46
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv606/src/org/cdchamber/gui
Added Files:
FileTree.java
Log Message:
User can change the name of cdroms at the tree.
--- NEW FILE: FileTree.java ---
/*
* User: Simon
* $Id: FileTree.java,v 1.1 2002/07/21 10:28:42 simon_lei Exp $
*/
package org.cdchamber.gui;
import javax.swing.*;
import javax.swing.tree.*;
public class FileTree extends JTree {
public FileTree() {
setEditable( true);
}
public boolean isPathEditable(TreePath path) {
DefaultMutableTreeNode lastPathComponent = (DefaultMutableTreeNode)path.getLastPathComponent();
TreeNode parent = lastPathComponent.getParent();
if ( parent == null) return false;
if ( parent.equals( this.getModel().getRoot())) return true;
return false;
}
}
|
|
From: <sim...@us...> - 2002-07-20 08:56:01
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv20248/src/org/cdchamber/gui
Modified Files:
CDCMainFrame.java CDCMainFrameController.java
Log Message:
User can delete cdrom.
Index: CDCMainFrame.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/CDCMainFrame.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** CDCMainFrame.java 19 Jul 2002 05:25:20 -0000 1.14
--- CDCMainFrame.java 20 Jul 2002 08:55:56 -0000 1.15
***************
*** 22,25 ****
--- 22,26 ----
JMenuItem cdromCreateMenuItem = new JMenuItem();
JMenuItem cdromImportMenuItem = new JMenuItem();
+ JMenuItem cdromDeleteMenuItem = new JMenuItem();
JMenu helpMenu = new JMenu();
JMenuItem helpAboutMenuItem = new JMenuItem();
***************
*** 104,107 ****
--- 105,109 ----
cdromCreateMenuItem.setAction( controller.getCreateNewCDRomAction());
cdromImportMenuItem.setAction( controller.getImportCDRomAction());
+ cdromDeleteMenuItem.setAction( controller.getDeleteCDRomAction());
helpMenu.setMnemonic('H');
helpMenu.setText("Help");
***************
*** 119,122 ****
--- 121,125 ----
cdromMenu.add(cdromCreateMenuItem);
cdromMenu.add(cdromImportMenuItem);
+ cdromMenu.add(cdromDeleteMenuItem);
helpMenu.add(helpAboutMenuItem);
cdromMenu.addSeparator();
Index: CDCMainFrameController.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/CDCMainFrameController.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CDCMainFrameController.java 19 Jul 2002 05:25:20 -0000 1.7
--- CDCMainFrameController.java 20 Jul 2002 08:55:56 -0000 1.8
***************
*** 10,13 ****
--- 10,14 ----
import org.cdchamber.elements.DirectoryType;
+ import org.cdchamber.elements.CDRomType;
import org.cdchamber.util.DirPath;
***************
*** 36,40 ****
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) {
--- 37,44 ----
for ( int i=0; i<rootFiles.length; i++) {
try {
! DirectoryType vFiles = DirectoryType.unmarshalDirectoryType( new FileReader( rootFiles[i]));
! CDRomType cdrom = new CDRomType( vFiles);
! cdrom.setDataFileName( rootFiles[i].getAbsolutePath());
! root.addFiles( cdrom);
} catch (org.exolab.castor.xml.MarshalException e) {
} catch (org.exolab.castor.xml.ValidationException e) {
***************
*** 47,50 ****
--- 51,56 ----
}
+
+ private DefaultMutableTreeNode selectedNode;
public void valueChanged(TreeSelectionEvent e) {
JTree tree = (JTree)e.getSource();
***************
*** 52,55 ****
--- 58,62 ----
tree.getLastSelectedPathComponent();
+ selectedNode = node;
if (node == null) return;
***************
*** 66,69 ****
--- 73,80 ----
}
+ public Action getDeleteCDRomAction() {
+ return new DeleteCDRomAction();
+ }
+
public class CreateNewCDRomAction extends AbstractAction {
public CreateNewCDRomAction() {
***************
*** 107,110 ****
--- 118,135 ----
}
+ public class DeleteCDRomAction extends AbstractAction {
+ public DeleteCDRomAction() {
+ putValue( Action.NAME, "Delete");
+ putValue( Action.MNEMONIC_KEY, new Integer('D'));
+ }
+ public void actionPerformed(ActionEvent e) {
+ if ( selectedNode == null) return;
+ if ( selectedNode.isRoot()) return;
+ DefaultMutableTreeNode cdromNode = (DefaultMutableTreeNode)selectedNode.getPath()[1];
+ CDRomType cdrom = (CDRomType)( cdromNode.getUserObject());
+ cdrom.delete();
+ frame.setDirectoryTreeModel( new FileTreeModel( loadDataFiles()));
+ }
+ }
}
|
|
From: <sim...@us...> - 2002-07-20 08:56:01
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv20248/test/src/org/cdchamber/gui
Modified Files:
CDCMainFrameControllerTest.java
Log Message:
User can delete cdrom.
Index: CDCMainFrameControllerTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui/CDCMainFrameControllerTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CDCMainFrameControllerTest.java 19 Jul 2002 07:30:18 -0000 1.7
--- CDCMainFrameControllerTest.java 20 Jul 2002 08:55:56 -0000 1.8
***************
*** 7,11 ****
import junit.framework.TestCase;
! import javax.swing.tree.TreeModel;
import javax.swing.table.TableModel;
import javax.swing.*;
--- 7,11 ----
import junit.framework.TestCase;
! import javax.swing.tree.*;
import javax.swing.table.TableModel;
import javax.swing.*;
***************
*** 31,39 ****
File dataDir = new File( DirPath.DataDir);
fileNames = dataDir.list( new XmlFilenameFilter());
}
protected void tearDown() throws Exception {
super.tearDown();
!
File dataDir = new File( DirPath.DataDir);
String[] newFiles = dataDir.list( new XmlFilenameFilter());
--- 31,40 ----
File dataDir = new File( DirPath.DataDir);
fileNames = dataDir.list( new XmlFilenameFilter());
+ System.out.println( "Setuped.");
}
protected void tearDown() throws Exception {
super.tearDown();
! System.out.println( "teardowning...");
File dataDir = new File( DirPath.DataDir);
String[] newFiles = dataDir.list( new XmlFilenameFilter());
***************
*** 108,111 ****
--- 109,142 ----
}
+ public void testDeleteCDRomAction() throws Exception {
+ /*
+ Action action = controller.getCreateNewCDRomAction();
+ frame.nullFile = false;
+ frame.wrongFile = false;
+ action.actionPerformed(null);
+ assertTrue( "add new data file for delete", hasNewerData());
+ */
+
+ Object root = frame.treeModel.getRoot();
+ int cdromNumber = frame.treeModel.getChildCount( root);
+ /*
+ Object newCDRom = frame.treeModel.getChild( root, cdromNumber-1);
+ System.out.println( "ROOT:" + root);
+ System.out.println( "OBject:" + newCDRom);
+ System.out.println( "Count:" + cdromNumber);
+ */
+
+
+ JTree jTree = new JTree();
+ jTree.setModel( frame.treeModel);
+ jTree.addTreeSelectionListener( controller);
+ jTree.setSelectionRow( 0);
+ jTree.setSelectionRow( cdromNumber);
+
+ Action action = controller.getDeleteCDRomAction();
+ action.actionPerformed(null);
+ assertTrue( "Should delete the new data file", !hasNewerData());
+ }
+
private boolean hasNewerData() {
File dataDir = new File( DirPath.DataDir);
***************
*** 114,117 ****
--- 145,149 ----
return false;
}
+
}
|
|
From: <sim...@us...> - 2002-07-20 08:56:00
|
Update of /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/elements
In directory usw-pr-cvs1:/tmp/cvs-serv20248/aspect/src/org/cdchamber/elements
Added Files:
CDRomType.java
Log Message:
User can delete cdrom.
--- NEW FILE: CDRomType.java ---
/*
* User: Simon
* $Id: CDRomType.java,v 1.1 2002/07/20 08:55:55 simon_lei Exp $
*/
package org.cdchamber.elements;
import org.exolab.castor.xml.*;
import java.io.Writer;
import java.io.File;
public class CDRomType extends DirectoryType {
public String getDataFileName() {
return dataFileName;
}
public void setDataFileName(String dataFileName) {
this.dataFileName = dataFileName;
}
public void delete() {
File dataFile = new File( dataFileName);
dataFile.delete();
}
private String dataFileName;
public CDRomType( DirectoryType dir) {
this.setContent( dir.getContent());
this.setDate( dir.getDate());
this.setDesc( dir.getDesc());
this.setFiles( dir.getFiles());
this.setName( dir.getName());
this.setSize( dir.getSize());
}
public void marshal(Writer out) throws MarshalException, ValidationException {
super.marshal(out);
}
}
|
|
From: <sim...@us...> - 2002-07-19 07:30:24
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv28492/test/src/org/cdchamber/gui
Modified Files:
CDCMainFrameControllerTest.java
Log Message:
Use new method to judge whether there are new files.
And delete new data files at the teardown.
Index: CDCMainFrameControllerTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui/CDCMainFrameControllerTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CDCMainFrameControllerTest.java 19 Jul 2002 06:09:41 -0000 1.6
--- CDCMainFrameControllerTest.java 19 Jul 2002 07:30:18 -0000 1.7
***************
*** 23,36 ****
MockCDCMainFrame frame;
CDCMainFrameController controller;
! long currTime;
protected void setUp() throws Exception {
super.setUp();
frame = new MockCDCMainFrame();
controller = new CDCMainFrameController( frame);
! currTime = System.currentTimeMillis();
}
protected void tearDown() throws Exception {
super.tearDown();
}
--- 23,58 ----
MockCDCMainFrame frame;
CDCMainFrameController controller;
! String[] fileNames;
protected void setUp() throws Exception {
super.setUp();
frame = new MockCDCMainFrame();
controller = new CDCMainFrameController( frame);
!
! File dataDir = new File( DirPath.DataDir);
! fileNames = dataDir.list( new XmlFilenameFilter());
}
protected void tearDown() throws Exception {
super.tearDown();
+
+ File dataDir = new File( DirPath.DataDir);
+ String[] newFiles = dataDir.list( new XmlFilenameFilter());
+ if ( newFiles.length <= fileNames.length) return;
+
+ for ( int i=0; i<newFiles.length; i++) {
+ if ( newFile( newFiles[i])) removeFile( newFiles[i]);
+ }
+ }
+
+ private boolean newFile( String name) {
+ for ( int i=0; i<fileNames.length; i++) {
+ if ( name.equals( fileNames[i])) return false;
+ }
+ return true;
+ }
+
+ private void removeFile( String name) {
+ File file = new File( DirPath.DataDir + DirPath.SEP + name);
+ file.delete();
}
***************
*** 88,95 ****
private boolean hasNewerData() {
File dataDir = new File( DirPath.DataDir);
! File[] files = dataDir.listFiles( new XmlFilenameFilter());
! for ( int i=0; i<files.length; i++) {
! if ( files[i].lastModified() > currTime) return true;
! }
return false;
}
--- 110,115 ----
private boolean hasNewerData() {
File dataDir = new File( DirPath.DataDir);
! String[] newFiles = dataDir.list( new XmlFilenameFilter());
! if ( newFiles.length > fileNames.length ) return true;
return false;
}
|
|
From: <sim...@us...> - 2002-07-19 06:09:45
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv31198/test/src/org/cdchamber/gui
Modified Files:
CDCMainFrameControllerTest.java
Log Message:
Fix for build fail.
Index: CDCMainFrameControllerTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui/CDCMainFrameControllerTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CDCMainFrameControllerTest.java 19 Jul 2002 05:58:32 -0000 1.5
--- CDCMainFrameControllerTest.java 19 Jul 2002 06:09:41 -0000 1.6
***************
*** 75,79 ****
frame.wrongFile = false;
action.actionPerformed(null);
! assertTrue( "Should create any new data file", hasNewerData());
}
--- 75,79 ----
frame.wrongFile = false;
action.actionPerformed(null);
! assertTrue( "Should create a new data file", hasNewerData());
}
***************
*** 83,87 ****
frame.wrongFile = false;
action.actionPerformed(null);
! assertTrue( "Should import any new data file", hasNewerData());
}
--- 83,87 ----
frame.wrongFile = false;
action.actionPerformed(null);
! assertTrue( "Should import a new data file", hasNewerData());
}
|
|
From: <sim...@us...> - 2002-07-19 05:58:35
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv27863/test/src/org/cdchamber/gui
Modified Files:
CDCMainFrameControllerTest.java
Log Message:
Action testcased finished.
Index: CDCMainFrameControllerTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui/CDCMainFrameControllerTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CDCMainFrameControllerTest.java 19 Jul 2002 05:55:55 -0000 1.4
--- CDCMainFrameControllerTest.java 19 Jul 2002 05:58:32 -0000 1.5
***************
*** 70,73 ****
--- 70,89 ----
}
+ public void testCreateNewCDRomAction() throws Exception {
+ Action action = controller.getCreateNewCDRomAction();
+ frame.nullFile = false;
+ frame.wrongFile = false;
+ action.actionPerformed(null);
+ assertTrue( "Should create any new data file", hasNewerData());
+ }
+
+ public void testImportCDRomAction() throws Exception{
+ Action action = controller.getImportCDRomAction();
+ frame.nullFile = false;
+ frame.wrongFile = false;
+ action.actionPerformed(null);
+ assertTrue( "Should import any new data file", hasNewerData());
+ }
+
private boolean hasNewerData() {
File dataDir = new File( DirPath.DataDir);
***************
*** 115,119 ****
public void dealWithActionException( String message, Exception exception) {
this.exception = exception;
- System.out.println( "MMMMMMMMMM:"+message);
}
}
--- 131,134 ----
|
|
From: <sim...@us...> - 2002-07-19 05:55:58
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv27325/test/src/org/cdchamber/gui
Modified Files:
CDCMainFrameControllerTest.java
Log Message:
Adding the testcases.
Index: CDCMainFrameControllerTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui/CDCMainFrameControllerTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CDCMainFrameControllerTest.java 19 Jul 2002 05:48:52 -0000 1.3
--- CDCMainFrameControllerTest.java 19 Jul 2002 05:55:55 -0000 1.4
***************
*** 64,68 ****
public void testWrongImportCDRomAction() throws Exception{
Action action = controller.getImportCDRomAction();
! frame.nullFile = true;
frame.wrongFile = true;
action.actionPerformed(null);
--- 64,68 ----
public void testWrongImportCDRomAction() throws Exception{
Action action = controller.getImportCDRomAction();
! frame.nullFile = false;
frame.wrongFile = true;
action.actionPerformed(null);
***************
*** 115,118 ****
--- 115,119 ----
public void dealWithActionException( String message, Exception exception) {
this.exception = exception;
+ System.out.println( "MMMMMMMMMM:"+message);
}
}
|
|
From: <sim...@us...> - 2002-07-19 05:48:56
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv25814/test/src/org/cdchamber/gui
Modified Files:
CDCMainFrameControllerTest.java
Log Message:
Adding test cases.
Index: CDCMainFrameControllerTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui/CDCMainFrameControllerTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CDCMainFrameControllerTest.java 19 Jul 2002 05:25:20 -0000 1.2
--- CDCMainFrameControllerTest.java 19 Jul 2002 05:48:52 -0000 1.3
***************
*** 11,14 ****
--- 11,19 ----
import javax.swing.*;
+ import org.cdchamber.util.DirPath;
+
+ import java.io.File;
+ import java.io.FilenameFilter;
+
public class CDCMainFrameControllerTest extends TestCase {
public CDCMainFrameControllerTest(String s) {
***************
*** 18,25 ****
--- 23,32 ----
MockCDCMainFrame frame;
CDCMainFrameController controller;
+ long currTime;
protected void setUp() throws Exception {
super.setUp();
frame = new MockCDCMainFrame();
controller = new CDCMainFrameController( frame);
+ currTime = System.currentTimeMillis();
}
***************
*** 33,54 ****
}
! public void testCreateNewCDRomAction() throws Exception{
Action action = controller.getCreateNewCDRomAction();
action.actionPerformed(null);
}
! public void testImportCDRomAction() throws Exception{
Action action = controller.getImportCDRomAction();
action.actionPerformed(null);
}
}
class MockCDCMainFrame implements ICDCMainFrame {
public String getUserChoosedDataFile() {
! return null;
}
public String getUserChoosedDirectory() {
! return null;
}
--- 40,103 ----
}
! public void testNullCreateNewCDRomAction() throws Exception{
Action action = controller.getCreateNewCDRomAction();
+ frame.nullFile = true;
action.actionPerformed(null);
+ assertTrue( "Should not add any new data file", !hasNewerData());
}
! public void testNullImportCDRomAction() throws Exception{
Action action = controller.getImportCDRomAction();
+ frame.nullFile = true;
+ action.actionPerformed(null);
+ assertTrue( "Should not import any new data file", !hasNewerData());
+ }
+
+ public void testWrongCreateNewCDRomAction() throws Exception {
+ Action action = controller.getCreateNewCDRomAction();
+ frame.nullFile = false;
+ frame.wrongFile = true;
action.actionPerformed(null);
+ assertNotNull( "Exception should not be null", frame.exception);
+ }
+
+ public void testWrongImportCDRomAction() throws Exception{
+ Action action = controller.getImportCDRomAction();
+ frame.nullFile = true;
+ frame.wrongFile = true;
+ action.actionPerformed(null);
+ assertNotNull( "Exception should not be null", frame.exception);
+ }
+
+ private boolean hasNewerData() {
+ File dataDir = new File( DirPath.DataDir);
+ File[] files = dataDir.listFiles( new XmlFilenameFilter());
+ for ( int i=0; i<files.length; i++) {
+ if ( files[i].lastModified() > currTime) return true;
+ }
+ return false;
+ }
+ }
+
+ class XmlFilenameFilter implements FilenameFilter {
+ public boolean accept(File dir, String name) {
+ if ( name.toLowerCase().endsWith(".xml")) return true;
+ return false;
}
}
class MockCDCMainFrame implements ICDCMainFrame {
+ public boolean wrongFile;
+ public boolean nullFile;
public String getUserChoosedDataFile() {
! if ( nullFile) return null;
! if ( wrongFile) return "/no/such/file";
! return DirPath.DataDir + DirPath.SEP + "result.xml";
}
public String getUserChoosedDirectory() {
! if ( nullFile) return null;
! if ( wrongFile) return "/no/such/directory";
! return DirPath.BaseDir;
}
***************
*** 63,67 ****
--- 112,118 ----
}
+ Exception exception = null;
public void dealWithActionException( String message, Exception exception) {
+ this.exception = exception;
}
}
|
|
From: <sim...@us...> - 2002-07-19 05:25:22
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv21361/src/org/cdchamber/gui
Modified Files:
CDCMainFrame.java CDCMainFrameController.java
ICDCMainFrame.java
Log Message:
Adding CDCMainController testcases...
Index: CDCMainFrame.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/CDCMainFrame.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** CDCMainFrame.java 19 Jul 2002 05:09:46 -0000 1.13
--- CDCMainFrame.java 19 Jul 2002 05:25:20 -0000 1.14
***************
*** 56,59 ****
--- 56,64 ----
}
+ public void dealWithActionException( String message, Exception exception) {
+ JOptionPane.showMessageDialog( this, message);
+ exception.printStackTrace();
+ }
+
public CDCMainFrame() {
super();
***************
*** 97,102 ****
cdromMenu.setMnemonic('C');
cdromMenu.setText("CDrom");
! cdromCreateMenuItem.setAction( controller.new CreateNewCDRomAction());
! cdromImportMenuItem.setAction( controller.new ImportCDRomAction());
helpMenu.setMnemonic('H');
helpMenu.setText("Help");
--- 102,107 ----
cdromMenu.setMnemonic('C');
cdromMenu.setText("CDrom");
! cdromCreateMenuItem.setAction( controller.getCreateNewCDRomAction());
! cdromImportMenuItem.setAction( controller.getImportCDRomAction());
helpMenu.setMnemonic('H');
helpMenu.setText("Help");
Index: CDCMainFrameController.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/CDCMainFrameController.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CDCMainFrameController.java 19 Jul 2002 05:09:46 -0000 1.6
--- CDCMainFrameController.java 19 Jul 2002 05:25:20 -0000 1.7
***************
*** 58,61 ****
--- 58,69 ----
}
+ public Action getCreateNewCDRomAction() {
+ return new CreateNewCDRomAction();
+ }
+
+ public Action getImportCDRomAction() {
+ return new ImportCDRomAction();
+ }
+
public class CreateNewCDRomAction extends AbstractAction {
public CreateNewCDRomAction() {
***************
*** 73,77 ****
frame.setDirectoryTreeModel( new FileTreeModel( loadDataFiles()));
} catch (Exception e1) {
! frame.dealWithActionException( e1);
}
--- 81,85 ----
frame.setDirectoryTreeModel( new FileTreeModel( loadDataFiles()));
} catch (Exception e1) {
! frame.dealWithActionException( "Create New CDRom Error", e1);
}
***************
*** 94,101 ****
frame.setDirectoryTreeModel( new FileTreeModel( loadDataFiles()));
} catch (Exception e1) {
! frame.dealWithActionException( e1);
}
}
}
- }
--- 102,110 ----
frame.setDirectoryTreeModel( new FileTreeModel( loadDataFiles()));
} catch (Exception e1) {
! frame.dealWithActionException( "Can't import CDRom data", e1);
}
}
}
+
+ }
Index: ICDCMainFrame.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/ICDCMainFrame.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ICDCMainFrame.java 19 Jul 2002 05:09:46 -0000 1.2
--- ICDCMainFrame.java 19 Jul 2002 05:25:20 -0000 1.3
***************
*** 40,43 ****
* @param exception
*/
! public void dealWithActionException( Exception exception);
}
--- 40,43 ----
* @param exception
*/
! public void dealWithActionException( String message, Exception exception);
}
|
|
From: <sim...@us...> - 2002-07-19 05:25:22
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv21361/test/src/org/cdchamber/gui
Modified Files:
CDCMainFrameControllerTest.java
Log Message:
Adding CDCMainController testcases...
Index: CDCMainFrameControllerTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui/CDCMainFrameControllerTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CDCMainFrameControllerTest.java 19 Jul 2002 05:09:47 -0000 1.1
--- CDCMainFrameControllerTest.java 19 Jul 2002 05:25:20 -0000 1.2
***************
*** 9,12 ****
--- 9,13 ----
import javax.swing.tree.TreeModel;
import javax.swing.table.TableModel;
+ import javax.swing.*;
public class CDCMainFrameControllerTest extends TestCase {
***************
*** 31,34 ****
--- 32,45 ----
assertNotNull( "TableModel should not be Null", frame.tableModel);
}
+
+ public void testCreateNewCDRomAction() throws Exception{
+ Action action = controller.getCreateNewCDRomAction();
+ action.actionPerformed(null);
+ }
+
+ public void testImportCDRomAction() throws Exception{
+ Action action = controller.getImportCDRomAction();
+ action.actionPerformed(null);
+ }
}
***************
*** 52,56 ****
}
! public void dealWithActionException(Exception exception) {
}
}
--- 63,67 ----
}
! public void dealWithActionException( String message, Exception exception) {
}
}
|
|
From: <sim...@us...> - 2002-07-19 05:09:50
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv18471/test/src/org/cdchamber/gui
Added Files:
CDCMainFrameControllerTest.java
Log Message:
Adding the controller's testcase
--- NEW FILE: CDCMainFrameControllerTest.java ---
/*
* User: Simon
* $Id: CDCMainFrameControllerTest.java,v 1.1 2002/07/19 05:09:47 simon_lei Exp $
*/
package org.cdchamber.gui;
import junit.framework.TestCase;
import javax.swing.tree.TreeModel;
import javax.swing.table.TableModel;
public class CDCMainFrameControllerTest extends TestCase {
public CDCMainFrameControllerTest(String s) {
super(s);
}
MockCDCMainFrame frame;
CDCMainFrameController controller;
protected void setUp() throws Exception {
super.setUp();
frame = new MockCDCMainFrame();
controller = new CDCMainFrameController( frame);
}
protected void tearDown() throws Exception {
super.tearDown();
}
public void testDataLoaded() {
assertNotNull( "TreeModel should not be null", frame.treeModel);
assertNotNull( "TableModel should not be Null", frame.tableModel);
}
}
class MockCDCMainFrame implements ICDCMainFrame {
public String getUserChoosedDataFile() {
return null;
}
public String getUserChoosedDirectory() {
return null;
}
TreeModel treeModel = null;
public void setDirectoryTreeModel(TreeModel model) {
this.treeModel = model;
}
TableModel tableModel = null;
public void setFilesTableModel(TableModel model) {
this.tableModel = model;
}
public void dealWithActionException(Exception exception) {
}
}
|
|
From: <sim...@us...> - 2002-07-19 05:09:50
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv18471/src/org/cdchamber/gui
Modified Files:
CDCMainFrame.java CDCMainFrameController.java
ICDCMainFrame.java
Log Message:
Adding the controller's testcase
Index: CDCMainFrame.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/CDCMainFrame.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CDCMainFrame.java 19 Jul 2002 04:44:56 -0000 1.12
--- CDCMainFrame.java 19 Jul 2002 05:09:46 -0000 1.13
***************
*** 10,13 ****
--- 10,14 ----
import javax.swing.table.TableModel;
import javax.swing.tree.TreeModel;
+ import javax.swing.tree.TreeSelectionModel;
import javax.swing.border.EtchedBorder;
import java.awt.event.*;
***************
*** 58,61 ****
--- 59,63 ----
super();
+ directoryTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
controller = new CDCMainFrameController(this);
Index: CDCMainFrameController.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/CDCMainFrameController.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CDCMainFrameController.java 19 Jul 2002 04:44:56 -0000 1.5
--- CDCMainFrameController.java 19 Jul 2002 05:09:46 -0000 1.6
***************
*** 15,19 ****
import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.DefaultMutableTreeNode;
- import javax.swing.tree.TreeSelectionModel;
import javax.swing.*;
import java.io.*;
--- 15,18 ----
***************
*** 23,31 ****
ICDCMainFrame frame;
! public CDCMainFrameController( CDCMainFrame frame) {
this.frame = frame;
! frame.directoryTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
! frame.setDirectoryTreeModel( new FileTreeModel( loadDataFiles()));
! frame.setFilesTableModel( new FilesTableModel( (DefaultMutableTreeNode)frame.directoryTree.getModel().getRoot()));
}
--- 22,30 ----
ICDCMainFrame frame;
! public CDCMainFrameController( ICDCMainFrame frame) {
this.frame = frame;
! DirectoryType roots = loadDataFiles();
! frame.setDirectoryTreeModel( new FileTreeModel( roots));
! frame.setFilesTableModel( new FilesTableModel( new DefaultMutableTreeNode(roots)));
}
***************
*** 66,77 ****
public void actionPerformed(ActionEvent e) {
!
DirectoryType dirType = new DirectoryType();
try {
! dirType.parse( frame.getUserChoosedDirectory());
dirType.marshal( new FileWriter( DirPath.DataDir + DirPath.SEP + System.currentTimeMillis() + ".xml"));
frame.setDirectoryTreeModel( new FileTreeModel( loadDataFiles()));
} catch (Exception e1) {
! // JOptionPane.showMessageDialog( frame, "Can't save file.");
}
--- 65,77 ----
public void actionPerformed(ActionEvent e) {
! String dirName = frame.getUserChoosedDirectory();
! if ( dirName == null) return;
DirectoryType dirType = new DirectoryType();
try {
! dirType.parse( dirName);
dirType.marshal( new FileWriter( DirPath.DataDir + DirPath.SEP + System.currentTimeMillis() + ".xml"));
frame.setDirectoryTreeModel( new FileTreeModel( loadDataFiles()));
} catch (Exception e1) {
! frame.dealWithActionException( e1);
}
***************
*** 86,95 ****
public void actionPerformed(ActionEvent e) {
try {
! DirectoryType dirType = DirectoryType.unmarshalDirectoryType( new FileReader( frame.getUserChoosedDataFile()));
dirType.marshal( new FileWriter( DirPath.DataDir + DirPath.SEP + System.currentTimeMillis() + ".xml"));
frame.setDirectoryTreeModel( new FileTreeModel( loadDataFiles()));
} catch (Exception e1) {
! // JOptionPane.showMessageDialog( frame, "Can't import file.");
}
}
--- 86,98 ----
public void actionPerformed(ActionEvent e) {
+ String fileName = frame.getUserChoosedDataFile();
+ if ( fileName == null) return;
+
try {
! DirectoryType dirType = DirectoryType.unmarshalDirectoryType( new FileReader( fileName));
dirType.marshal( new FileWriter( DirPath.DataDir + DirPath.SEP + System.currentTimeMillis() + ".xml"));
frame.setDirectoryTreeModel( new FileTreeModel( loadDataFiles()));
} catch (Exception e1) {
! frame.dealWithActionException( e1);
}
}
Index: ICDCMainFrame.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/ICDCMainFrame.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ICDCMainFrame.java 19 Jul 2002 04:44:56 -0000 1.1
--- ICDCMainFrame.java 19 Jul 2002 05:09:46 -0000 1.2
***************
*** 35,37 ****
--- 35,43 ----
*/
public void setFilesTableModel( TableModel model);
+
+ /**
+ * Let the frame to deal with the
+ * @param exception
+ */
+ public void dealWithActionException( Exception exception);
}
|
|
From: <sim...@us...> - 2002-07-19 04:45:00
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv13475/src/org/cdchamber/gui
Modified Files:
CDCMainFrame.java CDCMainFrameController.java
XmlFileFilter.java
Added Files:
ICDCMainFrame.java
Log Message:
Extract interface for the CDCMainFrame.
--- NEW FILE: ICDCMainFrame.java ---
/*
* User: Simon
* $Id: ICDCMainFrame.java,v 1.1 2002/07/19 04:44:56 simon_lei Exp $
*/
package org.cdchamber.gui;
import javax.swing.table.TableModel;
import javax.swing.tree.TreeModel;
public interface ICDCMainFrame {
/**
* get the user choosed data file.
* @return null for user cancel the choose action
* other for user selected data file.
*/
public String getUserChoosedDataFile();
/**
* get the user choosed directory.
* @return null for user cancel the choose action
* other for user selected directory.
*/
public String getUserChoosedDirectory();
/**
* Set the directory tree's model
* @param model the new tree model
*/
public void setDirectoryTreeModel( TreeModel model );
/**
* Set the files table's model
* @param model the new table model
*/
public void setFilesTableModel( TableModel model);
}
Index: CDCMainFrame.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/CDCMainFrame.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CDCMainFrame.java 19 Jul 2002 02:07:48 -0000 1.11
--- CDCMainFrame.java 19 Jul 2002 04:44:56 -0000 1.12
***************
*** 8,17 ****
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();
--- 8,18 ----
import javax.swing.*;
+ import javax.swing.table.TableModel;
+ import javax.swing.tree.TreeModel;
import javax.swing.border.EtchedBorder;
import java.awt.event.*;
import java.awt.*;
! public class CDCMainFrame extends JFrame implements ICDCMainFrame {
JPanel contentPane;
BorderLayout borderLayout1 = new BorderLayout();
***************
*** 23,34 ****
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 {
--- 24,63 ----
JMenuItem helpAboutMenuItem = new JMenuItem();
JMenuItem cdromExitMenuItem = new JMenuItem();
+ JSplitPane mainPane = new JSplitPane();
JTree directoryTree = new JTree();
JTable filesTable = new JTable();
CDCMainFrameController controller;
+ public String getUserChoosedDataFile() {
+ JFileChooser chooser = new JFileChooser();
+ chooser.setFileSelectionMode( JFileChooser.FILES_ONLY);
+ chooser.setFileFilter( new XmlFileFilter());
+ int retvalue = chooser.showOpenDialog( this);
+ if ( retvalue != JFileChooser.APPROVE_OPTION) return null;
+ return chooser.getSelectedFile().getAbsolutePath();
+ }
+
+ public String getUserChoosedDirectory() {
+ JFileChooser chooser = new JFileChooser();
+ chooser.setFileSelectionMode( JFileChooser.DIRECTORIES_ONLY);
+ int retvalue = chooser.showOpenDialog( this);
+ if ( retvalue != JFileChooser.APPROVE_OPTION) return null;
+ return chooser.getSelectedFile().getAbsolutePath();
+ }
+
+ public void setDirectoryTreeModel(TreeModel model) {
+ directoryTree.setModel( model);
+ }
+
+ public void setFilesTableModel(TableModel model) {
+ filesTable.setModel( model);
+ }
+
public CDCMainFrame() {
+ super();
+
controller = new CDCMainFrameController(this);
+
enableEvents(AWTEvent.WINDOW_EVENT_MASK);
try {
Index: CDCMainFrameController.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/CDCMainFrameController.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CDCMainFrameController.java 19 Jul 2002 02:11:37 -0000 1.4
--- CDCMainFrameController.java 19 Jul 2002 04:44:56 -0000 1.5
***************
*** 22,31 ****
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()));
}
--- 22,31 ----
public class CDCMainFrameController implements TreeSelectionListener {
! ICDCMainFrame frame;
public CDCMainFrameController( CDCMainFrame frame) {
this.frame = frame;
frame.directoryTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
! frame.setDirectoryTreeModel( new FileTreeModel( loadDataFiles()));
! frame.setFilesTableModel( new FilesTableModel( (DefaultMutableTreeNode)frame.directoryTree.getModel().getRoot()));
}
***************
*** 49,59 ****
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));
}
--- 49,60 ----
public void valueChanged(TreeSelectionEvent e) {
+ JTree tree = (JTree)e.getSource();
DefaultMutableTreeNode node = (DefaultMutableTreeNode)
! tree.getLastSelectedPathComponent();
if (node == null) return;
! if (!node.isLeaf()) tree.expandPath(e.getNewLeadSelectionPath());
! frame.setFilesTableModel( new FilesTableModel(node));
}
***************
*** 66,81 ****
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"));
! frame.directoryTree.setModel( new FileTreeModel( loadDataFiles()));
} catch (Exception e1) {
! JOptionPane.showMessageDialog( frame, "Can't save file.");
}
--- 67,77 ----
public void actionPerformed(ActionEvent e) {
DirectoryType dirType = new DirectoryType();
try {
! dirType.parse( frame.getUserChoosedDirectory());
dirType.marshal( new FileWriter( DirPath.DataDir + DirPath.SEP + System.currentTimeMillis() + ".xml"));
! frame.setDirectoryTreeModel( new FileTreeModel( loadDataFiles()));
} catch (Exception e1) {
! // JOptionPane.showMessageDialog( frame, "Can't save file.");
}
***************
*** 90,105 ****
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.");
}
}
--- 86,95 ----
public void actionPerformed(ActionEvent e) {
try {
! DirectoryType dirType = DirectoryType.unmarshalDirectoryType( new FileReader( frame.getUserChoosedDataFile()));
dirType.marshal( new FileWriter( DirPath.DataDir + DirPath.SEP + System.currentTimeMillis() + ".xml"));
! frame.setDirectoryTreeModel( new FileTreeModel( loadDataFiles()));
} catch (Exception e1) {
! // JOptionPane.showMessageDialog( frame, "Can't import file.");
}
}
Index: XmlFileFilter.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/XmlFileFilter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XmlFileFilter.java 19 Jul 2002 02:07:48 -0000 1.1
--- XmlFileFilter.java 19 Jul 2002 04:44:56 -0000 1.2
***************
*** 14,17 ****
--- 14,18 ----
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: <cry...@us...> - 2002-07-19 02:11:40
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui In directory usw-pr-cvs1:/tmp/cvs-serv7243 Modified Files: CDCMainFrameController.java Log Message: unnecessary import Index: CDCMainFrameController.java =================================================================== RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/CDCMainFrameController.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CDCMainFrameController.java 19 Jul 2002 02:07:48 -0000 1.3 --- CDCMainFrameController.java 19 Jul 2002 02:11:37 -0000 1.4 *************** *** 11,15 **** import org.cdchamber.elements.DirectoryType; import org.cdchamber.util.DirPath; - import org.cdchamber.Main; import javax.swing.event.TreeSelectionEvent; --- 11,14 ---- |
|
From: <cry...@us...> - 2002-07-19 02:10:23
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber In directory usw-pr-cvs1:/tmp/cvs-serv6957 Added Files: Main.java Log Message: a solution with ajc |
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv6339
Added Files:
CDCMainFrame.java CDCMainFrameController.java CDChamber.java
FileTreeModel.java FilesTableModel.java XmlFileFilter.java
Log Message:
a solution with ajc
--- 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();
}
}
|
|
From: <cry...@us...> - 2002-07-19 02:04:38
|
Update of /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/parser
In directory usw-pr-cvs1:/tmp/cvs-serv5758
Added Files:
FileParseException.java
Log Message:
a solution with ajc
--- NEW FILE: FileParseException.java ---
/*
* User: Simon
* Date: 2002-6-25
* Time: 15:50:54
* $Id: FileParseException.java,v 1.1 2002/07/19 02:04:35 crystal_y Exp $
*/
package org.cdchamber.parser;
public class FileParseException extends Exception {
public FileParseException() {
}
public FileParseException(String s) {
super(s);
}
}
|
|
From: <cry...@us...> - 2002-07-19 02:01:08
|
Update of /cvsroot/cdchamber/CDChamber/aspect In directory usw-pr-cvs1:/tmp/cvs-serv4960 Removed Files: file.lst Log Message: a solution with ajc --- file.lst DELETED --- |
|
From: <cry...@us...> - 2002-07-19 02:00:54
|
Update of /cvsroot/cdchamber/CDChamber
In directory usw-pr-cvs1:/tmp/cvs-serv4865
Modified Files:
build.xml
Log Message:
a solution with ajc
Index: build.xml
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/build.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** build.xml 18 Jul 2002 08:04:19 -0000 1.25
--- build.xml 19 Jul 2002 02:00:51 -0000 1.26
***************
*** 46,53 ****
<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>
--- 46,53 ----
<condition property="xmlBuild.notRequired">
<and>
! <uptodate property="xsdUptodate" targetfile="${aspect.src}/org/cdchamber/elements/FileType.java">
<srcfiles dir="${src.dir}" includes="cdchamber.xsd"/>
</uptodate>
! <uptodate property="propertiesUptodate" targetfile="${aspect.src}/org/cdchamber/elements/FileType.java">
<srcfiles dir="${basedir}/lib/" includes="castorbuilder.properties"/>
</uptodate>
***************
*** 55,60 ****
</condition>
<condition property="ajc.notRequired">
! <uptodate targetfile="${aspect.classes}/org/cdchamber/elements/FileType.class">
! <srcfiles dir="${aspect.dir}" includes="**/*.*"/>
</uptodate>
</condition>
--- 55,60 ----
</condition>
<condition property="ajc.notRequired">
! <uptodate targetfile="${src.dir}/org/cdchamber/elements/FileType.java">
! <srcfiles dir="${aspect.src}" includes="**/*.*"/>
</uptodate>
</condition>
***************
*** 65,72 ****
</target>
!
! <target name="src_gen" depends="init" description="Generate src files from xsd files" unless="xmlBuild.notRequired">
! <java classname="org.exolab.castor.builder.SourceGenerator" fork="true" dir="${src.dir}">
! <arg line="-i cdchamber.xsd -package org.cdchamber.elements -verbose -types j2 -nodesc -f"/>
<classpath>
<path refid="classpath" />
--- 65,71 ----
</target>
! <target name="castor_gen" depends="init" description="Generate src files from xsd files" unless="xmlBuild.notRequired">
! <java classname="org.exolab.castor.builder.SourceGenerator" fork="true">
! <arg line="-i ${src.dir}/cdchamber.xsd -dest ${aspect.src} -package org.cdchamber.elements -verbose -types j2 -nodesc -f"/>
<classpath>
<path refid="classpath" />
***************
*** 76,96 ****
! <target name="compilewithajc" depends="compile" unless="ajc.notRequired">
! <ajc destdir="${aspect.classes}" argfiles="${aspect.dir}/file.lst">
<src>
<pathelement path="${aspect.src}"/>
</src>
- <classpath>
- <path refid="classpath" />
- </classpath>
</ajc>
</target>
! <target name="compile" depends="src_gen" description="Compile application without aspectj">
<javac srcdir="${src.dir}" destdir="${build.dest}" classpathref="classpath"
includes="**/*.java" debug="true" deprecation="true" />
</target>
! <target name="test.compile" depends="compilewithajc">
<javac srcdir="${test.src}" destdir="${test.classes}">
<classpath>
--- 75,93 ----
! <target name="ajc_gen" depends="castor_gen" unless="ajc.notRequired">
! <ajc destdir="${aspect.classes}"
! preprocess="yes" workingdir="${src.dir}" nocomments="yes">
<src>
<pathelement path="${aspect.src}"/>
</src>
</ajc>
</target>
! <target name="compile" depends="ajc_gen" description="Compile application without aspectj">
<javac srcdir="${src.dir}" destdir="${build.dest}" classpathref="classpath"
includes="**/*.java" debug="true" deprecation="true" />
</target>
! <target name="test.compile" depends="compile">
<javac srcdir="${test.src}" destdir="${test.classes}">
<classpath>
|
Update of /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/gui In directory usw-pr-cvs1:/tmp/cvs-serv4561/gui Removed Files: CDCMainFrame.java CDCMainFrameController.java CDChamber.java FileTreeModel.java FilesTableModel.java XmlFileFilter.java Log Message: a solution with ajc --- CDCMainFrame.java DELETED --- --- CDCMainFrameController.java DELETED --- --- CDChamber.java DELETED --- --- FileTreeModel.java DELETED --- --- FilesTableModel.java DELETED --- --- XmlFileFilter.java DELETED --- |
|
From: <cry...@us...> - 2002-07-19 01:59:58
|
Update of /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/elements
In directory usw-pr-cvs1:/tmp/cvs-serv4561/elements
Added Files:
FileTypeFactory.java
Log Message:
a solution with ajc
--- NEW FILE: FileTypeFactory.java ---
/*
* User: Simon
* Date: 2002-6-27
* Time: 12:51:55
* $Id: FileTypeFactory.java,v 1.1 2002/07/19 01:59:55 crystal_y Exp $
*/
package org.cdchamber.elements;
import java.io.File;
public class FileTypeFactory {
public static FileType createFileType( File file) {
if ( file.isDirectory()) return new DirectoryType();
return new FileType();
}
}
|
